acts_as_api 0.4.3 → 0.4.4

data/spec/shared_engine/shared_engine.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.22.2"
+  s.add_dependency "rails", "~> 5.0.0.1"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"

data/spec/spec_helper.rb

@@ -3,11 +3,9 @@ ENV["RAILS_ENV"] = "test"
 if ENV['ACTS_AS_API_ORM'] == 'active_record'
   require "active_record_dummy/config/environment"
 
-  load_schema = lambda {
-    load "#{Rails.root.to_s}/db/schema.rb" # use db agnostic schema by default
-    # ActiveRecord::Migrator.up('db/migrate') # use migrations
-  }
-  silence_stream(STDOUT, &load_schema)
+  load "#{Rails.root.to_s}/db/schema.rb" # use db agnostic schema by default
+  # ActiveRecord::Migrator.up('db/migrate') # use migrations
+
 
 elsif ENV['ACTS_AS_API_ORM'] == 'mongoid'
 
@@ -20,3 +18,7 @@ require 'rspec/rails'
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|file| require file }
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
+end

data/spec/support/controller_examples.rb

@@ -1,13 +1,13 @@
 shared_examples_for "a controller with ActsAsApi responses" do
-
   include ApiTestHelpers
+  routes { SharedEngine::Engine.routes }
 
   describe 'xml responses' do
 
     describe 'get all users' do
 
       before(:each) do
-        get :index, :format => 'xml', :api_template => :name_only
+        get :index, format: 'xml', params: { api_template: :name_only }
       end
 
       it "should have a root node named users" do
@@ -30,7 +30,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get a single user' do
 
       before(:each) do
-        get :show, :format => 'xml', :api_template => :name_only, :id => @luke.id
+        get :show, format: 'xml', params: { api_template: :name_only, id: @luke.id }
       end
 
       it "should have a root node named user" do
@@ -43,28 +43,6 @@ shared_examples_for "a controller with ActsAsApi responses" do
       end
 
     end
-
-    describe 'get a user without specifying an api template' do
-
-      before(:each) do
-        get :show_default, :format => 'xml', :id => @luke.id
-      end
-
-      it "should respond with HTTP 200" do
-        response.code.should == "200"
-      end
-
-      it "should render the model with standard to_xml" do
-        # TODO: figure out how to compare xml generated by mongo models.
-
-        # This line works fine with ActiveRecord, but not Mongoid:
-        # response.body.should == @luke.to_xml
-
-        response.body.length.should == @luke.to_xml.length
-      end
-
-    end
-
   end
 
   describe 'json responses' do
@@ -72,7 +50,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get all users' do
 
       before(:each) do
-        get :index, :format => 'json', :api_template => :name_only
+        get :index, format: 'json', params: { api_template: :name_only }
       end
 
       it "should have a root node named users" do
@@ -98,7 +76,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get all users as a ActiveRecord::Relation (or similar chained) object, autodetecting the root node name' do
 
       before(:each) do
-        get :index_relation, :format => 'json', :api_template => :name_only
+        get :index_relation, format: 'json', params: { api_template: :name_only }
       end
 
       it "should have a root node named users" do
@@ -124,7 +102,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get a single user' do
 
       before(:each) do
-        get :show, :format => 'json', :api_template => :name_only, :id => @luke.id
+        get :show, format: 'json', params: { api_template: :name_only, id: @luke.id }
       end
 
       it "should have a root node named user" do
@@ -152,7 +130,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
           t.add :homepage
         end
 
-        get :show, :format => 'json', :api_template => :include_profile, :id => @han.id
+        get :show, format: 'json', params: { api_template: :include_profile, id: @han.id }
       end
 
       it "should have a root node named user" do
@@ -173,7 +151,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get a user without specifying an api template' do
 
       before(:each) do
-        get :show_default, :format => 'json', :id => @luke.id
+        get :show_default, format: 'json', params: { id: @luke.id }
       end
 
       it "should respond with HTTP 200" do
@@ -202,7 +180,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get all users' do
 
       before(:each) do
-        get :index, :format => 'json', :api_template => :name_only
+        get :index, format: 'json', params: { api_template: :name_only }
       end
 
       it "should have a root node named users" do
@@ -232,7 +210,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get a single user' do
 
       before(:each) do
-        get :show, :format => 'json', :api_template => :name_only, :id => @luke.id
+        get :show, format: 'json', params: { api_template: :name_only, id: @luke.id }
       end
 
       it "should have a root node named user" do
@@ -256,7 +234,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
     it "should be disabled by default" do
       @callback = "mycallback"
-      get :index, :format => 'json', :api_template => :name_only, :callback => @callback
+      get :index, format: 'json', params: { api_template: :name_only, callback: @callback }
       response_body_jsonp(@callback).should be_nil
     end
 
@@ -280,7 +258,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
       describe 'get all users' do
 
         before(:each) do
-          get :index, :format => 'json', :api_template => :name_only, :callback => @callback
+          get :index, format: 'json', params: { api_template: :name_only, callback: @callback }
         end
 
         it "should wrap the response in the callback" do
@@ -292,7 +270,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
       describe 'get a single user' do
 
         before(:each) do
-          get :show, :format => 'json', :api_template => :name_only, :id => @luke.id, :callback => @callback
+          get :show, format: 'json', params: { api_template: :name_only, id: @luke.id, callback: @callback }
         end
 
         it "should wrap the response in the callback" do
@@ -302,17 +280,14 @@ shared_examples_for "a controller with ActsAsApi responses" do
       end
 
       describe 'Requesting the JSONP content as JavaScript' do
-
         before(:each) do
-          get :index, :format => :js, :api_template => :name_only, :callback => @callback
+          get :index, format: :json, params: { api_template: :name_only, callback: @callback }
         end
 
         it "should set the content type to JavaScript" do
-          response.content_type.should == Mime::JS
+          response.content_type.should == Mime[:js]
         end
-
       end
-
     end
   end
 
@@ -328,7 +303,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
     describe 'get all users' do
       before(:each) do
-        get :index, :format => 'json', :api_template => :name_only, :callback => @callback
+        get :index, format: 'json', params: { api_template: :name_only, callback: @callback }
       end
 
       its "response has no named root node" do
@@ -338,7 +313,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
     describe 'get a single user' do
       before(:each) do
-        get :show, :format => 'json', :api_template => :name_only, :id => @luke.id
+        get :show, format: 'json', params: { api_template: :name_only, id: @luke.id }
       end
 
       its "response has no named root node" do
@@ -352,7 +327,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
     describe 'get all users' do
       before(:each) do
-        get :index_meta, :format => 'json', :api_template => :name_only
+        get :index_meta, format: 'json', params: { api_template: :name_only }
       end
 
       it "shows model response fields" do
@@ -372,7 +347,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
     describe 'get a single user' do
       before(:each) do
-        get :show_meta, :format => 'json', :api_template => :name_only, :id => @luke.id
+        get :show_meta, format: 'json', params: { api_template: :name_only, id: @luke.id }
       end
 
       it "shows model response fields" do
@@ -397,7 +372,8 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get single user' do
 
       before(:each) do
-        get :show_prefix_postfix, :format => 'xml', :api_template => :name_only, :api_prefix => :with_prefix, :id => @luke.id
+        get :show_prefix_postfix, format: 'xml', params: { api_template: :name_only, api_prefix: :with_prefix, id: @luke.id }
+
       end
 
       it "should have a root node named user" do
@@ -423,7 +399,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get single user' do
 
       before(:each) do
-        get :show_prefix_postfix, :format => 'xml', :api_template => :name_only, :api_postfix => :with_postfix, :id => @luke.id
+        get :show_prefix_postfix, format: 'xml', params: { api_template: :name_only, api_postfix: :with_postfix, id: @luke.id }
       end
 
       it "should have a root node named user" do
@@ -449,7 +425,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
     describe 'get single user' do
 
       before(:each) do
-        get :show_prefix_postfix, :format => 'xml', :api_template => :name_only, :api_prefix => :with_prefix, :api_postfix => :with_postfix, :id => @luke.id
+        get :show_prefix_postfix, format: 'xml', params: { api_template: :name_only, api_prefix: :with_prefix, api_postfix: :with_postfix, :id => @luke.id }
       end
 
       it "should have a root node named user" do

data/spec/support/model_examples/associations.rb

@@ -1,37 +1,37 @@
 shared_examples_for "including an association in the api template" do
-  
+
   describe "which doesn't acts_as_api" do
-  
+
     before(:each) do
       @response = @luke.as_api_response(:include_tasks)
     end
-  
+
     it "returns a hash" do
       @response.should be_kind_of(Hash)
     end
-  
+
     it "returns the correct number of fields" do
       @response.should have(1).keys
     end
-  
+
     it "returns all specified fields" do
       @response.keys.should include(:tasks)
     end
-  
+
     it "returns the correct values for the specified fields" do
       @response[:tasks].should be_an Array
       @response[:tasks].should have(3).tasks
     end
-  
+
     it "should contain the associated sub models" do
       @response[:tasks].should include(@destroy_deathstar, @study_with_yoda, @win_rebellion)
     end
   end
-  
+
   describe "which does acts_as_api" do
-  
+
     context "has_many" do
-  
+
       before(:each) do
         Task.acts_as_api
         Task.api_accessible :include_tasks do |t|
@@ -40,39 +40,39 @@ shared_examples_for "including an association in the api template" do
         end
         @response = @luke.as_api_response(:include_tasks)
       end
-  
+
       it "returns a hash" do
         @response.should be_kind_of(Hash)
       end
-  
+
       it "returns the correct number of fields" do
         @response.should have(1).keys
       end
-  
+
       it "returns all specified fields" do
         @response.keys.should include(:tasks)
       end
-  
+
       it "returns the correct values for the specified fields" do
         @response[:tasks].should be_an Array
         @response[:tasks].should have(3).tasks
       end
-  
+
       it "contains the associated child models with the determined api template" do
         @response[:tasks].each do |task|
           task.keys.should include(:heading, :done)
           task.keys.should have(2).attributes
         end
       end
-  
+
       it "contains the correct data of the child models" do
         task_hash = [  @destroy_deathstar, @study_with_yoda, @win_rebellion  ].collect{|t| { :done => t.done, :heading => t.heading } }
         @response[:tasks].should eql task_hash
       end
     end
-  
+
     context "has_one" do
-  
+
       before(:each) do
         Profile.acts_as_api
         Profile.api_accessible :include_profile do |t|
@@ -81,38 +81,38 @@ shared_examples_for "including an association in the api template" do
         end
         @response = @luke.as_api_response(:include_profile)
       end
-  
+
       it "returns a hash" do
         @response.should be_kind_of(Hash)
       end
-  
+
       it "returns the correct number of fields" do
         @response.should have(1).keys
       end
-  
+
       it "returns all specified fields" do
         @response.keys.should include(:profile)
       end
-  
+
       it "returns the correct values for the specified fields" do
         @response[:profile].should be_a Hash
         @response[:profile].should have(2).attributes
       end
-  
+
       it "contains the associated child models with the determined api template" do
         @response[:profile].keys.should include(:avatar, :homepage)
       end
-  
+
       it "contains the correct data of the child models" do
         profile_hash = { :avatar => @luke.profile.avatar, :homepage => @luke.profile.homepage }
         @response[:profile].should eql profile_hash
       end
-  
+
     end
   end
-  
+
   describe "which does acts_as_api, but with using another template name" do
-  
+
     before(:each) do
       Task.acts_as_api
       Task.api_accessible :other_template do |t|
@@ -121,96 +121,96 @@ shared_examples_for "including an association in the api template" do
       end
       @response = @luke.as_api_response(:other_sub_template)
     end
-  
+
     it "returns a hash" do
       @response.should be_kind_of(Hash)
     end
-  
+
     it "returns the correct number of fields" do
       @response.should have(2).keys
     end
-  
+
     it "returns all specified fields" do
       @response.keys.should include(:first_name)
     end
-  
+
     it "returns the correct values for the specified fields" do
       @response.values.should include(@luke.first_name)
     end
-  
+
     it "returns all specified fields" do
       @response.keys.should include(:tasks)
     end
-  
+
     it "returns the correct values for the specified fields" do
       @response[:tasks].should be_an Array
       @response[:tasks].should have(3).tasks
     end
-  
+
     it "contains the associated child models with the determined api template" do
       @response[:tasks].each do |task|
         task.keys.should include(:description, :time_spent)
         task.keys.should have(2).attributes
       end
     end
-  
+
     it "contains the correct data of the child models" do
       task_hash = [  @destroy_deathstar, @study_with_yoda, @win_rebellion  ].collect{|t| { :description => t.description, :time_spent => t.time_spent } }
       @response[:tasks].should eql task_hash
     end
   end
-  
+
   describe "that is scoped" do
-  
+
     before(:each) do
       # extend task model with scope
       #class Task < ActiveRecord::Base
       Task.class_eval do
-        scope :completed, where(:done => true)
+        scope :completed, -> { where(:done => true) }
       end
       Task.acts_as_api
       Task.api_accessible :include_completed_tasks do |t|
         t.add :heading
         t.add :done
       end
-  
+
       @response = @luke.as_api_response(:include_completed_tasks)
     end
-  
+
     it "returns a hash" do
       @response.should be_kind_of(Hash)
     end
-  
+
     it "returns the correct number of fields" do
       @response.should have(1).keys
     end
-  
+
     it "returns all specified fields" do
       @response.keys.should include(:completed_tasks)
     end
-  
+
     it "returns the correct values for the specified fields" do
       @response[:completed_tasks].should be_an Array
       @response[:completed_tasks].should have(2).tasks
     end
-  
+
     it "contains the associated child models with the determined api template" do
       @response[:completed_tasks].each do |task|
         task.keys.should include(:heading, :done)
         task.keys.should have(2).attributes
       end
     end
-  
+
     it "contains the correct data of the child models" do
       task_hash = [  @destroy_deathstar, @study_with_yoda  ].collect{|t| { :done => t.done, :heading => t.heading } }
       @response[:completed_tasks].should eql task_hash
     end
   end
-  
+
   describe "handling nil values" do
-  
+
     context "has_many" do
-  
+
       before(:each) do
         Task.acts_as_api
         Task.api_accessible :include_tasks do |t|
@@ -219,29 +219,29 @@ shared_examples_for "including an association in the api template" do
         end
         @response = @han.as_api_response(:include_tasks)
       end
-  
+
       it "returns a hash" do
         @response.should be_kind_of(Hash)
       end
-  
+
       it "returns the correct number of fields" do
         @response.should have(1).keys
       end
-  
+
       it "returns all specified fields" do
         @response.keys.should include(:tasks)
       end
-  
+
       it "returns the correct values for the specified fields" do
         @response[:tasks].should be_kind_of(Array)
       end
-  
+
       it "contains no associated child models" do
         @response[:tasks].should have(0).items
       end
-  
+
     end
-  
+
     context "has one" do
       before(:each) do
         Profile.acts_as_api
@@ -251,19 +251,19 @@ shared_examples_for "including an association in the api template" do
         end
         @response = @han.as_api_response(:include_profile)
       end
-  
+
       it "returns a hash" do
         @response.should be_kind_of(Hash)
       end
-  
+
       it "returns the correct number of fields" do
         @response.should have(1).keys
       end
-  
+
       it "returns all specified fields" do
         @response.keys.should include(:profile)
       end
-  
+
       it "returns nil for the association" do
         @response[:profile].should be_nil
       end