explicit-parameters 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8678ec793b3a6c362be9da00a31ce5f03d60b7
-  data.tar.gz: f8b1c8d883db57b5203881eb598f50eddc361a77
+  metadata.gz: 40398cce3128c89367609acaba917403bcdb5016
+  data.tar.gz: 71262a6bbc997abcdc385f91d8eeefb73989098b
 SHA512:
-  metadata.gz: d6e21cb9325fd96891449fd4a9e22a121adfee90d01e7950ea8c5b5c260c46c789321119c625c05f6f929947c892701e5c8dee814ca5eecbf1c602315bbd47ec
-  data.tar.gz: c8cb01c64d716c8467cd2ff01c5b2d2ee5914e85e1ad4cd0d85aa800da31180ce2828b03509fc3e80b834d10eb52515cf8718e8de3b163b635d59700b33a9b34
+  metadata.gz: d3cd1f16c5eaf0fef10669a363ce3f739174f0223de527e03f350579a88e1193a01d52ef9c33707925d4f17046f775827bdf8d33ef2dc2670edd1131a9135c79
+  data.tar.gz: 8193ca84de290b2f55585eafb4455552eeca5272d1c35cc5940c742345652f6aeeeda160c601c6ce6270f7aa4f5f22afd6ddaa38df4c549b1fa544de019cd14e

data/.travis.yml

@@ -1,3 +1,7 @@
+sudo: false
+cache: bundler
 rvm:
-  2.2
-
+  2.2.3
+gemfile:
+  - gemfiles/Gemfile.rails-4.2
+  - gemfiles/Gemfile.rails-5.0

data/Rakefile

@@ -5,3 +5,16 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+namespace :spec do
+  task :all do
+    %w(4.2 5.0).each do |rails_version|
+      command = %W{
+        BUNDLE_GEMFILE=gemfiles/Gemfile.rails-#{rails_version}
+        rspec
+      }.join(' ')
+      puts command
+      system(command)
+    end
+  end
+end

data/explicit-parameters.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'actionpack', '~> 4.0'
-  spec.add_dependency 'activemodel', '~> 4.0'
+  spec.add_dependency 'actionpack', '>= 4.2', '< 5.1'
+  spec.add_dependency 'activemodel', '>= 4.2', '< 5.1'
   spec.add_dependency 'virtus', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

data/gemfiles/Gemfile.rails-4.2

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 4.2.0'
+gem 'activemodel', '~> 4.2.0'
+gem 'virtus', '~> 1.0'
+gem 'rake', '~> 10.0'
+gem 'rspec', '~> 3.0'

data/gemfiles/Gemfile.rails-4.2.lock

@@ -0,0 +1,94 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
+      builder (~> 3.1)
+    activesupport (4.2.7)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    ice_nine (0.11.2)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 4.2.0)
+  activemodel (~> 4.2.0)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  virtus (~> 1.0)
+
+BUNDLED WITH
+   1.12.3

data/gemfiles/Gemfile.rails-5.0

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 5.0.0'
+gem 'activemodel', '~> 5.0.0'
+gem 'virtus', '~> 1.0'
+gem 'rake', '~> 10.0'
+gem 'rspec', '~> 3.0'

data/gemfiles/Gemfile.rails-5.0.lock

@@ -0,0 +1,89 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    ice_nine (0.11.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 5.0.0)
+  activemodel (~> 5.0.0)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  virtus (~> 1.0)
+
+BUNDLED WITH
+   1.12.3

data/lib/explicit_parameters.rb

@@ -1,4 +1,7 @@
+require 'action_pack/version'
+
 module ExplicitParameters
+  IS_RAILS5 = ActionPack.version >= Gem::Version.new('5.0.0')
   BaseError = Class.new(StandardError)
   InvalidParameters = Class.new(BaseError)
 end

data/lib/explicit_parameters/parameters.rb

@@ -65,8 +65,9 @@ module ExplicitParameters
     end
 
     def initialize(attributes = {})
+      attributes = attributes.to_unsafe_h if IS_RAILS5 && attributes.respond_to?(:to_unsafe_h)
       @original_attributes = attributes.stringify_keys
-      super
+      super(attributes)
     end
 
     def validate!

data/lib/explicit_parameters/version.rb

@@ -1,3 +1,3 @@
 module ExplicitParameters
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/controller_spec.rb

@@ -13,11 +13,11 @@ class DummyController < ActionController::Base
 
   def error
     param_error!(:page_size, "Out of bound")
-    render text: 'OK'
+    render body: 'OK'
   end
 
   def no_declaration
-    render text: 'OK'
+    render body: 'OK'
   end
 
 end
@@ -60,12 +60,26 @@ RSpec.describe DummyController do
     request(action, 'GET', query: parameters)
   end
 
-  def request(action, method, query: {}, body: '')
-    rack_response = subject.dispatch(action, ActionDispatch::Request.new(
-      'REQUEST_METHOD' => method,
-      'QUERY_STRING' => query.to_query,
-      'rack.input' => StringIO.new(body)
-    ))
-    @response = ActionDispatch::Response.new(*rack_response)
+  if ActionController::Base.instance_method(:dispatch).arity > 2
+    def request(action, method, query: {}, body: '')
+      request = ActionDispatch::Request.new(
+        'REQUEST_METHOD' => method,
+        'QUERY_STRING' => query.to_query,
+        'rack.input' => StringIO.new(body)
+      )
+      @response = ActionDispatch::Response.create.tap do |res|
+        res.request = request
+      end
+      subject.dispatch(action, request, @response)
+    end
+  else
+    def request(action, method, query: {}, body: '')
+      rack_response = subject.dispatch(action, ActionDispatch::Request.new(
+        'REQUEST_METHOD' => method,
+        'QUERY_STRING' => query.to_query,
+        'rack.input' => StringIO.new(body)
+      ))
+      @response = ActionDispatch::Response.new(*rack_response)
+    end
   end
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: explicit-parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +121,10 @@ files:
 - README.md
 - Rakefile
 - explicit-parameters.gemspec
+- gemfiles/Gemfile.rails-4.2
+- gemfiles/Gemfile.rails-4.2.lock
+- gemfiles/Gemfile.rails-5.0
+- gemfiles/Gemfile.rails-5.0.lock
 - lib/explicit-parameters.rb
 - lib/explicit_parameters.rb
 - lib/explicit_parameters/controller.rb
@@ -138,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Explicit parameters validation and casting for Rails APIs