scoped_from 0.1 → 0.2

data/Gemfile.lock

@@ -1,82 +1,101 @@
 PATH
   remote: .
   specs:
-    scoped_from (0.1)
-      activerecord (~> 3.0.0)
+    scoped_from (0.2)
+      activerecord (~> 3.1.0)
+      activesupport (~> 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.5)
-    arel (2.0.9)
-    builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    linecache (0.43)
-    rack (1.2.2)
-    rack-mount (0.6.13)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    columnize (0.3.4)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    multi_json (1.0.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sqlite3 (1.3.3)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
-    tzinfo (0.3.25)
+    tilt (1.3.3)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (~> 2.5.0)
-  rspec-rails (~> 2.5.0)
+  rspec (~> 2.7.0)
+  rspec-rails (~> 2.7.0)
   ruby-debug
   scoped_from!
   sqlite3-ruby

data/README.mdown

@@ -3,7 +3,23 @@
 Provides a simple mapping between scopes and controller parameters for
 [Ruby On Rails 3](http://rubyonrails.org/).
 
-Let see a simple example:
+## Installation
+
+### As a gem
+
+Just add this into your `Gemfile`:
+
+    gem 'scoped_from'
+
+Then, just run `bundle install`.
+
+### As a plugin
+
+From your application path, execute:
+
+    rails plugin install git://github.com/alexistoulotte/scoped_from.git
+
+## Example
 
 First, a model with some scopes:
 

data/VERSION

@@ -1 +1 @@
-0.1
+0.2

data/lib/scoped_from/active_record.rb

@@ -1,11 +1,14 @@
 module ScopedFrom
 
   module ActiveRecord
-
-    def self.included(base)
-      base.extend(ClassMethods)
+    
+    extend ActiveSupport::Concern
+    
+    included do |base|
+      base.class_attribute(:scope_arities)
+      base.scope_arities = ActiveSupport::HashWithIndifferentAccess.new
     end
-
+    
     module ClassMethods
       
       def scope(name, scope_options, &block)
@@ -27,12 +30,6 @@ module ScopedFrom
         query_class.new(self, params, options).scope
       end
       
-      private
-      
-      def scope_arities
-        read_inheritable_attribute(:scope_arities) || write_inheritable_attribute(:scope_arities, ActiveSupport::HashWithIndifferentAccess.new)
-      end
-
     end
     
   end

data/lib/scoped_from.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 require 'cgi'
 require 'active_record'
+require 'active_support/concern'
 require 'active_support/core_ext/object/to_query'
 
 module ScopedFrom

data/scoped_from.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '~> 3.0.0'
+  s.add_dependency 'activerecord', '~> 3.1.0'
+  s.add_dependency 'activesupport', '~> 3.1.0'
 
-  s.add_development_dependency 'rspec', '~> 2.5.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.5.0'
+  s.add_development_dependency 'rspec', '~> 2.7.0'
+  s.add_development_dependency 'rspec-rails', '~> 2.7.0'
   s.add_development_dependency 'ruby-debug'
   s.add_development_dependency 'sqlite3-ruby'
 end

data/spec/mocks/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
   
-  scope :enabled, :conditions => { :enabled => true }
+  scope :enabled, where(:enabled => true)
   scope :search, lambda { |pattern|
     where('firstname LIKE ? OR lastname LIKE ?', "%#{pattern}%", "%#{pattern}%")
   }

data/spec/scoped_from/query_spec.rb

@@ -75,7 +75,7 @@ describe ScopedFrom::Query do
     end
     
     it 'can be converted to query string' do
-      query(User, :search => ['foo', 'bar'], 'enabled' => '1').params.to_query.should == 'enabled=true&search[]=foo&search[]=bar'
+      query(User, :search => ['foo', 'bar'], 'enabled' => '1').params.to_query.should == 'enabled=true&search%5B%5D=foo&search%5B%5D=bar'
     end
     
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_from
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Alexis Toulotte
@@ -14,8 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +11:00
-default_executable: 
+date: 2011-10-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -25,50 +24,66 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 5
+        - 3
+        - 1
         - 0
-        version: 2.5.0
-  type: :development
+        version: 3.1.0
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
         - 2
-        - 5
+        - 7
         - 0
-        version: 2.5.0
+        version: 2.7.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: rspec-rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +93,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,7 +107,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Provides a simple mapping between Active Record scopes and controller parameters for Ruby On Rails 3
 email: al@alweb.org
 executables: []
@@ -128,7 +143,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/bootsrap/database.rb
 - spec/support/macros/user_macro.rb
-has_rdoc: true
 homepage: https://github.com/alexistoulotte/scoped_from
 licenses: []
 
@@ -158,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scoped_from
-rubygems_version: 1.5.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Mapping between scopes and parameters for Rails