convenient_scopes 0.5.1 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.5.1"
+  s.version = "0.6.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-09}
+  s.date = %q{2011-03-22}
   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.6.0}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.test_files = [
     "test/helper.rb",

data/lib/convenient_scopes.rb

@@ -70,6 +70,10 @@ 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
@@ -83,29 +87,28 @@ module ConvenientScopes
       return unless boolean_column? str_name
       unscoped.where(str_name => false)
     end
-
   end
 
   include Conditions
 
   module Ordering
-    
+
     def ascend_by_scope name
       ordering_scope name, /^ascend_by_/, 'asc'
     end
-    
+
     def descend_by_scope name
       ordering_scope name, /^descend_by_/, 'desc'
     end
-    
+
   end
-  
+
   def ordering_scope name, prefix, direction
     str_name = name.to_s
     return unless str_name.gsub!(prefix, '')
     determine_order_scope_data str_name, direction
   end
-  
+
   def determine_order_scope_data name, direction
     if column_names.include? name.to_s
       unscoped.order("#{quoted_table_name}.#{name} #{direction}")
@@ -113,9 +116,9 @@ module ConvenientScopes
       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    
+    end
   end
-  
+
   include Ordering
 
   def association_scope name
@@ -128,11 +131,11 @@ module ConvenientScopes
   def possible_association_for_scope name
     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)
@@ -145,7 +148,7 @@ module ConvenientScopes
   def match_and_define_scope name, suffixes, sql_format, value_format = nil
     return unless (column = match_suffix_and_column_name name, suffixes)
     sql = formatted_sql column, sql_format
-    lambda {|value| unscoped.where([sql, value_format ? (value_format % value) : value])}
+    lambda {|*value| unscoped.where([sql, value_format ? (value_format % value) : value].flatten) }
   end
 
   def match_and_define_scope_without_value name, suffixes, sql_format
@@ -154,7 +157,7 @@ module ConvenientScopes
   end
 
   def formatted_sql column, sql_format
-    sql = sql_format % "#{quoted_table_name}.#{column}"
+    sql = sql_format % (["#{quoted_table_name}.#{column}"] * sql_format.each("%s").count)
   end
 
   def match_suffix_and_column_name name, suffixes
@@ -179,7 +182,7 @@ module ConvenientScopes
       lambda {|*value| relation_or_proc.call(*value).joins joins_arg }
     end
   end
-  
+
 end
 
 ActiveRecord::Base.extend ConvenientScopes

data/test/test_conditions.rb

@@ -8,7 +8,7 @@ class TestConditions < Test::Unit::TestCase
       @slim = User.create :pseudo => 'Slim', :first_name => 'Angelo', :age => 12,
         :activated_at => nil, :admin => false
     end
-    
+
     should "equals scope" do
       assert_raise NoMethodError do
         User.blabla_eq('Bob')
@@ -18,60 +18,65 @@ class TestConditions < Test::Unit::TestCase
       assert_equal [@slim], User.pseudo_is('Slim')
       assert_equal [@bob], User.first_name_is('Robert')
     end
-    
+
     should "equals scope on a relation" do
       assert_equal [@bob], User.order('age').pseudo_eq('Bob')
     end
-    
+
     should "not equals scope" do
       assert_equal [@bob], User.pseudo_is_not('Slim')
       assert_equal [@bob], User.first_name_does_not_equal('Angelo')
     end
-    
+
     should "less than (or equal)? scope" do
       assert_equal [@slim], User.age_lt(37)
       assert_equal [@slim], User.age_less_than_or_equal(12)
     end
-    
+
     should "greater than (or equal)? scope" do
       assert_equal [@bob], User.age_greater_than(12)
       assert_equal [@bob], User.age_gte(37)
       assert_equal [@bob], User.activated_at_after(40.hours.ago)
     end
-    
+
     should "like scope" do
       assert_equal [@slim], User.first_name_matches('nge')
     end
-    
+
     should "not like scope" do
       assert_equal [@slim], User.pseudo_not_like('o')
     end
-    
+
     should "begins / ends with scope" do
       assert_equal [@bob], User.first_name_starts_with('Rob')
       assert_equal [@slim], User.first_name_ends_with('o')
     end
-    
+
     should "not begins / ends with scope" do
       assert_equal [@slim], User.first_name_does_not_start_with('Rob')
-      assert_equal [@bob], User.first_name_doesnt_end_with('o')      
+      assert_equal [@bob], User.first_name_doesnt_end_with('o')
     end
-    
+
     should "(not)? null scope" do
       assert_equal [@slim], User.activated_at_null
       assert_equal [@bob], User.activated_at_not_nil
     end
-    
+
     should "boolean columns" do
       assert_equal [@bob], User.admin
       assert_equal [@slim], User.not_admin
     end
-    
+
     should "not mix up scopes" do
       User.age_gt(0).pseudo_null
       sql = User.pseudo_null.to_sql
       assert_nil sql['age']
     end
-    
+
+    should "between" do
+      assert_equal [@bob], User.activated_at_between(40.hours.ago, 34.hours.ago)
+      assert_equal [], User.activated_at_between(40.hours.ago, 38.hours.ago)
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
+date: 2011-03-22 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.6.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Dynamic scopes by convention for ActiveRecord 3