convenient_scopes 0.4.0 → 0.5.0

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "isc@massivebraingames.com"
     gem.homepage = "http://github.com/isc/convenient_scopes"
     gem.authors = ["Ivan Schneider"]
-    gem.add_runtime_dependency "activerecord", ">= 3.0.0.beta4"
+    gem.add_runtime_dependency "activerecord", ">= 3.0.4"
     gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_development_dependency "sqlite3-ruby"
+    gem.add_development_dependency "sqlite3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/convenient_scopes.gemspec

@@ -1,65 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{convenient_scopes}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2011-02-20}
   s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
   s.email = %q{isc@massivebraingames.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "convenient_scopes.gemspec",
-     "lib/convenient_scopes.rb",
-     "test/helper.rb",
-     "test/test_associations.rb",
-     "test/test_conditions.rb",
-     "test/test_ordering.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "convenient_scopes.gemspec",
+    "lib/convenient_scopes.rb",
+    "test/helper.rb",
+    "test/test_all_and_any_conditions.rb",
+    "test/test_associations.rb",
+    "test/test_conditions.rb",
+    "test/test_ordering.rb"
   ]
   s.homepage = %q{http://github.com/isc/convenient_scopes}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.5.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_all_and_any_conditions.rb",
+    "test/test_associations.rb",
+    "test/test_conditions.rb",
+    "test/test_ordering.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.4"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.4"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.4"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/lib/convenient_scopes.rb

@@ -13,7 +13,7 @@ module ConvenientScopes
 
     def equals_scope name
       return unless (column = match_suffix_and_column_name name, %w(equals eq is))
-      lambda {|value| where(column => value)}
+      lambda {|value| unscoped.where(column => value)}
     end
 
     def does_not_equal_scope name
@@ -73,7 +73,7 @@ module ConvenientScopes
     def boolean_column_scope name
       return unless column_names.include? name.to_s
       return unless boolean_column? name
-      where(name => true)
+      unscoped.where(name => true)
     end
 
     def negative_boolean_column_scope name
@@ -81,7 +81,7 @@ module ConvenientScopes
       return unless str_name.gsub!(/^not_/, '')
       return unless column_names.include? str_name
       return unless boolean_column? str_name
-      where(str_name => false)
+      unscoped.where(str_name => false)
     end
 
   end
@@ -108,7 +108,7 @@ module ConvenientScopes
   
   def determine_order_scope_data name, direction
     if column_names.include? name.to_s
-      order("#{quoted_table_name}.#{name} #{direction}")
+      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
       scope_arg = assoc.klass.determine_order_scope_data next_scope, direction
@@ -132,7 +132,7 @@ module ConvenientScopes
   def define_scope name
     [Conditions, Ordering].map(&:instance_methods).flatten.each do |scope_type|
       if scope_arg = (send scope_type.to_sym, name)
-        return scope_arg unless scope_arg.nil?
+        return scope_arg
       end
     end
     association_scope name
@@ -141,12 +141,12 @@ 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| where([sql, value_format ? (value_format % value) : value])}
+    lambda {|value| unscoped.where([sql, value_format ? (value_format % value) : value])}
   end
 
   def match_and_define_scope_without_value name, suffixes, sql_format
     return unless (column = match_suffix_and_column_name name, suffixes)
-    where(formatted_sql column, sql_format)
+    unscoped.where(formatted_sql column, sql_format)
   end
 
   def formatted_sql column, sql_format

data/test/test_conditions.rb

@@ -14,6 +14,7 @@ class TestConditions < Test::Unit::TestCase
         User.blabla_eq('Bob')
       end
       assert_equal [@bob], User.pseudo_eq('Bob')
+      assert_equal [@slim], User.pseudo_eq('Slim')
       assert_equal [@slim], User.pseudo_is('Slim')
       assert_equal [@bob], User.first_name_is('Robert')
     end
@@ -66,5 +67,11 @@ class TestConditions < Test::Unit::TestCase
       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
+    
   end
 end

data/test/test_ordering.rb

@@ -1,13 +1,13 @@
 require 'helper'
 
 class TestOrdering < Test::Unit::TestCase
-  
+
   context "convenient_scopes" do
-    
+
     setup do
-      @bob = User.create :age => 43
-      @slim = User.create :age => 27
-      @avon = User.create :age => 37
+      @bob = User.create :age => 43, :pseudo => 'Bob'
+      @slim = User.create :age => 27, :pseudo => 'Slim'
+      @avon = User.create :age => 37, :pseudo => 'Avon'
       @managers = Group.create :users => [@bob, @avon]
       @developers = Group.create :users => [@slim]
     end
@@ -16,12 +16,20 @@ class TestOrdering < Test::Unit::TestCase
       assert_equal [@slim, @avon, @bob], User.ascend_by_age
       assert_equal [@bob, @avon, @slim], User.descend_by_age
     end
-    
+
     should "allow ordering by attributes of an association" do
       assert_equal [@developers, @managers], Group.ascend_by_users_age.uniq
       assert_equal [@managers, @developers], Group.descend_by_users_age.uniq
     end
-    
+
+    should "not screw stuff" do
+      User.where(:pseudo => 'Bob').descend_by_pseudo
+      sql = User.descend_by_pseudo.to_sql
+      assert_nil sql['Bob']
+      sql = User.where(:pseudo => 'Slim').descend_by_pseudo.to_sql
+      assert sql['Slim']
+    end
+
   end
-  
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convenient_scopes
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ivan Schneider
@@ -14,43 +15,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 +02:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 3
         - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: sqlite3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,7 +73,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -75,6 +80,7 @@ files:
 - convenient_scopes.gemspec
 - lib/convenient_scopes.rb
 - test/helper.rb
+- test/test_all_and_any_conditions.rb
 - test/test_associations.rb
 - test/test_conditions.rb
 - test/test_ordering.rb
@@ -83,28 +89,32 @@ homepage: http://github.com/isc/convenient_scopes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Dynamic scopes by convention for ActiveRecord 3

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC