eel 1.0.0.pre → 1.0.2

data/lib/eel/active_record/query_extensions.rb

@@ -4,12 +4,12 @@ module Eel
 
       def order *args
         return self if args.blank?
-        super *args.flatten.map { |a| assign_context(a.expr) if a.respond_to?(:expr); a }
+        super *args.flatten.map { |a| assign_context(a); a }
       end
 
       def reorder *args
         return self if args.blank?
-        super *args.flatten.map { |a| assign_context(a.expr) if a.respond_to?(:expr); a }
+        super *args.flatten.map { |a| assign_context(a); a }
       end
 
       def build_where(opts, other = [])
@@ -17,8 +17,7 @@ module Eel
           when Arel::Nodes::Node
             nodes = [opts] + other
             nodes.each do |node|
-              assign_context(node.left)
-              assign_context(node.right)
+              assign_context(node)
             end
             nodes
           else
@@ -28,16 +27,26 @@ module Eel
 
       private
 
-      def assign_context attr
-        if attr.is_a?(Arel::Attributes::Attribute)
-          case attr.relation
-            when Symbol
-              attr.relation = Arel::Table.new(attr.relation, table.engine)
-            when NilClass
-              attr.relation = table
-          end
+      def assign_context input
+        case input
+          when Arel::Nodes::Unary
+            assign_context(input.expr)
+          when Arel::Nodes::Binary
+            assign_context(input.left)
+            assign_context(input.right)
+          when Arel::Nodes::And
+            input.children.each {|ch| assign_context(ch)}
+          when Arel::Attributes::Attribute
+            case input.relation
+              when Symbol
+                input.relation = Arel::Table.new(input.relation, table.engine)
+              when NilClass
+                input.relation = table
+            end
+          else
+            # do nothing
         end
-        attr
+        input
       end
 
     end

data/lib/eel/core_ext/symbol_extensions.rb

@@ -22,11 +22,11 @@ module Eel
       end
 
       def respond_to_missing? method_name, private = false
-        Arel::Attributes::Attribute.new.respond_to?(method_name)
+        method_name.in? predicates
       end
 
       def method_missing method_name, *args, &block
-        if (attr = Arel::Attributes::Attribute.new(nil, self)).respond_to?(method_name)
+        if method_name.in? predicates
           if args.present?
             attr.send(method_name, *args) # binary nodes
           else
@@ -37,6 +37,12 @@ module Eel
         end
       end
 
+      private
+
+      def predicates
+        Arel::OrderPredications.instance_methods + Arel::Predications.instance_methods
+      end
+
     end
   end
 end

data/lib/eel/version.rb

@@ -1,3 +1,3 @@
 module Eel
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eel
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
-  prerelease: 6
+  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Ivan Efremov
@@ -10,40 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
+    none: false
+  name: activerecord
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+        version: '3.1'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
+    none: false
+  name: activesupport
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
+    none: false
 description: It is more like Squeel but without Squ
 email:
 - st8998@gmail.com
@@ -63,17 +63,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23