activerecord-blockwhere 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6188f0b42749735cf271522b4553caa3824e8ce8
-  data.tar.gz: 5dac29b2a8de101982f52039e628810e5a57bb01
+  metadata.gz: 6f3b8e8805d1f91e2e41e92362468ce1aae18711
+  data.tar.gz: 2cea97fbc36a99e611048600c028f3e3f096f6a8
 SHA512:
-  metadata.gz: f664af9db26928765b748e3044df7c80cfc0c2fef681e77d5479cd8b3f9697e43151241148a3ad71dfc4aa573675959dfc4cb7f1694c4ab4780abe161411448b
-  data.tar.gz: 1719c1e6a3565f88b3eb0596382d24041c542deac61d9f15798e6652305f0e01f2d0c664a50d1b5ca0416eb0eda9952f844ce5be922f59305d06e0ca2bec42a6
+  metadata.gz: ee18dafb7d43e64f89ab7af77eb7e99050bbe816569f931ccc258e0823a99b1c00b08521a162645e4db9d1117fad865f585534344ad18ce8fcb8c53d4fb74d95
+  data.tar.gz: 9bab3b3a0e237745970230f10e5a40cf69ca9d0590d20cefe72de4113e50e2592e81e4abf8ea55de3b9d3ab1ec9f49cbab8ed6d5518cb6e9225d65fb366d25c6

data/README.md

@@ -1,4 +1,4 @@
-# Activerecord::Blockwhere
+# activeecord-blockwhere
 
 Simply conditions DSL for ActiveRecord.
 It helps using Arel Predications in the block.
@@ -19,30 +19,41 @@ Or install it yourself as:
 
 ## Usage
 
-   # * person has many entries.
-   # Person(id: integer, name: string)
-   # Entry(id: integer, person_id: integer, name: string)
-   
-   Person.where { id.eq(1) }.to_sql
-   # => SELECT "people".* FROM "people"  WHERE "people"."id" = 1
-   
-   Person.where { !id.eq(1) }.to_sql
-   # => SELECT "people".* FROM "people"  WHERE (NOT ("people"."id" = 1))
-   
-   Person.where { id.eq(1) & name.matches('%alice%') }.to_sql
-   # => SELECT "people".* FROM "people"  WHERE ("people"."id" = 1 AND "people"."name" LIKE '%alice%')
-   
-   Person.where { id.in([1,2,3]) & name.not_eq('bob') }.to_sql
-   # => SELECT "people".* FROM "people"  WHERE ("people"."id" IN (1, 2, 3) AND "people"."name" != 'bob')
-   
-   Person.where { name.eq('alice') | name.eq('bob') }.to_sql
-   # => SELECT "people".* FROM "people"  WHERE (("people"."name" = 'alice' OR "people"."name" = 'bob'))
-   
-   # join association
-   Person.where { name.eq('alice') & entries.name.matches('%hello%') }.to_sql
-   # => SELECT "people".* FROM "people"
-   #    INNER JOIN "entries" ON "entries"."person_id" = "people"."id"
-   #    WHERE ("people"."name" = 'alice' AND "entries"."name" LIKE '%hello%')
+    # * person has many entries.
+    # Person(id: integer, name: string)
+    # Entry(id: integer, person_id: integer, name: string)
+    
+    Person.where { id.eq(1) }.to_sql
+    # => SELECT "people".* FROM "people"  WHERE "people"."id" = 1
+    
+    Person.where { !id.eq(1) }.to_sql
+    # => SELECT "people".* FROM "people"  WHERE (NOT ("people"."id" = 1))
+    
+    Person.where { id.eq(1) & name.matches('%alice%') }.to_sql
+    # => SELECT "people".* FROM "people"  WHERE ("people"."id" = 1 AND "people"."name" LIKE '%alice%')
+    
+    Person.where { id.in([1,2,3]) & name.not_eq('bob') }.to_sql
+    # => SELECT "people".* FROM "people"  WHERE ("people"."id" IN (1, 2, 3) AND "people"."name" != 'bob')
+    
+    Person.where { name.eq('alice') | name.eq('bob') }.to_sql
+    # => SELECT "people".* FROM "people"  WHERE (("people"."name" = 'alice' OR "people"."name" = 'bob'))
+    
+    # join association
+    Person.where { name.eq('alice') & entries.name.matches('%hello%') }.to_sql
+    # => SELECT "people".* FROM "people"
+    #    INNER JOIN "entries" ON "entries"."person_id" = "people"."id"
+    #    WHERE ("people"."name" = 'alice' AND "entries"."name" LIKE '%hello%')
+
+    # in action method
+    def index
+      # you can use controller's method in the block. ex: params,request,etc..
+      # but cannot use instance variables.
+      @person = Person.where { id.eq(params[:id]) }.first
+    end
+
+## Introductory articles
+
+* [techscore blog (in Japanese)](http://www.techscore.com/blog/2013/05/08/activerecord-blockwhere/ "techscore")
 
 ## Contributing
 

data/lib/active_record/blockwhere.rb

@@ -3,9 +3,12 @@ require "active_record/blockwhere/arel_node_operations"
 
 module ActiveRecord
   module Blockwhere
-    def where(*args, &block)
+    def where(*args)
       relation = args.empty? ? self : super(*args)
-      relation = WhereProxy.where(relation, block.binding.eval('self'), &block) if block
+      if block_given?
+        block = Proc.new
+        relation = WhereProxy.where(relation, block.binding.eval('self'), &block)
+      end
       relation
     end
   end
@@ -14,4 +17,4 @@ end
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::Relation.send :include, ActiveRecord::Blockwhere
   Arel::Nodes::Node.send      :include, ActiveRecord::Blockwhere::ArelNodeOperations
-end
+end

data/lib/active_record/blockwhere/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Blockwhere
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/active_record/blockwhere/where_proxy.rb

@@ -23,7 +23,7 @@ module ActiveRecord
         reflection = @relation.reflections[name]
         if ::ActiveRecord::Reflection::AssociationReflection === reflection
           @relation = @relation.joins(name) unless @relation.joins_values.include?(name)
-          return WhereProxy.new(reflection.klass.scoped, @context)
+          return WhereProxy.new(reflection.klass.scoped)
         end
         if @context && @context.respond_to?(name)
           return @context.__send__(name, *args, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-blockwhere
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - yuki teraoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Simply conditions DSL for ActiveRecord. It helps using Arel Predications