acts_as_api 0.4 → 0.4.1

data/Gemfile

@@ -5,9 +5,9 @@ gemspec
 
 group :test do
   gem 'sqlite3-ruby'
-  gem 'mongoid', '>= 2.0.1'
+  gem 'mongoid', '>= 3.0.1'
   gem 'rspec', '>= 2.9.0'
   gem 'rspec-rails', '>= 2.5.0'
   gem 'webrat'
   gem 'shared_engine', :path => './spec/shared_engine'
-end
+end

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.1 2012-07-18
+
+* Added support for Mongoid 3
+
 === 0.4 2012-04-30
 
 * Added support for a second parameter (options) to pass to as_api_response

data/acts_as_api.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.add_dependency('rack','>= 1.1.0')
 
   s.add_development_dependency('rails', ['>= 3.2.3'])
-  s.add_development_dependency('mongoid', ['>= 2.0.1'])
+  s.add_development_dependency('mongoid', ['>= 3.0.1'])
 
   s.rdoc_options  = ['--charset=UTF-8']
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

data/lib/acts_as_api/rendering.rb

@@ -53,7 +53,7 @@ module ActsAsApi
         api_root_name = ActsAsApi::Config.default_root.to_s
       end
 
-      api_root_name = api_root_name.underscore.tr('/', '_')
+      api_root_name = api_root_name.to_s.underscore.tr('/', '_')
 
       if api_model.is_a?(Array) || (defined?(ActiveRecord) && api_model.is_a?(ActiveRecord::Relation))
         api_root_name = api_root_name.pluralize

data/lib/acts_as_api/version.rb

@@ -1,3 +1,3 @@
 module ActsAsApi
-  VERSION = "0.4"
+  VERSION = "0.4.1"
 end

data/spec/controllers/respond_with_users_controller_spec.rb

@@ -58,6 +58,25 @@ describe SharedEngine::RespondWithUsersController do
         end
 
       end
+      
+      context "returning all models without default root and no order" do
+
+        before(:each) do
+          get :index_no_root_no_order, :api_template => :name_only, :format => 'json'
+        end
+
+        it "should return HTTP 200 status" do
+          response.code.should == "200"
+        end
+
+        it "should contain the specified attributes" do
+          response_body_json["users"].each do |user|
+            user.should have_key( "first_name" )
+            user.should have_key( "last_name" )
+          end
+        end
+
+      end
 
     end
 
@@ -94,11 +113,28 @@ describe SharedEngine::RespondWithUsersController do
           response.code.should == "422"
         end
 
-        it "should return errors as json" do
+        it "should return errors as xml" do
           response_body.should have_selector("errors > error")
         end
 
       end
+
+      context "returning all models without default root and no order" do
+
+        before(:each) do
+          get :index_no_root_no_order, :api_template => :name_only, :format => 'xml'
+        end
+
+        it "should return HTTP 200 status" do
+          response.code.should == "200"
+        end
+
+        it "should contain the specified attributes" do
+          response_body.should have_selector( "users > user > first-name", :count => 3 )
+          response_body.should have_selector( "users > user > last-name", :count => 3 )
+        end
+
+      end
     end
 
   end

data/spec/mongoid_dummy/Gemfile

@@ -7,7 +7,7 @@ gem 'rails', '3.2.3'
 
 
 gem "bson_ext"
-gem "mongoid", ">= 2.0.0.beta.19"
+gem "mongoid", ">= 3.0.0.rc"
 
 gem 'shared_engine', :path => '../shared_engine'
 gem 'acts_as_api', :path => '../../'
@@ -15,4 +15,4 @@ gem 'acts_as_api', :path => '../../'
 group :test do
   gem 'rspec-rails', '>= 2.5.0'
   gem 'webrat'  
-end
+end

data/spec/mongoid_dummy/app/models/user.rb

@@ -45,4 +45,4 @@ class User
     }
   end
 
-end
+end

data/spec/mongoid_dummy/config/mongoid.yml

@@ -1,20 +1,120 @@
 development:
-  host: localhost
-  database: mongoid_dummy_development
+  # Configure available database sessions. (required)
+  sessions:
+    # Defines the default session. (required)
+    default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: mongoid_dummy_development
+      # Provides the hosts the default session can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+      options:
+        # Change whether the session persists in safe mode by default.
+        # (default: false)
+        # safe: false
 
+        # Change the default consistency model to :eventual or :strong.
+        # :eventual will send reads to secondaries, :strong sends everything
+        # to master. (default: :eventual)
+        consistency: :strong
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Configuration for whether or not to allow access to fields that do
+    # not have a field definition on the model. (default: true)
+    # allow_dynamic_fields: true
+
+    # Enable the identity map, needed for eager loading. (default: false)
+    # identity_map_enabled: false
+
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serializaion. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Protect id and type from mass assignment. (default: true)
+    # protect_sensitive_fields: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Skip the database version check, used when connecting to a db without
+    # admin access. (default: false)
+    # skip_version_check: false
+
+    # User Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
 test:
-  host: localhost
-  database: mongoid_dummy_test
-
-# set these environment variables on your prod server
-production:
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
+  # Configure available database sessions. (required)
+  sessions:
+    # Defines the default session. (required)
+    default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: mongoid_dummy_test
+      # Provides the hosts the default session can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+      options:
+        # Change whether the session persists in safe mode by default.
+        # (default: false)
+        # safe: false
+
+        # Change the default consistency model to :eventual or :strong.
+        # :eventual will send reads to secondaries, :strong sends everything
+        # to master. (default: :eventual)
+        consistency: :strong
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Configuration for whether or not to allow access to fields that do
+    # not have a field definition on the model. (default: true)
+    # allow_dynamic_fields: true
+
+    # Enable the identity map, needed for eager loading. (default: false)
+    # identity_map_enabled: false
+
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serializaion. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Protect id and type from mass assignment. (default: true)
+    # protect_sensitive_fields: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Skip the database version check, used when connecting to a db without
+    # admin access. (default: false)
+    # skip_version_check: false
+
+    # User Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false

data/spec/shared_engine/app/controllers/shared_engine/respond_with_users_controller.rb

@@ -10,6 +10,11 @@ module SharedEngine
       respond_with @users, :api_template => params[:api_template].to_sym, :root => :users
     end
 
+    def index_no_root_no_order
+      @users = User.all
+      respond_with @users, :api_template => params[:api_template].to_sym
+    end
+    
     def index_meta
       @users = User.all
       meta_hash = { :page => 1, :total => 999 }
@@ -56,4 +61,4 @@ module SharedEngine
     end
 
   end
-end
+end

data/spec/shared_engine/app/controllers/shared_engine/users_controller.rb

@@ -68,4 +68,4 @@ module SharedEngine
     end
 
   end
-end
+end

data/spec/shared_engine/config/routes.rb

@@ -15,6 +15,7 @@ SharedEngine::Engine.routes.draw do
     collection do
       get 'index_meta'
       get 'index_relation'
+      get 'index_no_root_no_order'
     end
     member do
       get 'show_meta'

data/spec/shared_engine/lib/magic/rails/engine.rb

@@ -0,0 +1,69 @@
+module Magic
+  module Rails
+    module Engine
+      ##
+      # Automatically append all of the current engine's routes to the main
+      # application's route set. This needs to be done for ALL functional tests that
+      # use engine routes, since the mounted routes don't work during tests.
+      #
+      # @param [Symbol] engine_symbol Optional; if provided, uses this symbol to
+      # locate the engine class by name, otherwise uses the module of the calling
+      # test case as the presumed name of the engine.
+      #
+      # @author Jason Hamilton (jhamilton@greatherorift.com)
+      # @author Matthew Ratzloff (matt@urbaninfluence.com)
+      # @author Xavier Dutreilh (xavier@dutreilh.fr)
+      def load_engine_routes(engine_symbol = nil)
+        if engine_symbol
+          engine_name = engine_symbol.to_s.camelize
+        else
+          # No engine provided, so presume the current engine is the one to load
+          engine_name = self.class.name.split("::").first.split("(").last
+        end
+        engine = ("#{engine_name}::Engine").constantize
+
+        # Append the routes for this module to the existing routes
+        ::Rails.application.routes.disable_clear_and_finalize = true
+        ::Rails.application.routes.clear!
+        ::Rails.application.routes_reloader.paths.each { |path| load(path) }
+        ::Rails.application.routes.draw do
+          resourced_routes = []
+
+          named_routes = engine.routes.named_routes.routes
+
+          engine.routes.routes.each do |route|
+            # Call the method by hand based on the symbol
+            path = "/#{engine_name.underscore}#{route.path.spec}"
+            verb = route.verb.to_s.downcase.gsub(/^.+\^(.+)\$.+$/, '\1').to_sym
+            requirements = route.requirements
+            if path_helper = named_routes.key(route)
+              requirements[:as] = path_helper
+            elsif route.requirements[:controller].present?
+              # Presume that all controllers referenced in routes should also be
+              # resources and append that routing on the end so that *_path helpers
+              # will still work
+              resourced_routes << route.requirements[:controller].gsub("#{engine_name.underscore}/", "").to_sym
+            end
+            send(verb, path, requirements) if respond_to?(verb)
+          end
+
+          # Add each route, once, to the end under a scope to trick path helpers.
+          # This will probably break as soon as there is route name overlap, but
+          # we'll cross that bridge when we get to it.
+          resourced_routes.uniq!
+          scope engine_name.underscore do
+            resourced_routes.each do |resource|
+              resources resource
+            end
+          end
+        end
+
+        # Finalize the routes
+        ::Rails.application.routes.finalize!
+        ::Rails.application.routes.disable_clear_and_finalize = false
+      end
+    end
+  end
+end
+
+Rails::Engine.send(:include, Magic::Rails::Engine)

data/spec/spec.opts

@@ -1 +1 @@
---colour
+--colour

data/spec/support/routing.rb

@@ -0,0 +1,4 @@
+require 'magic/rails/engine'
+
+# Replace RspecRouting by the namespace used by your engine
+SharedEngine::Engine.load_engine_routes

data/spec/support/simple_fixtures.rb

@@ -50,4 +50,4 @@ end
 
 RSpec.configure do |c|
   c.include SimpleFixtures
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_api
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70333055874320 !ruby/object:Gem::Requirement
+  requirement: &70279657916060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333055874320
+  version_requirements: *70279657916060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70333055873300 !ruby/object:Gem::Requirement
+  requirement: &70279657914840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333055873300
+  version_requirements: *70279657914840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70333055872420 !ruby/object:Gem::Requirement
+  requirement: &70279657914060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333055872420
+  version_requirements: *70279657914060
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70333055871880 !ruby/object:Gem::Requirement
+  requirement: &70279657913480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,18 @@ dependencies:
         version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *70333055871880
+  version_requirements: *70279657913480
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70333055871200 !ruby/object:Gem::Requirement
+  requirement: &70279657912660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70333055871200
+  version_requirements: *70279657912660
 description: acts_as_api enriches the models and controllers of your app in a rails-like
   way so you can easily determine how your XML/JSON API responses should look like.
 email:
@@ -247,6 +247,7 @@ files:
 - spec/shared_engine/dummy/public/500.html
 - spec/shared_engine/dummy/public/favicon.ico
 - spec/shared_engine/dummy/script/rails
+- spec/shared_engine/lib/magic/rails/engine.rb
 - spec/shared_engine/lib/shared_engine.rb
 - spec/shared_engine/lib/shared_engine/engine.rb
 - spec/shared_engine/lib/shared_engine/version.rb
@@ -272,6 +273,7 @@ files:
 - spec/support/model_examples/sub_nodes.rb
 - spec/support/model_examples/undefined.rb
 - spec/support/model_examples/untouched.rb
+- spec/support/routing.rb
 - spec/support/simple_fixtures.rb
 homepage: https://github.com/fabrik42/acts_as_api
 licenses: []
@@ -449,6 +451,7 @@ test_files:
 - spec/shared_engine/dummy/public/500.html
 - spec/shared_engine/dummy/public/favicon.ico
 - spec/shared_engine/dummy/script/rails
+- spec/shared_engine/lib/magic/rails/engine.rb
 - spec/shared_engine/lib/shared_engine.rb
 - spec/shared_engine/lib/shared_engine/engine.rb
 - spec/shared_engine/lib/shared_engine/version.rb
@@ -474,4 +477,5 @@ test_files:
 - spec/support/model_examples/sub_nodes.rb
 - spec/support/model_examples/undefined.rb
 - spec/support/model_examples/untouched.rb
+- spec/support/routing.rb
 - spec/support/simple_fixtures.rb