scoped_from 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4289bd8c3bbfa67e32434e234a812d6c7355722d
-  data.tar.gz: f8f519eba2ed19382bd26dac18ed29235b2f2f36
+  metadata.gz: 420ecbe54d29a250ed5827afd36cb68f00658acd
+  data.tar.gz: 70718fa6858992001f51ac154f512ff5e87a0bc6
 SHA512:
-  metadata.gz: d8b4baaf4d2624f44422b79bf2fe124e7f8f21dcfd9d097638f97e7b4832135eef8bcdf70d803317acb3a5f59dffc7de73f05747718d161473e3e7853f524afd
-  data.tar.gz: 5921566963a8c2e17538acd47b5a91f1fe4007405f0297f2310d67341c2a361fa0d4a7f550f35434fe9f1d2b4e7148ba60b135dcb9c9fb17aa78f114b2872233
+  metadata.gz: 478022cae387bc459a21330454c4cb9dad0a0355686e4c3ec0c07be1b8e3f4ab9a2a457952771cb326536a698d4dc443db4245138c8f43dd51feabeeacfdfe9a
+  data.tar.gz: f603d42533c9685f23996e114e7995cd1407d8eb1cf5b4a623d5ef633d398eb8e3087ea3eabd31a5e8a03c3615d4dd2216b2f555a887e8044397e777c02459a1

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    scoped_from (0.8.0)
+    scoped_from (0.8.1)
       activerecord (~> 4.0.0)
       activesupport (~> 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
+    arel (4.0.1)
+    atomic (1.1.14)
     builder (3.1.4)
-    diff-lcs (1.2.4)
-    i18n (0.6.4)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
     minitest (4.7.5)
-    multi_json (1.7.7)
+    multi_json (1.8.2)
     rake (10.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.3)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sqlite3 (1.3.7)
+    rspec-mocks (2.14.4)
+    sqlite3 (1.3.8)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby

data/README.mdown

@@ -1,7 +1,7 @@
 # ScopedFrom
 
 Provides a simple mapping between scopes and controller parameters for
-[Ruby On Rails 3](http://rubyonrails.org/).
+[Ruby On Rails 4](http://rubyonrails.org/).
 
 ## Installation
 
@@ -16,35 +16,35 @@ Then, just run `bundle install`.
 First, a model with some scopes:
 
     class Post < ActiveRecord::Base
-    
+
       scope :commented, where('comments_count > 0')
 
       scope :created_between, lambda { |after, before|
         where('created_at >= ? AND created_at <= ?', after, before)
       }
-      
+
       scope :search, lambda { |pattern|
         where('body LIKE ?', "%#{pattern}%")
       }
-      
+
       scope :with_category, lambda { |category_id|
         where(:category_id, category_id)
       }
-    
+
     end
-    
+
 After, a controller:
-    
+
     class PostsController < ActionController::Base
-    
+
       def index
         @posts = Post.scoped_from(params)
       end
-    
+
     end
-    
+
 Then, it just filter your model from params:
-    
+
     /posts?commented=1
     /posts?search=rails
     /posts?search=rails&commented=1&with_category=42
@@ -77,7 +77,7 @@ If you need to map an SQL order, just pass `order` parameter:
     @posts = Post.scoped_from(order: 'created_at')
 
 Order direction can be specified using a dot, space or `:` as delimiter:
-    
+
     @posts = Post.scoped_from(order: 'created_at.desc')
 
 Note that order is SQL safe with `scoped_from` method (columns names are
@@ -89,9 +89,9 @@ If your provide an array as parameter value, scope is invoked with each item
 of the array:
 
     @posts = Post.scoped_from(search: ['bar', 'foo'])
-    
+
 is equivalent to
-    
+
     @posts = Post.search('bar').search('foo')
 
 You may also not want to filter on columns, just specify `:exclude_columns`
@@ -118,15 +118,15 @@ subclass of `ScopedFrom::Query` named `#{RecordClassName}Query`. Here is an
 example:
 
     class PostQuery < ScopedFrom::Query
-    
+
       def category
         Category.find_by_id(params[:with_category]) if params[:with_category]
       end
-    
+
     end
 
 This class has to be in load path.
-    
+
 Then into a view:
 
     <% if @query.category %>

data/Rakefile

@@ -7,4 +7,4 @@ desc 'Default: runs specs.'
 task default: :spec
 
 desc 'Run all specs in spec directory.'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/scoped_from.rb

@@ -18,4 +18,4 @@ lib_path = "#{__dir__}/scoped_from"
 require "#{lib_path}/active_record"
 require "#{lib_path}/query"
 
-ActiveRecord::Base.send(:include, ScopedFrom::ActiveRecord)
+ActiveRecord::Base.send(:include, ScopedFrom::ActiveRecord)

data/lib/scoped_from/active_record.rb

@@ -34,4 +34,4 @@ module ScopedFrom
 
   end
 
-end
+end

data/lib/scoped_from/query.rb

@@ -110,7 +110,7 @@ module ScopedFrom
 
     def parse_orders(values)
       [].tap do |orders|
-        values.reverse.each do |value|
+        values.each do |value|
           order = parse_order(value)
           orders << order if order.present? && !orders.any? { |o| o[:column] == order[:column] }
         end
@@ -127,4 +127,4 @@ module ScopedFrom
 
   end
 
-end
+end

data/scoped_from.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.email = 'al@alweb.org'
   s.homepage = 'https://github.com/alexistoulotte/scoped_from'
   s.summary = 'Mapping between scopes and parameters for Rails'
-  s.description = 'Provides a simple mapping between Active Record scopes and controller parameters for Ruby On Rails 3'
+  s.description = 'Provides a simple mapping between Active Record scopes and controller parameters for Ruby On Rails 4'
   s.license = 'MIT'
 
   s.rubyforge_project = 'scoped_from'

data/spec/mocks/comment.rb

@@ -1,2 +1,2 @@
 class Comment < ActiveRecord::Base
-end
+end

data/spec/mocks/comment_query.rb

@@ -1,2 +1,2 @@
 class CommentQuery < ScopedFrom::Query
-end
+end

data/spec/mocks/post.rb

@@ -1,2 +1,2 @@
 class Post < ActiveRecord::Base
-end
+end

data/spec/mocks/user.rb

@@ -5,4 +5,4 @@ class User < ActiveRecord::Base
   scope :created_between, -> (after, before) { where('created_at >= ? AND created_at <= ?', after, before) }
   scope :latest, -> { where('created_at >= ?', 1.week.ago) }
 
-end
+end

data/spec/mocks/user_query.rb

@@ -1,2 +1,2 @@
 class UserQuery < String
-end
+end

data/spec/mocks/vote.rb

@@ -1,2 +1,2 @@
 class Vote < ActiveRecord::Base
-end
+end

data/spec/mocks/vote_query.rb

@@ -1,2 +1,2 @@
 module VoteQuery
-end
+end

data/spec/scoped_from/query_spec.rb

@@ -171,17 +171,17 @@ describe ScopedFrom::Query do
   describe '#params' do
 
     it 'returns params specified at initialization' do
-      query(User, :search => 'foo', 'enabled' => true).params.should == { 'search' => 'foo', 'enabled' => true }
+      query(User, search: 'foo', 'enabled' => true).params.should == { 'search' => 'foo', 'enabled' => true }
     end
 
     it 'returns an hash with indifferent access' do
       query(User, 'search' => 'bar').params.should be_a(ActiveSupport::HashWithIndifferentAccess)
       query(User, 'search' => 'bar').params[:search].should == 'bar'
-      query(User, :search => 'bar').params['search'].should == 'bar'
+      query(User, search: 'bar').params['search'].should == 'bar'
     end
 
     it 'can be converted to query string' do
-      query(User, :search => ['foo', 'bar'], 'enabled' => '1').params.to_query.should == 'enabled=true&search%5B%5D=foo&search%5B%5D=bar'
+      query(User, search: ['foo', 'bar'], 'enabled' => '1').params.to_query.should == 'enabled=true&search%5B%5D=foo&search%5B%5D=bar'
     end
 
   end
@@ -193,7 +193,7 @@ describe ScopedFrom::Query do
     end
 
     it 'removes values that are not scopes' do
-      query(User, :foo => 'bar', 'search' => 'foo', :enabled => true).params.should == { 'search' => 'foo', 'enabled' => true }
+      query(User, foo: 'bar', 'search' => 'foo', enabled: true).params.should == { 'search' => 'foo', 'enabled' => true }
     end
 
     it 'is case sensitive' do
@@ -293,16 +293,16 @@ describe ScopedFrom::Query do
 
     it 'includes column values' do
       query(User, 'firstname' => 'Jane', 'foo' => 'bar').params.should == { 'firstname' => 'Jane' }
-      query(User, :firstname => 'Jane', 'foo' => 'bar').params.should == { 'firstname' => 'Jane' }
+      query(User, firstname: 'Jane', 'foo' => 'bar').params.should == { 'firstname' => 'Jane' }
     end
 
     it 'exclude column values if :exclude_columns option is specified' do
-      query(User, { :enabled => true, 'firstname' => 'Jane', 'foo' => 'bar' }, :exclude_columns => true).params.should == { 'enabled' => true }
-      query(User, { :enabled => true, :firstname => 'Jane', :foo => 'bar' }, :exclude_columns => true).params.should == { 'enabled' => true }
+      query(User, { enabled: true, 'firstname' => 'Jane', 'foo' => 'bar' }, exclude_columns: true).params.should == { 'enabled' => true }
+      query(User, { enabled: true, firstname: 'Jane', foo: 'bar' }, exclude_columns: true).params.should == { 'enabled' => true }
     end
 
     it 'scopes have priority on columns' do
-      query(User, :enabled => false).params.should == {}
+      query(User, enabled: false).params.should == {}
     end
 
     it 'maps an "order"' do
@@ -331,7 +331,7 @@ describe ScopedFrom::Query do
     end
 
     it 'order can be specified as symbol' do
-      query(User, { :order => 'firstname.desc' }).params.should == { 'order' => 'firstname.desc' }
+      query(User, { order: 'firstname.desc' }).params.should == { 'order' => 'firstname.desc' }
     end
 
     it "order is case sensitive" do
@@ -339,10 +339,10 @@ describe ScopedFrom::Query do
     end
 
     it 'many order can be specified' do
-      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC'] }).params.should == { 'order' => ['lastname.desc', 'firstname.asc'] }
-      query(User, { 'order' => ['firstname.Asc', 'firstname.desc'] }).params.should == { 'order' => 'firstname.desc' }
-      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.desc', 'lastname.desc'] }
-      query(User, { 'order' => ['firstname.Asc', 'foo', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.desc', 'lastname.desc'] }
+      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
+      query(User, { 'order' => ['firstname.Asc', 'firstname.desc'] }).params.should == { 'order' => 'firstname.asc' }
+      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
+      query(User, { 'order' => ['firstname.Asc', 'foo', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
     end
 
     it 'order can be delimited by a space' do
@@ -368,18 +368,18 @@ describe ScopedFrom::Query do
 
     it 'does not execute any query' do
       User.should_not_receive(:connection)
-      query(User, :enabled => true).relation
+      query(User, enabled: true).relation
     end
 
     it 'works with scopes with a lambda without arguments' do
       users(:jane).update_attribute(:created_at, 10.days.ago)
-      query(User, :latest => true).relation.should == [users(:john)]
-      query(User, :latest => false).relation.should == [users(:john), users(:jane)]
+      query(User, latest: true).relation.should == [users(:john)]
+      query(User, latest: false).relation.should == [users(:john), users(:jane)]
     end
 
     it 'does not modify relation specified at initialization' do
       relation = User.search('foo')
-      q = query(relation, :enabled => true)
+      q = query(relation, enabled: true)
       expect {
         expect {
           q.relation
@@ -393,27 +393,27 @@ describe ScopedFrom::Query do
     end
 
     it 'invokes many times relation if an array is given' do
-      query(User, :search => ['John', 'Doe']).relation.should == [users(:john)]
-      query(User, :search => ['John', 'Done']).relation.should == []
-      query(User, :search => ['John', 'Doe']).params.should == { 'search' => ['John', 'Doe'] }
+      query(User, search: ['John', 'Doe']).relation.should == [users(:john)]
+      query(User, search: ['John', 'Done']).relation.should == []
+      query(User, search: ['John', 'Doe']).params.should == { 'search' => ['John', 'Doe'] }
     end
 
     it 'invokes many times relation if given twice (as string & symbol)' do
-      query(User, :search => 'John', 'search' => 'Done').params['search'].size.should be(2)
-      query(User, :search => 'John', 'search' => 'Done').params['search'].should include('John', 'Done')
+      query(User, search: 'John', 'search' => 'Done').params['search'].size.should be(2)
+      query(User, search: 'John', 'search' => 'Done').params['search'].should include('John', 'Done')
 
 
-      query(User, :search => 'John', 'search' => ['Did', 'Done']).params['search'].size.should be(3)
-      query(User, :search => 'John', 'search' => ['Did', 'Done']).params['search'].should include('John', 'Did', 'Done')
+      query(User, search: 'John', 'search' => ['Did', 'Done']).params['search'].size.should be(3)
+      query(User, search: 'John', 'search' => ['Did', 'Done']).params['search'].should include('John', 'Did', 'Done')
     end
 
     it 'invokes last order if an array is given' do
       create_user(:jane2, firstname: 'Jane', lastname: 'Zoe')
 
-      query(User, :order => ['lastname', 'firstname']).relation.should == [users(:jane), users(:john), users(:jane2)]
-      query(User, :order => ['lastname', 'firstname.desc']).relation.should == [users(:john), users(:jane), users(:jane2)]
-      query(User, :order => ['firstname', 'lastname.desc']).relation.should == [users(:jane2), users(:jane), users(:john)]
-      query(User, :order => ['firstname.desc', 'lastname']).relation.order_values.should == [{ 'firstname' => :desc }, { 'lastname' => :asc }]
+      query(User, order: ['lastname', 'firstname']).relation.should == [users(:jane), users(:john), users(:jane2)]
+      query(User, order: ['lastname', 'firstname.desc']).relation.should == [users(:john), users(:jane), users(:jane2)]
+      query(User, order: ['firstname', 'lastname.desc']).relation.should == [users(:jane2), users(:jane), users(:john)]
+      query(User, order: ['firstname.desc', 'lastname']).relation.order_values.should == [{ 'firstname' => :desc }, { 'lastname' => :asc }]
     end
 
     it 'defines #query method on returned relation' do

data/spec/spec_helper.rb

@@ -20,4 +20,4 @@ RSpec.configure do |config|
     create_user(:john, firstname: 'John', lastname: 'Doe', enabled: true, admin: true)
     create_user(:jane, firstname: 'Jane', lastname: 'Doe', enabled: false, admin: false)
   end
-end
+end

data/spec/support/bootsrap/database.rb

@@ -9,4 +9,4 @@ ActiveRecord::Base.connection.create_table(:users, force: true) do |t|
   t.boolean :admin, null: false, default: false
   t.timestamps
 end
-ActiveRecord::Base.connection.create_table(:votes, force: true)
+ActiveRecord::Base.connection.create_table(:votes, force: true)

data/spec/support/macros/user_macro.rb

@@ -10,4 +10,4 @@ module UserMacro
     USERS[label]
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoped_from
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: Provides a simple mapping between Active Record scopes and controller
-  parameters for Ruby On Rails 3
+  parameters for Ruby On Rails 4
 email: al@alweb.org
 executables: []
 extensions: []
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scoped_from
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Mapping between scopes and parameters for Rails