meta_where 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+Changes since 0.9.3 (2010-09-08):
+  * alias :& to :merge in singleton to work properly with Ruby 1.8.7.
+  * Fix merge to only use associations if not against the same base class. (STI)
+
 Changes since 0.9.2 (2010-08-26):
   * Updated gemspec to require Rails 3.0.0 final.
 

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "meta_where"
-    gem.summary = %Q{Add a dash of Arel awesomeness to your condition hashes.}
+    gem.summary = %Q{ActiveRecord 3 query syntax on steroids.}
     gem.description = %Q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -22,7 +22,15 @@ begin
     gem.add_dependency "activerecord", "~> 3.0.0"
     gem.add_dependency "activesupport", "~> 3.0.0"
     gem.add_dependency "arel", "~> 1.0.1"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.post_install_message = <<END
+
+*** Thanks for installing MetaWhere! ***
+Be sure to check out http://metautonomo.us/projects/metawhere/ for a
+walkthrough of MetaWhere's features, and click the donate button if
+you're feeling especially appreciative. It'd help me justify this
+"open source" stuff to my lovely wife. :)
+
+END
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/meta_where/relation.rb

@@ -6,10 +6,15 @@ module MetaWhere
         alias_method_chain :reset, :metawhere
         alias_method_chain :scope_for_create, :metawhere
       end
+
+      # We have to do this on the singleton to work with Ruby 1.8.7. Not sure why.
+      base.instance_eval do
+        alias_method :&, :merge
+      end
     end
 
     def merge(r, association_name = nil)
-      if (r && (association_name || klass.name != r.klass.name)) # Merging relations with different base.
+      if (r && (association_name || base_class != r.klass.base_class)) # Merging relations with different base.
         association_name ||= (default_association = reflect_on_all_associations.detect {|a| a.klass.name == r.klass.name}) ?
                              default_association.name : r.table_name.to_sym
         r = r.clone
@@ -17,11 +22,10 @@ module MetaWhere
         r.joins_values.map! {|j| [Symbol, Hash].include?(j.class) ? {association_name => j} : j}
         self.joins_values += [association_name]
       end
+
       super(r)
     end
 
-    alias_method :&, :merge
-
     def reset_with_metawhere
       @mw_unique_joins = @mw_association_joins = @mw_non_association_joins =
         @mw_stashed_association_joins = @mw_custom_joins = nil
@@ -42,7 +46,7 @@ module MetaWhere
 
     def build_where(opts, other = [])
       if opts.is_a?(String)
-        @klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))
+        [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
       else
         predicates = []
         [opts, *other].each do |arg|

data/meta_where.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_where}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-09-23}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
      "test/fixtures/developer.rb",
      "test/fixtures/developers.yml",
      "test/fixtures/developers_projects.yml",
+     "test/fixtures/fixed_bid_project.rb",
      "test/fixtures/invalid_company.rb",
      "test/fixtures/invalid_developer.rb",
      "test/fixtures/note.rb",
@@ -63,25 +64,36 @@ Gem::Specification.new do |s|
      "test/fixtures/project.rb",
      "test/fixtures/projects.yml",
      "test/fixtures/schema.rb",
+     "test/fixtures/time_and_materials_project.rb",
      "test/helper.rb",
      "test/test_base.rb",
      "test/test_relations.rb"
   ]
   s.homepage = %q{http://metautonomo.us/projects/metawhere/}
+  s.post_install_message = %q{
+*** Thanks for installing MetaWhere! ***
+Be sure to check out http://metautonomo.us/projects/metawhere/ for a
+walkthrough of MetaWhere's features, and click the donate button if
+you're feeling especially appreciative. It'd help me justify this
+"open source" stuff to my lovely wife. :)
+
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Add a dash of Arel awesomeness to your condition hashes.}
+  s.summary = %q{ActiveRecord 3 query syntax on steroids.}
   s.test_files = [
     "test/fixtures/company.rb",
      "test/fixtures/data_type.rb",
      "test/fixtures/developer.rb",
+     "test/fixtures/fixed_bid_project.rb",
      "test/fixtures/invalid_company.rb",
      "test/fixtures/invalid_developer.rb",
      "test/fixtures/note.rb",
      "test/fixtures/person.rb",
      "test/fixtures/project.rb",
      "test/fixtures/schema.rb",
+     "test/fixtures/time_and_materials_project.rb",
      "test/helper.rb",
      "test/test_base.rb",
      "test/test_relations.rb"

data/test/fixtures/fixed_bid_project.rb

@@ -0,0 +1,2 @@
+class FixedBidProject < Project
+end

data/test/fixtures/project.rb

@@ -1,4 +1,7 @@
 class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers
   has_many :notes, :as => :notable
+
+  default_scope where(:name.not_eq => nil)
+  scope :hours_lte_100, where(:estimated_hours.lte => 100)
 end

data/test/fixtures/projects.yml

@@ -2,23 +2,28 @@ y2k:
   estimated_hours: 1000
   name           : Y2K Software Updates
   id             : 1
+  type           : FixedBidProject
 
 virus:
   estimated_hours: 80
   name           : Virus
   id             : 2
-  
+  type           : FixedBidProject
+
 awesome:
   estimated_hours: 100
   name           : Do something awesome
   id             : 3
-  
+  type           : FixedBidProject
+
 metasearch:
   estimated_hours: 100
   name           : MetaSearch Development
   id             : 4
-  
+  type           : TimeAndMaterialsProject
+
 another:
   estimated_hours: 120
   name           : Another Project
-  id             : 5
+  id             : 5
+  type           : TimeAndMaterialsProject

data/test/fixtures/schema.rb

@@ -5,24 +5,25 @@ ActiveRecord::Schema.define do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  
+
   create_table "developers", :force => true do |t|
     t.integer  "company_id"
     t.string   "name"
     t.integer  "salary"
     t.boolean  "slacker"
   end
-  
+
   create_table "projects", :force => true do |t|
     t.string   "name"
+    t.string   "type"
     t.float    "estimated_hours"
   end
-  
+
   create_table "developers_projects", :id => false, :force => true do |t|
     t.integer  "developer_id"
     t.integer  "project_id"
   end
-  
+
   create_table "notes", :force => true do |t|
     t.string   "notable_type"
     t.integer  "notable_id"
@@ -43,7 +44,7 @@ ActiveRecord::Schema.define do
     t.binary   "bin"
     t.boolean  "bln"
   end
-  
+
   create_table "people", :force => true do |t|
     t.integer  "parent_id"
     t.string   "name"

data/test/fixtures/time_and_materials_project.rb

@@ -0,0 +1,2 @@
+class TimeAndMaterialsProject < Project
+end

data/test/helper.rb

@@ -4,6 +4,9 @@ require 'shoulda'
 require 'active_record'
 require 'active_record/fixtures'
 require 'active_support/time'
+require 'meta_where'
+
+MetaWhere.operator_overload!
 
 FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 
@@ -26,8 +29,6 @@ Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'meta_where'
-MetaWhere.operator_overload!
 
 class Test::Unit::TestCase
 end

data/test/test_relations.rb

@@ -145,6 +145,26 @@ class TestRelations < Test::Unit::TestCase
     end
   end
 
+  context "A relation from an STI class" do
+    setup do
+      @r = TimeAndMaterialsProject.scoped
+    end
+
+    should "return results from the designated class only" do
+      assert_equal 2, @r.size
+      assert @r.all? {|r| r.is_a?(TimeAndMaterialsProject)}
+    end
+
+    should "inherit the default scope of the parent class" do
+      assert_match /IS NOT NULL/, @r.to_sql
+    end
+
+    should "allow use of scopes in the parent class" do
+      assert_equal 1, @r.hours_lte_100.size
+      assert_equal 'MetaSearch Development', @r.hours_lte_100.first.name
+    end
+  end
+
   context "A merged relation" do
     setup do
       @r = Developer.where(:salary.gteq % 70000) & Company.where(:name.matches % 'Initech')
@@ -201,8 +221,8 @@ class TestRelations < Test::Unit::TestCase
 
     context "with self-referencing joins on parent and children" do
       setup do
-        @r = @r.where(:children => {:children => {:parent => {:parent => {:name => 'Abraham'}}}})
-               .joins(:children => {:children => {:parent => :parent}})
+        @r = @r.where(:children => {:children => {:parent => {:parent => {:name => 'Abraham'}}}}).
+                joins(:children => {:children => {:parent => :parent}})
       end
 
       should "join the table multiple times with aliases" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -04:00
+date: 2010-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - test/fixtures/developer.rb
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
+- test/fixtures/fixed_bid_project.rb
 - test/fixtures/invalid_company.rb
 - test/fixtures/invalid_developer.rb
 - test/fixtures/note.rb
@@ -123,6 +124,7 @@ files:
 - test/fixtures/project.rb
 - test/fixtures/projects.yml
 - test/fixtures/schema.rb
+- test/fixtures/time_and_materials_project.rb
 - test/helper.rb
 - test/test_base.rb
 - test/test_relations.rb
@@ -130,7 +132,12 @@ has_rdoc: true
 homepage: http://metautonomo.us/projects/metawhere/
 licenses: []
 
-post_install_message: 
+post_install_message: "\n\
+  *** Thanks for installing MetaWhere! ***\n\
+  Be sure to check out http://metautonomo.us/projects/metawhere/ for a\n\
+  walkthrough of MetaWhere's features, and click the donate button if\n\
+  you're feeling especially appreciative. It'd help me justify this\n\
+  \"open source\" stuff to my lovely wife. :)\n\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -157,17 +164,19 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Add a dash of Arel awesomeness to your condition hashes.
+summary: ActiveRecord 3 query syntax on steroids.
 test_files: 
 - test/fixtures/company.rb
 - test/fixtures/data_type.rb
 - test/fixtures/developer.rb
+- test/fixtures/fixed_bid_project.rb
 - test/fixtures/invalid_company.rb
 - test/fixtures/invalid_developer.rb
 - test/fixtures/note.rb
 - test/fixtures/person.rb
 - test/fixtures/project.rb
 - test/fixtures/schema.rb
+- test/fixtures/time_and_materials_project.rb
 - test/helper.rb
 - test/test_base.rb
 - test/test_relations.rb