has_enumeration 0.1.0 → 0.2.0

data/README.txt

@@ -23,6 +23,10 @@ obj.color.green?                   # => false
 # Querying
 TestObject.where(:color => :red)
 
+# Querying with arel predicates
+attr = TestObject.arel_table[:color]
+TestObject.where(attr.not_in([:red, :green]))
+
 == Getting the Latest Version
 The repository for has_enumeration is hosted at GitHub:
   Web page:   http://github.com/gregspurrier/has_enumeration

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/features/explicitly_mapped_enumeration.feature

@@ -49,3 +49,16 @@ Feature:
       | :red   |
       | :green |
       | :blue  |
+
+  Scenario Outline: find objects with a specific enumerated value via arel
+    Given a model with an explicitly-mapped enumeration of red, green, and blue
+    And a set of objects with a variety of values for the enumeration
+    When I query for objects with the value <value> via arel
+    Then I should get all of the objects having that value
+    And I should not get any objects having other values
+
+    Scenarios: querying various values
+      | value  |
+      | :red   |
+      | :green |
+      | :blue  |

data/features/implicitly_mapped_enumeration.feature

@@ -49,3 +49,16 @@ Feature:
       | :red   |
       | :green |
       | :blue  |
+
+  Scenario Outline: find objects with a specific enumerated value via arel
+    Given a model with an implicitly-mapped enumeration of red, green, and blue
+    And a set of objects with a variety of values for the enumeration
+    When I query for objects with the value <value> via arel
+    Then I should get all of the objects having that value
+    And I should not get any objects having other values
+
+    Scenarios: querying various values
+      | value  |
+      | :red   |
+      | :green |
+      | :blue  |

data/features/step_definitions/has_enumeration_steps.rb

@@ -49,6 +49,12 @@ When /^I query for objects with the value :([a-z_]+)$/ do |value|
   @results = @model_class.where(:color => @desired_color).order(:id)
 end
 
+When /^I query for objects with the value :([a-z_]+) via arel$/ do |value|
+  @desired_color = value.to_sym
+  arel_attr = @model_class.arel_table.attributes[:color]
+  @results = @model_class.where(arel_attr.eq(@desired_color)).order(:id)
+end
+
 Then /^I should get all of the objects having that value$/ do
   @results.should == @all_objects.select {|x| x.color.value == @desired_color}
 end

data/lib/has_enumeration/class_methods.rb

@@ -31,6 +31,12 @@ module HasEnumeration
         extend HasEnumeration::AggregateConditionsOverride
         @aggregate_conditions_override_installed = true
       end
+
+      if respond_to?(:arel_table)
+        # Patch the enumeration's underlying arel attribute to make it
+        # aware of the mapping.
+        install_arel_attribute_mapping(attribute, mapping)
+      end
     end
 
   private
@@ -63,5 +69,41 @@ module HasEnumeration
         end
       end
     end
+
+    def install_arel_attribute_mapping(attribute, mapping)
+      # For this attribute only, override all of the methods defined
+      # in Arel::Attribute::Predications so that they will perform the
+      # symbol-to-underlying-value mapping before proceeding with their work.
+      arel_attr = arel_table[attribute]
+      (class <<arel_attr;self;end).class_eval do
+        define_method :map_enumeration_arg do |arg|
+          if arg.is_a?(Symbol)
+            mapping[arg]
+          elsif arg.is_a?(Array)
+            arg.map {|a| map_enumeration_arg(a)}
+          else
+            arg
+          end
+        end
+
+        Arel::Attribute::Predications.instance_methods.each do |method_name|
+          # Preserve the arity of the method we are overriding
+          arity = Arel::Attribute::Predications.
+            instance_method(method_name).arity
+          case arity
+          when 1
+            define_method method_name do |arg|
+              super(map_enumeration_arg(arg))
+            end
+          when -1
+            define_method method_name do |*args|
+              super(map_enumeration_arg(args))
+            end
+          else
+            raise "Unexpected arity #{arity} for #{method_name}"
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_enumeration
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Greg Spurrier
@@ -56,6 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -64,6 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"