acts_as_api 0.4.3 → 0.4.4

data/spec/active_record_dummy/config/environments/production.rb

@@ -60,8 +60,4 @@ ActiveRecordDummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/active_record_dummy/config/environments/test.rb

@@ -9,7 +9,6 @@ ActiveRecordDummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -29,8 +28,9 @@ ActiveRecordDummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.eager_load = false
+
+  config.secret_key_base = 'helloworld123'
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/controllers/plain_objects_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe SharedEngine::PlainObjectsController, type: :controller do
   include ApiTestHelpers
+  routes { SharedEngine::Engine.routes }
 
   before(:each) do
     class SharedEngine::PlainObjectsController
@@ -12,7 +13,7 @@ describe SharedEngine::PlainObjectsController, type: :controller do
   describe 'get all users as a an array of plain objects, autodetecting the root node name' 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

data/spec/controllers/respond_with_users_controller_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 # end
 
 describe SharedEngine::RespondWithUsersController, type: :controller do
+  routes { SharedEngine::Engine.routes }
 
   before(:each) do
     setup_models
@@ -24,7 +25,7 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
       context "creating valid models" do
 
         before(:each) do
-          post :create, :user => { :first_name => "Luke", :last_name => "Skywalker" }, :api_template => :name_only, :format => 'json'
+          post :create, format: 'json', params: { user: { first_name: "Luke", last_name: "Skywalker" }, api_template: :name_only }
         end
 
         it "should return HTTP 201 status" do
@@ -45,7 +46,7 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
       context "creating invalid models" do
 
         before(:each) do
-          post :create, :user => {}, :api_template => :name_only, :format => 'json'
+          post :create, format: 'json', params: { user: { first_name: 'Luke' }, api_template: :name_only }
         end
 
         it "should return HTTP 422 status" do
@@ -53,16 +54,15 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
         end
 
         it "should return errors as json" do
-          response_body_json['errors']['first_name'].should include("can't be blank")
           response_body_json['errors']['last_name'].should include("can't be blank")
         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'
+          get :index_no_root_no_order, format: 'json', params: { api_template: :name_only }
         end
 
         it "should return HTTP 200 status" do
@@ -85,7 +85,7 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
       context "creating valid models" do
 
         before(:each) do
-          post :create, :user => { :first_name => "Luke", :last_name => "Skywalker" }, :api_template => :name_only, :format => 'xml'
+          post :create, format: 'xml', params: { user: { first_name: "Luke", last_name: "Skywalker" }, api_template: :name_only }
         end
 
         it "should return HTTP 201 status" do
@@ -106,7 +106,7 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
       context "creating invalid models" do
 
         before(:each) do
-          post :create, :user => {}, :api_template => :name_only, :format => 'xml'
+          post :create, :format => 'xml', params: { user: { first_name: 'Luke' }, api_template: :name_only }
         end
 
         it "should return HTTP 422 status" do
@@ -122,7 +122,7 @@ describe SharedEngine::RespondWithUsersController, type: :controller do
       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'
+          get :index_no_root_no_order, format: 'xml', params: { api_template: :name_only }
         end
 
         it "should return HTTP 200 status" do

data/spec/mongoid_dummy/Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.22.2'
+gem 'rails', '5.0.0.1'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 
 gem "bson_ext"
-gem "mongoid", ">= 3.0.0.rc"
+gem 'mongoid', '>= 6.0.2'
 
 gem 'shared_engine', :path => '../shared_engine'
 gem 'acts_as_api', :path => '../../'

data/spec/mongoid_dummy/config/application.rb

@@ -4,7 +4,6 @@ require File.expand_path('../boot', __FILE__)
 # require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
@@ -50,12 +49,6 @@ module MongoidDummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/spec/mongoid_dummy/config/environments/development.rb

@@ -26,6 +26,10 @@ MongoidDummy::Application.configure do
   # Do not compress assets
   config.assets.compress = false
 
+  config.eager_load = false
+
+  config.secret_key_base = 'helloworld123'
+
   # Expands the lines which load the assets
   config.assets.debug = true
 end

data/spec/mongoid_dummy/config/environments/test.rb

@@ -9,7 +9,6 @@ MongoidDummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -29,6 +28,9 @@ MongoidDummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  config.eager_load = false
+
+  config.secret_key_base = 'helloworld123'
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/mongoid_dummy/config/mongoid.yml

@@ -1,120 +1,12 @@
 development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  clients:
     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)
+      database: mongoid
       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:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  clients:
     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)
+      database: mongoid
       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/plain_objects_controller.rb

@@ -1,6 +1,6 @@
 module SharedEngine
   class PlainObjectsController < SharedEngine::ApplicationController
-    before_filter :setup_objects
+    before_action :setup_objects
 
     def index
       @users = [@han, @luke, @leia]

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

@@ -11,20 +11,20 @@ module SharedEngine
     end
 
     def index_no_root_no_order
-      @users = User.all
+      @users = User.all.to_a
       respond_with @users, :api_template => params[:api_template].to_sym
     end
-    
+
     def index_meta
-      @users = User.all
+      @users = User.all.to_a
       meta_hash = { :page => 1, :total => 999 }
       respond_with @users, :api_template => params[:api_template].to_sym, :root => :users, :meta => meta_hash
     end
-  
+
     def index_relation
       @users = User.limit(100).sort_by(&:first_name)
       respond_with @users, :api_template => params[:api_template].to_sym
-    end  
+    end
 
     def show
       @user = User.find(params[:id])
@@ -51,7 +51,7 @@ module SharedEngine
     end
 
     def create
-      @user = User.new(params[:user])
+      @user = User.new(params[:user].permit!)
 
       if @user.save
         respond_with @user, :api_template => params[:api_template]

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

@@ -11,7 +11,7 @@ module SharedEngine
     end
 
     def index_meta
-      @users = User.all
+      @users = User.all.to_a
       meta_hash = { :page => 1, :total => 999 }
 
       respond_to do |format|
@@ -19,14 +19,18 @@ module SharedEngine
         format.json { render_for_api params[:api_template].to_sym, :json => @users, :root => :users, :meta => meta_hash }
       end
     end
-  
+
     def index_relation
-      @users = User.limit(100).sort_by(&:first_name)
+      @users = if defined?(ActiveRecord::Base) && User < ActiveRecord::Base
+        User.where('id > 0').order('first_name ASC').all
+      else
+        User.limit(100).sort_by(&:first_name)
+      end
 
       respond_to do |format|
         format.xml  { render_for_api params[:api_template].to_sym, :xml => @users }
         format.json { render_for_api params[:api_template].to_sym, :json => @users }
-      end    
+      end
     end
 
     def show

data/spec/shared_engine/dummy/config/application.rb

@@ -46,12 +46,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/spec/shared_engine/dummy/config/environments/development.rb

@@ -22,16 +22,13 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 
+  config.eager_load = false
+
+  config.secret_key_base = 'helloworld123'
+
   # Expands the lines which load the assets
   config.assets.debug = true
 end

data/spec/shared_engine/dummy/config/environments/production.rb

@@ -60,8 +60,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/shared_engine/dummy/config/environments/test.rb

@@ -9,7 +9,6 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -29,8 +28,9 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.eager_load = false
+
+  config.secret_key_base = 'helloworld123'
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr