convenient_scopes 0.9.1 → 0.10.0

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'test-unit', :require => 'test/unit'
+gem 'shoulda'
+gem 'activerecord', '3.1.3', :require => 'active_record'
+gem 'rake'
+gem 'jeweler'
+gem 'sqlite3'

data/Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.5)
+    multi_json (1.1.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (2.11.3)
+    sqlite3 (1.3.5)
+    test-unit (2.4.7)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.1.3)
+  jeweler
+  rake
+  shoulda
+  sqlite3
+  test-unit

data/Rakefile

@@ -40,7 +40,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+# task :test => :check_dependencies
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.10.0

data/convenient_scopes.gemspec

@@ -4,20 +4,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{convenient_scopes}
-  s.version = "0.9.1"
+  s.name = "convenient_scopes"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Schneider"]
-  s.date = %q{2011-09-28}
-  s.description = %q{Dynamic scopes by convention for ActiveRecord 3}
-  s.email = %q{isc@massivebraingames.com}
+  s.date = "2012-02-23"
+  s.description = "Dynamic scopes by convention for ActiveRecord 3"
+  s.email = "isc@massivebraingames.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -31,24 +33,42 @@ Gem::Specification.new do |s|
     "test/test_ordering.rb",
     "test/test_search_with_hash.rb"
   ]
-  s.homepage = %q{http://github.com/isc/convenient_scopes}
+  s.homepage = "http://github.com/isc/convenient_scopes"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Dynamic scopes by convention for ActiveRecord 3}
+  s.rubygems_version = "1.8.17"
+  s.summary = "Dynamic scopes by convention for ActiveRecord 3"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<test-unit>, [">= 0"])
+      s.add_runtime_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 3.1.3"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.4"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["= 3.1.3"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.4"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["= 3.1.3"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 3.0.4"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/convenient_scopes.rb

@@ -1,7 +1,29 @@
 module ConvenientScopes
+  
+  def self.extended base
+    base.class_attribute :scopes
+    base.scopes = {}
+  end
+  
+  def scope(name, scope_options = {})
+    name = name.to_sym
+    valid_scope_name?(name)
+    extension = Module.new(&Proc.new) if block_given?
+
+    scopes[name] = lambda do |*args|
+      options = scope_options.respond_to?(:call) ? scope_options.call(*args) : scope_options
+      options = scoped.apply_finder_options(options) if options.is_a?(Hash)
+
+      relation = scoped.merge(options)
 
-  def method_missing(name, *args, &block)
-    if scope_data = (define_scope name)
+      extension ? relation.extending(extension) : relation
+    end
+
+    singleton_class.send(:redefine_method, name, &scopes[name])
+  end
+  
+  def method_missing name, *args, &block
+    if scope_data = (define_scope name, unscoped)
       scope name, convert_to_scope_arg(scope_data)
       send name, *args, &block
     else
@@ -9,10 +31,10 @@ module ConvenientScopes
     end
   end
 
-  def define_scope name
+  def define_scope name, unscoped
     (ScopeDefinitions.instance_methods.inject nil do |memo, scope_type|
-      memo ||= send scope_type.to_sym, name
-    end) || (association_scope name)
+      memo ||= send scope_type.to_sym, name, unscoped
+    end) || (association_scope name, unscoped)
   end
   
   def search search_scopes
@@ -32,12 +54,12 @@ module ConvenientScopes
     ActiveRecord::Relation::ASSOCIATION_METHODS).include? name
   end
   
-  def determine_order_scope_data name, direction
+  def determine_order_scope_data name, direction, unscoped
     if column_names.include? name.to_s
       unscoped.order("#{quoted_table_name}.#{name} #{direction}")
     elsif assoc = (possible_association_for_scope name)
       next_scope = extract_next_scope name, assoc
-      scope_arg = assoc.klass.determine_order_scope_data next_scope, direction
+      scope_arg = assoc.klass.determine_order_scope_data next_scope, direction, unscoped
       scope_arg.is_a?(Array) ? [assoc.name] + scope_arg : [assoc.name, scope_arg] if scope_arg
     end
   end
@@ -75,49 +97,49 @@ module ConvenientScopes
       [/^descend_by_/, 'desc']
     ]
 
-    def scopes_with_value name
+    def scopes_with_value name, unscoped
       SCOPE_DEFINITIONS.inject nil do |memo, definition|
-        memo ||= match_and_define_scope name, *definition
+        memo ||= match_and_define_scope name, unscoped, *definition
       end
     end
     
-    def scopes_without_value name
+    def scopes_without_value name, unscoped
       SCOPE_WITHOUT_VALUE_DEFINITIONS.inject nil do |memo, definition|
-        memo ||= match_and_define_scope_without_value name, *definition
+        memo ||= match_and_define_scope_without_value name, unscoped, *definition
       end
     end
 
-    def ordering_scopes name
+    def ordering_scopes name, unscoped
       ORDERING_SCOPE_DEFINITIONS.inject nil do |memo, definition|
-        memo ||= match_ordering_scope name, *definition
+        memo ||= match_ordering_scope name, unscoped, *definition
       end
     end
 
-    def equals_scope name
+    def equals_scope name, unscoped
       return unless (column = match_suffix_and_column_name name, %w(equals eq is))
-      lambda {|value| unscoped.where(column => value)}
+      lambda {|value| unscoped.where("#{table_name}.#{column}" => value)}
     end
 
-    def boolean_column_scopes name
+    def boolean_column_scopes name, unscoped
       str_name = name.to_s
       value = !str_name.gsub!(/^not_/, '')
-      unscoped.where(str_name => value) if boolean_column? str_name
+      unscoped.where("#{table_name}.#{str_name}" => value) if boolean_column? str_name
     end
 
   end
 
   include ScopeDefinitions
 
-  def match_ordering_scope name, prefix, direction
+  def match_ordering_scope name, unscoped, prefix, direction
     str_name = name.to_s
     return unless str_name.gsub!(prefix, '')
-    determine_order_scope_data str_name, direction
+    determine_order_scope_data str_name, direction, unscoped
   end
 
-  def association_scope name
+  def association_scope name, unscoped
     return unless assoc = (possible_association_for_scope name)
     next_scope = extract_next_scope name, assoc
-    scope_arg = (assoc.klass.define_scope next_scope) || assoc.klass.scopes[next_scope]
+    scope_arg = (assoc.klass.define_scope next_scope, unscoped) || assoc.klass.scopes[next_scope]
     scope_arg.is_a?(Array) ? [assoc.name] + scope_arg : [assoc.name, scope_arg] if scope_arg
   end
 
@@ -129,13 +151,13 @@ module ConvenientScopes
     name.to_s.split(/^#{assoc.name}_/).last.to_sym
   end
 
-  def match_and_define_scope name, suffixes, sql_format, value_format = nil
+  def match_and_define_scope name, unscoped, 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].flatten) }
   end
 
-  def match_and_define_scope_without_value name, suffixes, sql_format
+  def match_and_define_scope_without_value name, unscoped, suffixes, sql_format
     return unless (column = match_suffix_and_column_name name, suffixes)
     unscoped.where(formatted_sql column, sql_format)
   end

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'active_record'
+require 'bundler'
+require 'logger'
+Bundler.require
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,78 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: convenient_scopes
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
 platform: ruby
-authors: 
+authors:
 - Ivan Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70172753587060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70172753587060
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70172753586480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70172753586480
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: &70172753585880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *70172753585880
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70172753585360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70172753585360
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70172753584860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70172753584860
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70172753584240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70172753584240
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70172753575940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70172753575940
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70172753575300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70172753575300
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70172753574760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70172753574760
 description: Dynamic scopes by convention for ActiveRecord 3
 email: isc@massivebraingames.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,39 +133,31 @@ files:
 - 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4207565202313100759
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Dynamic scopes by convention for ActiveRecord 3
 test_files: []
-