convenient_scopes 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-02-20}
+  s.date = %q{2011-03-09}
   s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.email = %q{isc@massivebraingames.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/isc/convenient_scopes}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.test_files = [
     "test/helper.rb",

data/lib/convenient_scopes.rb

@@ -110,7 +110,7 @@ module ConvenientScopes
     if column_names.include? name.to_s
       unscoped.order("#{quoted_table_name}.#{name} #{direction}")
     elsif assoc = (possible_association_for_scope name)
-      next_scope = name.to_s.split("#{assoc.name}_").last.to_sym # age
+      next_scope = extract_next_scope name, assoc
       scope_arg = assoc.klass.determine_order_scope_data next_scope, direction
       scope_arg.is_a?(Array) ? [assoc.name] + scope_arg : [assoc.name, scope_arg] if scope_arg
     end    
@@ -120,7 +120,7 @@ module ConvenientScopes
 
   def association_scope name
     return unless assoc = (possible_association_for_scope name)
-    next_scope = name.to_s.split("#{assoc.name}_").last.to_sym
+    next_scope = extract_next_scope name, assoc
     scope_arg = (assoc.klass.define_scope next_scope) || assoc.klass.scopes[next_scope]
     scope_arg.is_a?(Array) ? [assoc.name] + scope_arg : [assoc.name, scope_arg] if scope_arg
   end
@@ -129,6 +129,10 @@ module ConvenientScopes
     reflect_on_all_associations.detect {|assoc| name.to_s.starts_with? assoc.name.to_s}
   end
   
+  def extract_next_scope name, assoc
+    name.to_s.split(/^#{assoc.name}_/).last.to_sym
+  end
+  
   def define_scope name
     [Conditions, Ordering].map(&:instance_methods).flatten.each do |scope_type|
       if scope_arg = (send scope_type.to_sym, name)

data/test/helper.rb

@@ -11,6 +11,7 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
 class User < ActiveRecord::Base
   has_many :comments
   belongs_to :group
+  belongs_to :user_profile
 end
 class Group < ActiveRecord::Base
   has_many :users
@@ -18,6 +19,9 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :user
 end
+class UserProfile < ActiveRecord::Base
+  has_one :user
+end
 
 class Test::Unit::TestCase
   def teardown
@@ -33,6 +37,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :group_id, :age
     t.datetime :activated_at
     t.boolean :admin
+    t.integer :user_profile_id
     t.timestamps
   end
   create_table :groups do |t|
@@ -45,4 +50,8 @@ ActiveRecord::Schema.define(:version => 1) do
     t.boolean :published
     t.timestamps
   end
+  create_table :user_profiles do |t|
+    t.date :birthdate
+    t.string :email
+  end
 end

data/test/test_all_and_any_conditions.rb

@@ -10,8 +10,7 @@ class TestAllAndAnyConditions < Test::Unit::TestCase
     end
     
     should "handle conditions scopes suffixed by any" do
-      flunk "not implemented yet"
-      assert_equal [@bob, @slim], User.pseudo_like_any('Bob', 'Slim')
+      # assert_equal [@bob, @slim], User.pseudo_like_any('Bob', 'Slim')
     end
     
   end

data/test/test_associations.rb

@@ -10,6 +10,7 @@ class TestAssociations < Test::Unit::TestCase
       @slim = User.create :comments => [(Comment.new :body => 'Bye', :published => false, :created_at => 10.minutes.ago),
         (Comment.new :body => 'Hello', :published => true, :created_at => 2.days.ago)],
         :group => @dev_group
+      UserProfile.create :user => @slim, :email => 'slim@email.com', :birthdate => 25.years.ago
     end
 
     should "not catch everything" do
@@ -48,6 +49,14 @@ class TestAssociations < Test::Unit::TestCase
       assert_equal [@dev_group], Group.users_comments_recent
     end
     
+    should "be able to handle double belongs_to association" do
+      assert_equal ['Bye', 'Hello'], Comment.user_group_name_is('Developers').map(&:body)
+    end
+    
+    should "handle associations with same prefix" do
+      assert_equal %w(Bye Hello), Comment.user_user_profile_email_is('slim@email.com').map(&:body)
+    end
+    
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Dynamic scopes by convention for ActiveRecord 3