merged rails3

dominic · dominic · commit 3866a796e9a1 · 2011-08-28T14:49:39.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,8 @@ gem 'sqlite3'
 gem 'json'
 
 gem 'haml'
+gem 'mongo_mapper'
+gem 'bson_ext'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -23,4 +25,4 @@ group :development, :test do
   gem 'fabrication'
   gem 'rspec-rails'
   gem 'cucumber-rails'
-end
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -32,6 +32,8 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     bcrypt-ruby (2.1.4)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (3.0.0)
     capybara (1.0.1)
       mime-types (>= 1.16)
@@ -81,8 +83,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongo_mapper (0.9.1)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
     multi_json (1.0.3)
     nokogiri (1.5.0)
+    plucky (0.3.8)
+      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.3.2)
     rack-cache (1.0.2)
@@ -161,12 +171,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bson_ext
   coffee-rails (~> 3.1.0.rc)
   cucumber-rails
   fabrication
   haml
   jquery-rails
   json
+  mongo_mapper
   rails (= 3.1.0.rc6)
   rspec-rails
   sass-rails (~> 3.1.0.rc)
diff --git a/app/assets/javascripts/api/rels.js.coffee b/app/assets/javascripts/api/rels.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/api/rels.css.scss b/app/assets/stylesheets/api/rels.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the API::Rels controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/api/rels_controller.rb b/app/controllers/api/rels_controller.rb
@@ -0,0 +1,2 @@
+class Api::RelsController < ApplicationController
+end
diff --git a/app/helpers/api/rels_helper.rb b/app/helpers/api/rels_helper.rb
@@ -0,0 +1,2 @@
+module Api::RelsHelper
+end
diff --git a/app/models/rel.rb b/app/models/rel.rb
@@ -0,0 +1,6 @@
+class Rel
+  include MongoMapper::Document
+
+  key :slug, String
+  key :description, String
+end
diff --git a/app/views/static/api_root.html.haml b/app/views/static/api_root.html.haml
@@ -1 +1,3 @@
-%h1 API Home!
+%h1 Welcome to the Hackety Hack API!
+
+
diff --git a/config/application.rb b/config/application.rb
@@ -21,11 +21,11 @@ class Application < Rails::Application
 
     config.generators do |g|
       g.template_engine :haml
-      g.test_framework      :rspec, :fixture => true
-      g.fixture_replacement :fabrication
 
       # you can also specify a different test framework or ORM here
-      # g.orm             :mongoid
+      g.test_framework      :rspec, :fixture => true
+      g.fixture_replacement :fabrication
+      g.orm                 :mongo_mapper
     end
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,6 +2,9 @@
 
   constraints(ApiConstraint) do
     match '/' => 'static#api_root'
+    scope :module => "Api" do
+      resources :rels
+    end
   end
 
   root :to => "static#root"
diff --git a/test/fixtures/api/rels.yml b/test/fixtures/api/rels.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
+
+one:
+  slug: MyString
+  description: MyText
+
+two:
+  slug: MyString
+  description: MyText
diff --git a/test/functional/api/rels_controller_test.rb b/test/functional/api/rels_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Api::RelsControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/unit/api/rel_test.rb b/test/unit/api/rel_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Api::RelTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/unit/helpers/api/rels_helper_test.rb b/test/unit/helpers/api/rels_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Api::RelsHelperTest < ActionView::TestCase
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Place all the styles related to the API::Rels controller here.`
	`2`	`+// They will automatically be included in application.css.`
	`3`	`+// You can use Sass (SCSS) here: http://sass-lang.com/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Api::RelsController < ApplicationController`
	`2`	`+end`
-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -%h1 API Home!
 +%h1 Welcome to the Hackety Hack API!
++
++