convenient_scopes 0.7.1 → 0.8.0

data/README.rdoc

@@ -16,4 +16,4 @@ Pretty much the same API as searchlogic except it's compatible with ActiveRecord
 
 == Copyright
 
-Copyright (c) 2010 Ivan Schneider. See LICENSE for details.
+Copyright (c) 2011 Ivan Schneider. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/convenient_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-07-10}
+  s.date = %q{2011-07-12}
   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

@@ -10,7 +10,7 @@ module ConvenientScopes
   end
 
   def define_scope name
-    ([Conditions, Ordering].map(&:instance_methods).flatten.inject nil do |memo, scope_type|
+    (ScopeDefinitions.instance_methods.inject nil do |memo, scope_type|
       memo ||= send scope_type.to_sym, name
     end) || (association_scope name)
   end
@@ -41,7 +41,7 @@ module ConvenientScopes
   
   class InvalidScopes < Exception ; end
 
-  module Conditions
+  module ScopeDefinitions
 
     SCOPE_DEFINITIONS = [ 
       [%w(does_not_equal doesnt_equal ne is_not), "%s != ?"],
@@ -60,7 +60,14 @@ module ConvenientScopes
 
     SCOPE_WITHOUT_VALUE_DEFINITIONS = [
       [%w(null nil missing), "%s is null"],
-      [%w(not_null not_nil not_missing), "%s is not null"]
+      [%w(not_null not_nil not_missing), "%s is not null"],
+      [%w(blank not_present), "%s is null OR %s = ''"],
+      [%w(not_blank present), "%s is not null AND %s <> ''"]
+    ]
+    
+    ORDERING_SCOPE_DEFINITIONS = [
+      [/^ascend_by_/, 'asc'],
+      [/^descend_by_/, 'desc']
     ]
 
     def scopes_with_value name
@@ -75,45 +82,33 @@ module ConvenientScopes
       end
     end
 
+    def ordering_scopes name
+      ORDERING_SCOPE_DEFINITIONS.inject nil do |memo, definition|
+        memo ||= match_ordering_scope name, *definition
+      end
+    end
+
     def equals_scope name
       return unless (column = match_suffix_and_column_name name, %w(equals eq is))
       lambda {|value| unscoped.where(column => value)}
     end
 
-    def boolean_column_scope name
-      return unless boolean_column? name
-      unscoped.where(name => true)
-    end
-
-    def negative_boolean_column_scope name
+    def boolean_column_scopes name
       str_name = name.to_s
-      return unless str_name.gsub!(/^not_/, '') && 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'
+      value = !str_name.gsub!(/^not_/, '')
+      unscoped.where(str_name => value) if boolean_column? str_name
     end
 
   end
 
-  def ordering_scope name, prefix, direction
+  include ScopeDefinitions
+
+  def match_ordering_scope name, prefix, direction
     str_name = name.to_s
     return unless str_name.gsub!(prefix, '')
     determine_order_scope_data str_name, direction
   end
 
-  include Ordering
-
   def association_scope name
     return unless assoc = (possible_association_for_scope name)
     next_scope = extract_next_scope name, assoc
@@ -145,7 +140,7 @@ module ConvenientScopes
   end
 
   def match_suffix_and_column_name name, suffixes
-    str_name = name.to_s
+    str_name = name.to_s.dup
     regexp_str = suffixes.map {|suffix| "(_#{suffix})"}.join('|') + '$'
     return unless str_name.gsub!(Regexp.new(regexp_str), '')
     return unless column_names.include? str_name

data/test/test_conditions.rb

@@ -73,6 +73,20 @@ class TestConditions < Test::Unit::TestCase
       end
     end
 
+    should "blank and present scopes" do
+      u = User.create :pseudo => ''
+      assert_equal [u], User.pseudo_blank
+      assert_equal [u], User.pseudo_not_present
+      u.update_attribute :pseudo, nil
+      assert_equal [u], User.pseudo_blank
+      assert_equal [u], User.pseudo_not_present
+      assert_equal 2, User.pseudo_not_blank.count
+      assert_equal 2, User.pseudo_present.count
+      u.update_attribute :pseudo, ''
+      assert_equal 2, User.pseudo_not_blank.count
+      assert_equal 2, User.pseudo_present.count
+    end
+
     should "not mix up scopes" do
       User.age_gt(0).pseudo_null
       sql = User.pseudo_null.to_sql

metadata

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