scoped_from 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b56a3a6c6ec63c95e922a48d886843747725f4a
-  data.tar.gz: 44a3f95dcb98a946af1b6f20f0319f23fd372595
+  metadata.gz: 88f3cb11e67b82da5d005daacea281154d2818ba
+  data.tar.gz: 981bb72c4e756353749084e3503ab9b03469cfd4
 SHA512:
-  metadata.gz: 3d1153e12c34cac02f2e43e2e73245602c9b06395e8077b50662edbc1fdfcabfd2d17c29cfa37a687cb6565fa74dac3fea9755e77d13e284a1078fc130e7eded
-  data.tar.gz: 8e349b84d70e4b3ab0f492d0689392b366290e85276e882a0e5d52b927a2ad1f622e3ca463aab0cc9fb0a9dc40259153123cbe6ea2c3c10b8e1689204e03a4c4
+  metadata.gz: 82a281b707f6eb1d102131e06c9da5dcf7dec0a178d2ecc0b034e84589dc7ec4267362c56be037792011e809c6e1eb2200f2d6f0bce92af0576fc08b2e6378d1
+  data.tar.gz: 79c0f7e9e6b4ab871aa2243fae328f004a6a1aa8ebb4bb750d1a58903e8e059626dd52f65d0e0fb5e9937f2df67f5513a19262a0a77dc14952c6c1947faa6cf6

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.byebug_history
 /.bundle/
 /.ruby-version
 /Gemfile.lock

data/README.mdown

@@ -1,7 +1,7 @@
 # ScopedFrom
 
 Provides a simple mapping between scopes and controller parameters for
-[Ruby On Rails 4](http://rubyonrails.org/).
+[Ruby On Rails 5](http://rubyonrails.org/).
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/scoped_from/query.rb

@@ -74,7 +74,7 @@ module ScopedFrom
 
     def params=(params)
       params = params.params if params.is_a?(self.class)
-      params = CGI.parse(params.to_s) unless params.is_a?(Hash)
+      params = CGI.parse(params.to_s) unless params.is_a?(Hash) || defined?(ActionController::Parameters) && params.is_a?(ActionController::Parameters)
       @params = ActiveSupport::HashWithIndifferentAccess.new
       params.each do |name, value|
         values = [value].flatten

data/scoped_from.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 5.0.0', '< 5.1.0'
   s.add_dependency 'activesupport', '>= 5.0.0', '< 5.1.0'
 
+  s.add_development_dependency 'actionpack', '>= 5.0.0', '< 5.1.0'
   s.add_development_dependency 'byebug', '>= 3.2.0', '< 10.0.0'
   s.add_development_dependency 'rake', '>= 10.3.0', '< 12.0.0'
   s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.6.0'

data/spec/scoped_from/active_record_spec.rb

@@ -116,6 +116,10 @@ describe ScopedFrom::ActiveRecord do
       expect(VoteQuery).to be_a(Module)
     end
 
+    it 'is accepts ActionController::Parameters' do
+      expect(User.scoped_from(ActionController::Parameters.new(search: 'jane'))).to eq([users(:jane)])
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 require File.expand_path("#{__dir__}/../lib/scoped_from")
+require 'action_controller'
 require 'byebug'
 
 # Support

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoped_from
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,6 +50,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -185,17 +205,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mapping between scopes and parameters for Rails
-test_files:
-- spec/mocks/comment.rb
-- spec/mocks/comment_query.rb
-- spec/mocks/post.rb
-- spec/mocks/user.rb
-- spec/mocks/user_query.rb
-- spec/mocks/vote.rb
-- spec/mocks/vote_query.rb
-- spec/scoped_from/active_record_spec.rb
-- spec/scoped_from/query_spec.rb
-- spec/scoped_from_spec.rb
-- spec/spec_helper.rb
-- spec/support/bootstrap/database.rb
-- spec/support/macros/user_macro.rb
+test_files: []