convenient_scopes 0.8.0 → 0.8.1

data/VERSION

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

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-07-12}
+  s.date = %q{2011-07-16}
   s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.email = %q{isc@massivebraingames.com}
   s.extra_rdoc_files = [

data/lib/convenient_scopes.rb

@@ -16,7 +16,7 @@ module ConvenientScopes
   end
   
   def search search_scopes
-    res = unscoped
+    res = scoped
     search_scopes.each do |name, args|
       if scopes.keys.include?(name.to_sym) || !respond_to?(name)
         res = res.send name, args unless args == false
@@ -154,13 +154,18 @@ module ConvenientScopes
   def convert_to_scope_arg scope_data
     return scope_data unless scope_data.is_a? Array
     relation_or_proc = scope_data.pop
-    joins_arg = (scope_data.size == 1) ? scope_data.first : {scope_data.first => scope_data.last}
+    joins_arg = determine_joins_arg scope_data
     if relation_or_proc.is_a? ActiveRecord::Relation
       relation_or_proc.joins joins_arg
     else
       lambda {|*value| relation_or_proc.call(*value).joins joins_arg }
     end
   end
+  
+  def determine_joins_arg scope_data
+    return scope_data.first if scope_data.size == 1
+    {scope_data.shift => determine_joins_arg(scope_data)}
+  end
 
 end
 

data/test/helper.rb

@@ -18,10 +18,14 @@ class Group < ActiveRecord::Base
 end
 class Comment < ActiveRecord::Base
   belongs_to :user
+  belongs_to :post
 end
 class UserProfile < ActiveRecord::Base
   has_one :user
 end
+class Post < ActiveRecord::Base
+  has_many :comments
+end
 
 class Test::Unit::TestCase
   def teardown
@@ -46,7 +50,7 @@ ActiveRecord::Schema.define(:version => 1) do
   end
   create_table :comments do |t|
     t.string :body
-    t.integer :user_id
+    t.integer :user_id, :post_id
     t.boolean :published
     t.timestamps
   end
@@ -54,4 +58,8 @@ ActiveRecord::Schema.define(:version => 1) do
     t.date :birthdate
     t.string :email
   end
+  create_table :posts do |t|
+    t.string :title, :author
+    t.text :body
+  end
 end

data/test/test_associations.rb

@@ -43,6 +43,10 @@ class TestAssociations < Test::Unit::TestCase
       assert_equal [@dev_group], Group.users_comments_published
     end
     
+    should "also handle three levels of association" do
+      assert_equal 3, Post.comments_user_user_profile_email_is('blbabla').to_sql.scan('INNER JOIN').size
+    end
+    
     should "be able to leverage a named scope on an association" do
       Comment.scope :recent, Comment.created_at_after(1.hour.ago).created_at_not_nil
       assert_equal [@slim], User.comments_recent

data/test/test_search_with_hash.rb

@@ -36,6 +36,10 @@ class TestSearchWithHash < Test::Unit::TestCase
       assert_equal 2, User.count
     end
     
+    should "not mess up previous scoping" do
+      assert_equal [], User.where(:age => 37).search(:first_name_is => 'Angelo')
+    end
+    
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency