squeel 0.7.2 → 0.7.3

data/README.md

@@ -30,9 +30,27 @@ Squeel enhances the normal ActiveRecord query methods by enabling them to accept
 blocks. Inside a block, the Squeel query DSL can be used. Note the use of curly braces
 in these examples instead of parentheses. `{}` denotes a Squeel DSL query.
 
-Stubs and keypaths are the two primary building blocks used in a Squeel DSL query, so
-before we go on, let's take a look at them. Most of the other examples that follow will
-be based on this "symbol-less" syntax, so it might look a bit foreign otherwise.
+Stubs and keypaths are the two primary building blocks used in a Squeel DSL query, so we'll
+start by taking a look at them. Most of the other examples that follow will be based on
+this "symbol-less" block syntax.
+
+*An important gotcha, before we begin:* The Squeel DSL works its magic using `instance_eval`.
+If you've been working with Ruby for a while, you'll know immediately that this means that
+_inside_ a Squeel DSL block, `self` isn't the same thing that it is _outside_ the block.
+
+This carries with it an important implication: <strong>Instance variables and instance methods
+inside the block won't refer to your object's variables/methods.</strong>
+
+Don't worry, Squeel's got you covered. Use one of the following methods to get access
+to your object's methods and variables:
+
+  1. Assign the variable locally before the DSL block, and access it as you would
+     normally.
+  2. Supply and arity to the DSL block, as in `Person.where{|dsl| dsl.name == @my_name}`
+     Downside: You'll need to prefix stubs, keypaths, and functions (explained below)
+     with the DSL object.
+  3. Wrap the method or instance variable inside the block with `my{}`.
+     `Person.where{name == my{some_method_to_return_a_name}}`
 
 ### Stubs
 

data/lib/squeel/adapters/active_record/3.0/relation.rb

@@ -258,7 +258,7 @@ module Squeel
           nodes.map { |node|
             case node
             when Arel::Nodes::Equality
-              node
+              node if node.left.relation.name == table_name
             when Arel::Nodes::Grouping
               find_equality_predicates([node.expr])
             when Arel::Nodes::And

data/lib/squeel/adapters/active_record/relation.rb

@@ -272,7 +272,7 @@ module Squeel
           nodes.map { |node|
             case node
             when Arel::Nodes::Equality
-              node
+              node if node.left.relation.name == table_name
             when Arel::Nodes::Grouping
               find_equality_predicates([node.expr])
             when Arel::Nodes::And

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/squeel/adapters/active_record/relation_spec.rb

@@ -570,6 +570,17 @@ module Squeel
             @person.name.should eq 'joe'
           end
 
+          it 'creates through a join model' do
+            Article.transaction do
+              article = Article.first
+              person = article.commenters.create(:name => 'Ernie Miller')
+              person.should be_persisted
+              person.comments.should have(1).comment
+              person.comments.first.article.should eq article
+              raise ::ActiveRecord::Rollback
+            end
+          end
+
         end
 
         describe '#merge' do
@@ -591,7 +602,7 @@ module Squeel
 
           it 'does not break hm:t with conditions' do
             relation = Person.first.condition_article_comments
-            sql = relation.to_sql
+            sql = relation.scoped.to_sql
             sql.should match /"articles"."title" = 'Condition'/
           end
 

data/spec/support/schema.rb

@@ -22,6 +22,7 @@ class Article < ActiveRecord::Base
   has_many                :comments
   has_and_belongs_to_many :tags
   has_many   :notes, :as => :notable
+  has_many :commenters, :through => :comments, :source => :person
 end
 
 class Comment < ActiveRecord::Base

metadata

@@ -2,7 +2,7 @@
 name: squeel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
+date: 2011-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord