smql 0.0.4.6 → 0.0.4.7

data/VERSION

@@ -1 +1 @@
-0.0.4.6
+0.0.4.7

data/lib/smql_to_ar.rb

@@ -152,10 +152,10 @@ class SmqlToAR
 			@model = model
 			@last_model = nil
 			*@path, @col = *Array.wrap( col).
-					collect( &it.to_s.split( /[.\/]/)).
+					collect {|x| x.to_s.split /[.\/]/ }.
 					flatten.
 					collect( &Col.method( :new)).
-					reject( &it===:self)
+					reject {|x| x === :self }
 		end
 
 		def last_model

data/lib/smql_to_ar/condition_types.rb

@@ -100,7 +100,7 @@ class SmqlToAR
 				# Passt das Object,  die Klasse instanzieren.
 				def try_parse model, cols, op, val
 					#p :class => self, :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
-					new model, cols, val  if self::Operator === op and self::Expected.any?( &it === val)
+					new model, cols, val  if self::Operator === op and self::Expected.any? {|x| x === val}
 				end
 
 				def inspect
@@ -225,7 +225,7 @@ class SmqlToAR
 		# { 'articles=>' => [ { id: 1 }, { id: 2 } ] }
 		class EqualJoin <Condition
 			Operator = '=>'
-			Expected = [Hash, lambda {|x| x.kind_of?( Array) and x.all?( &it.kind_of?( Hash))}]
+			Expected = [Hash, lambda {|x| x.kind_of?( Array) and x.all? {|y| y.kind_of?( Hash) }}]
 
 			def initialize *pars
 				super( *pars)
@@ -255,7 +255,10 @@ class SmqlToAR
 					col.joins.each {|j, m| builder.joins table+j, m }
 					builder.joins t, model
 					b4 = b3.new( b2)
-					sub.each {|i| i.collect( &it.build( And.new( b4), t)) }
+					sub.each do |i|
+						b5 = And.new b4
+						i.collect {|j| j.build b5, t }
+					end
 				end
 				self
 			end
@@ -293,7 +296,7 @@ class SmqlToAR
 					t = table+col.to_a
 					builder.sub_joins t, col, *sub[0..1]
 					#ap sub: sub[2..-1]
-					sub[2..-1].each &it.build( builder, t)
+					sub[2..-1].each {|x| x.build builder, t }
 				end
 				self
 			end
@@ -345,7 +348,7 @@ class SmqlToAR
 
 				class <<self
 					def try_parse model, func, args
-						self.new model, func, args  if self::Name === func and self::Expected.any?( &it === args)
+						self.new model, func, args  if self::Name === func and self::Expected.any? {|x| x === args }
 					end
 
 					def inspect

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 4
-  - 6
-  version: 0.0.4.6
+  - 7
+  version: 0.0.4.7
 platform: ruby
 authors: 
 - Denis Knauf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 +01:00
+date: 2011-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,19 +57,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: methodphitamine
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: SMQL is a JSON-based query langauage similar to MQL.  This gem convertes these querys to ActiveRecord.
 email: 
 - Denis.Knauf@gmail.com