convenient_scopes 0.8.1 → 0.8.2

data/Rakefile

@@ -44,12 +44,16 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+begin
+  require 'rdoc/task'
+  Rake::RDocTask.new do |rdoc|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "convenient_scopes #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "convenient_scopes #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts "rdoc requiring snafu"
 end

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-07-16}
+  s.date = %q{2011-07-19}
   s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.email = %q{isc@massivebraingames.com}
   s.extra_rdoc_files = [
@@ -33,16 +33,8 @@ 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.2}
   s.summary = %q{Dynamic scopes by convention for ActiveRecord 3}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_all_and_any_conditions.rb",
-    "test/test_associations.rb",
-    "test/test_conditions.rb",
-    "test/test_ordering.rb",
-    "test/test_search_with_hash.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/convenient_scopes.rb

@@ -18,7 +18,7 @@ module ConvenientScopes
   def search search_scopes
     res = scoped
     search_scopes.each do |name, args|
-      if scopes.keys.include?(name.to_sym) || !respond_to?(name)
+      if scopes.keys.include?(name.to_sym) || ar_relation_methods?(name) || !respond_to?(name)
         res = res.send name, args unless args == false
       else
         raise InvalidScopes
@@ -27,6 +27,11 @@ module ConvenientScopes
     res
   end
   
+  def ar_relation_methods? name
+    (ActiveRecord::Relation::MULTI_VALUE_METHODS + ActiveRecord::Relation::SINGLE_VALUE_METHODS +
+    ActiveRecord::Relation::ASSOCIATION_METHODS).include? name
+  end
+  
   def determine_order_scope_data name, direction
     if column_names.include? name.to_s
       unscoped.order("#{quoted_table_name}.#{name} #{direction}")

data/test/test_search_with_hash.rb

@@ -40,6 +40,10 @@ class TestSearchWithHash < Test::Unit::TestCase
       assert_equal [], User.where(:age => 37).search(:first_name_is => 'Angelo')
     end
     
+    should "be able to pass common ar methods in search" do
+      assert_equal [@bob], User.search(:where => "age = 37")
+    end
+    
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 +02:00
+date: 2011-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,14 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Dynamic scopes by convention for ActiveRecord 3
-test_files: 
-- test/helper.rb
-- test/test_all_and_any_conditions.rb
-- test/test_associations.rb
-- test/test_conditions.rb
-- test/test_ordering.rb
-- test/test_search_with_hash.rb
+test_files: []
+