convenient_scopes 0.6.0 → 0.7.0

data/Rakefile

@@ -44,7 +44,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-03-22}
+  s.date = %q{2011-07-10}
   s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.email = %q{isc@massivebraingames.com}
   s.extra_rdoc_files = [
@@ -28,7 +28,8 @@ Gem::Specification.new do |s|
     "test/test_all_and_any_conditions.rb",
     "test/test_associations.rb",
     "test/test_conditions.rb",
-    "test/test_ordering.rb"
+    "test/test_ordering.rb",
+    "test/test_search_with_hash.rb"
   ]
   s.homepage = %q{http://github.com/isc/convenient_scopes}
   s.require_paths = ["lib"]
@@ -39,7 +40,8 @@ Gem::Specification.new do |s|
     "test/test_all_and_any_conditions.rb",
     "test/test_associations.rb",
     "test/test_conditions.rb",
-    "test/test_ordering.rb"
+    "test/test_ordering.rb",
+    "test/test_search_with_hash.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/convenient_scopes.rb

@@ -8,6 +8,21 @@ module ConvenientScopes
       super
     end
   end
+  
+  def search search_scopes
+    res = unscoped
+    search_scopes.each do |name, args|
+      if scopes.keys.include?(name.to_sym) || !respond_to?(name)
+        res = res.send name, args unless args == false
+      else
+        raise InvalidScopes
+      end
+    end
+    res
+  end
+  
+  class InvalidScopes < Exception
+  end
 
   module Conditions
 
@@ -15,53 +30,31 @@ module ConvenientScopes
       return unless (column = match_suffix_and_column_name name, %w(equals eq is))
       lambda {|value| unscoped.where(column => value)}
     end
-
-    def does_not_equal_scope name
-      match_and_define_scope name, %w(does_not_equal doesnt_equal ne is_not), "%s != ?"
-    end
-
-    def less_than_scope name
-      match_and_define_scope name, %w(less_than lt before), "%s < ?"
-    end
-
-    def less_than_or_equal_scope name
-      match_and_define_scope name, %w(less_than_or_equal lte), "%s <= ?"
-    end
-
-    def greater_than_scope name
-      match_and_define_scope name, %w(greater_than gt after), "%s > ?"
-    end
-
-    def greater_than_or_equal_scope name
-      match_and_define_scope name, %w(greater_than_or_equal gte), "%s >= ?"
-    end
-
-    def like_scope name
-      match_and_define_scope name, %w(like matches contains includes), "%s like ?", "%%%s%%"
-    end
-
-    def not_like_scope name
-      suffixes = %w(not_like does_not_match doesnt_match does_not_contain doesnt_contain does_not_include doesnt_include)
-      match_and_define_scope name, suffixes, "%s not like ?", "%%%s%%"
-    end
-
-    def begins_with_scope name
-      match_and_define_scope name, %w(begins_with bw starts_with sw), "%s like ?", "%s%%"
-    end
-
-    def not_begin_with_scope name
-      suffixes = %w(not_begin_with does_not_begin_with doesnt_begin_with does_not_start_with doesnt_start_with)
-      match_and_define_scope name, suffixes, "%s not like ?", "%s%%"
-    end
-
-    def ends_with_scope name
-      match_and_define_scope name, %w(ends_with ew), "%s like ?", "%%%s"
-    end
-
-    def not_end_with_scope name
-      match_and_define_scope name, %w(not_end_with does_not_end_with doesnt_end_with), "%s not like ?", "%%%s"
+    
+    SCOPE_DEFINITIONS = [ 
+      [%w(does_not_equal doesnt_equal ne is_not), "%s != ?"],
+      [%w(less_than lt before), "%s < ?"],
+      [%w(less_than_or_equal lte), "%s <= ?"],
+      [%w(greater_than gt after), "%s > ?"],
+      [%w(greater_than_or_equal gte), "%s >= ?"],
+      [%w(like matches contains includes), "%s like ?", "%%%s%%"],
+      [%w(not_like does_not_match doesnt_match does_not_contain doesnt_contain does_not_include doesnt_include), "%s not like ?", "%%%s%%"],
+      [%w(begins_with bw starts_with sw), "%s like ?", "%s%%"],
+      [%w(not_begin_with does_not_begin_with doesnt_begin_with does_not_start_with doesnt_start_with), "%s not like ?", "%s%%"],
+      [%w(ends_with ew), "%s like ?", "%%%s"],
+      [%w(not_end_with does_not_end_with doesnt_end_with), "%s not like ?", "%%%s"],
+      [%w(between), "%s >= ? AND %s < ?"]
+    ]
+    
+    def scopes_with_values name
+      SCOPE_DEFINITIONS.each do |definition|
+        if scope_arg = (match_and_define_scope name, *definition)
+          return scope_arg
+        end
+      end
+      nil
     end
-
+    
     def null_scope name
       match_and_define_scope_without_value name, %w(null nil missing), "%s is null"
     end
@@ -70,12 +63,7 @@ module ConvenientScopes
       match_and_define_scope_without_value name, %w(not_null not_nil not_missing), "%s is not null"
     end
 
-    def between name
-      match_and_define_scope name, %w(between), "%s >= ? AND %s < ?"
-    end
-
     def boolean_column_scope name
-      return unless column_names.include? name.to_s
       return unless boolean_column? name
       unscoped.where(name => true)
     end
@@ -83,7 +71,6 @@ module ConvenientScopes
     def negative_boolean_column_scope name
       str_name = name.to_s
       return unless str_name.gsub!(/^not_/, '')
-      return unless column_names.include? str_name
       return unless boolean_column? str_name
       unscoped.where(str_name => false)
     end
@@ -169,7 +156,7 @@ module ConvenientScopes
   end
 
   def boolean_column? name
-    columns.detect {|c|c.name == name.to_s}.type == :boolean
+    columns.detect {|c|c.name == name.to_s}.try(:type) == :boolean
   end
 
   def convert_to_scope_arg scope_data

data/test/test_associations.rb

@@ -14,10 +14,10 @@ class TestAssociations < Test::Unit::TestCase
     end
 
     should "not catch everything" do
-      assert_raise NoMethodError do
+      assert_raises NoMethodError do
         User.comment_body_is('Yo')
       end
-      assert_raise NoMethodError do
+      assert_raises NoMethodError do
         User.comments_synopsis_eq('Yo')
       end
     end

data/test/test_conditions.rb

@@ -10,7 +10,7 @@ class TestConditions < Test::Unit::TestCase
     end
 
     should "equals scope" do
-      assert_raise NoMethodError do
+      assert_raises NoMethodError do
         User.blabla_eq('Bob')
       end
       assert_equal [@bob], User.pseudo_eq('Bob')
@@ -65,6 +65,12 @@ class TestConditions < Test::Unit::TestCase
     should "boolean columns" do
       assert_equal [@bob], User.admin
       assert_equal [@slim], User.not_admin
+      assert_raises NoMethodError do
+        User.not_age
+      end
+      assert_raises NoMethodError do
+        User.not_shablagoo
+      end
     end
 
     should "not mix up scopes" do

data/test/test_search_with_hash.rb

@@ -0,0 +1,41 @@
+require 'helper'
+
+class TestSearchWithHash < Test::Unit::TestCase
+  
+  context "Given two users" do
+    setup do
+      @bob = User.create :pseudo => 'Bob', :first_name => 'Robert', :age => 37,
+        :activated_at => 37.hours.ago, :admin => true
+      @slim = User.create :pseudo => 'Slim', :first_name => 'Angelo', :age => 12,
+        :activated_at => nil, :admin => false
+    end
+
+    should "search with hash" do
+      assert_equal [@bob], User.search(:pseudo_like => 'Bo')
+      assert_equal [], User.search(:pseudo_like => 'Bo', :age_is => 12)
+    end
+    
+    should "search with hash with scopes with no argument" do
+      assert_equal [@bob], User.search(:admin => true)
+      assert_equal [@slim], User.search(:not_admin => true)
+    end
+    
+    should "not apply the scope when the value associated is false" do
+      assert_equal [@bob, @slim], User.search(:admin => false)
+    end
+    
+    should "be able to leverage existing scopes" do
+      User.scope :underage, User.age_lt(18)
+      assert_equal [@slim], User.search(:underage => true)
+    end
+    
+    should "be safe when using search with hash" do
+      assert_raises ConvenientScopes::InvalidScopes do
+        User.search :destroy => @bob.id
+      end
+      assert_equal 2, User.count
+    end
+    
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-07-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - test/test_associations.rb
 - test/test_conditions.rb
 - test/test_ordering.rb
+- test/test_search_with_hash.rb
 has_rdoc: true
 homepage: http://github.com/isc/convenient_scopes
 licenses: []
@@ -124,3 +125,4 @@ test_files:
 - test/test_associations.rb
 - test/test_conditions.rb
 - test/test_ordering.rb
+- test/test_search_with_hash.rb