has_enumeration 1.0.0 → 1.0.1

data/Gemfile

@@ -3,11 +3,11 @@ source 'http://rubygems.org'
 if  ENV['AR_VERSION'] == '2.3'
   gem 'activerecord', '~> 2.3.8'
 else
-  gem 'activerecord', '~> 3.0.1'
+  gem 'activerecord', '~> 3.0.3'
   gem 'meta_where'
 end
 
-gem 'rspec', '~> 2.0.1'
+gem 'rspec', '~> 2.1.0'
 gem 'cucumber', '~> 0.9.3'
 
 platforms :ruby do

data/Gemfile.lock

@@ -1,24 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (0.9.7-java)
-    activerecord-jdbcsqlite3-adapter (0.9.7-java)
-      activerecord-jdbc-adapter (= 0.9.7)
-      jdbc-sqlite3 (>= 3.6.3.054)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.3)
+    arel (2.0.4)
     builder (2.1.2)
-    cucumber (0.9.3)
+    cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
       gherkin (~> 2.2.9)
@@ -28,40 +23,32 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-    gherkin (2.2.9-java)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     i18n (0.4.2)
-    jdbc-sqlite3 (3.6.14.2.056-java)
     json (1.4.6)
-    json (1.4.6-java)
-    meta_where (0.9.6)
-      activerecord (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      arel (~> 1.0.1)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    meta_where (0.9.9.2)
+      activerecord (~> 3.0.2)
+      activesupport (~> 3.0.2)
+      arel (~> 2.0.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
     sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
     tzinfo (0.3.23)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.1)
+  activerecord (~> 3.0.3)
   activerecord-jdbcsqlite3-adapter (~> 0.9.7)
   cucumber (~> 0.9.3)
   jdbc-sqlite3
   meta_where
-  rspec (~> 2.0.1)
+  rspec (~> 2.1.0)
   sqlite3-ruby

data/HISTORY.txt

@@ -1,3 +1,6 @@
+Version 1.0.1:
+- Added support for Arel 2, which is required by ActiveRecord >= 3.0.3
+
 Version 1.0.0:
 - Added #to_sym for generated enumeration class.  #value is deprecated.
 - Raises ArgumentError when assigning, or querying, with a symbol that is

data/README.md

@@ -103,12 +103,13 @@ environment.rb file:
 
 * 2.3.10
 * 3.0.1
+* 3.0.3
 
 and the following Ruby implementations:
 
 * 1.8.7-p302
 * 1.9.2-p0
-* JRuby 1.5.3
+* JRuby 1.5.5
 * Rubinius 1.1.0
 
 

data/Rakefile

@@ -18,8 +18,8 @@ in the database.  Predicates are provided for each symbol in the enumeration
 and the symbols may be used in finder methods.  When using ActiveRecord 3,
 the symbols may also be used when interacting with the underlying Arel attribute
 for the enumeration.  has_enumeration has been tested with Ruby 1.8.7,
-Ruby 1.9.2, JRuby 1.5.3, Rubinius 1.1.0, ActiveRecord 2.3.10, and ActiveRecord
-3.0.1.
+Ruby 1.9.2, JRuby 1.5.5, Rubinius 1.1.0, ActiveRecord 2.3.10, and ActiveRecord
+3.0.3.
 EOF
     gemspec.email = "greg@rujubu.com"
     gemspec.homepage = "http://github.com/gregspurrier/has_enumeration"

data/TODO.md

@@ -0,0 +1,8 @@
+# Release 1.1
+* Support string assignment
+  * Intended for bulk assignment from form posts
+  * Unlike symbol assignment, will not raise an exception when a value
+    is invalid
+  * Invalid values will fail validation and add an error on the attribute
+* Expose the accepted values for an enumeration via something like
+  `Car::Color.values`

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/features/step_definitions/has_enumeration_steps.rb

@@ -55,7 +55,7 @@ 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]
+  arel_attr = @model_class.arel_table[:color]
   @results = @model_class.where(arel_attr.eq(@desired_color)).order(:id)
 end
 

data/lib/has_enumeration/arel/table_extensions.rb

@@ -3,7 +3,7 @@ module HasEnumeration
     module TableExtensions
       def self.included(base)
         base.class_eval do
-          alias_method_chain :attributes, :has_enumeration
+          alias_method_chain :columns, :has_enumeration
 
           def self.has_enumeration_mappings
             @has_enumeration_mappings ||= Hash.new {|h,k| h[k] = Hash.new}
@@ -11,17 +11,17 @@ module HasEnumeration
         end
       end
 
-      def attributes_with_has_enumeration
-        return @attributes if @attributes
-        attrs = attributes_without_has_enumeration
+      def columns_with_has_enumeration
+        return @columns if @columns
+        columns = columns_without_has_enumeration
         mappings = self.class.has_enumeration_mappings[name]
         if mappings
           mappings.each do |attr_name, mapping|
-            attr = attrs[attr_name]
+            attr = columns.detect {|c| c.name.to_s == attr_name.to_s}
             install_has_enumeration_attribute_mapping(attr, mapping)
           end
         end
-        attrs
+        columns
       end
 
     private
@@ -45,18 +45,16 @@ module HasEnumeration
             end
           end
 
-          ::Arel::Attribute::PREDICATES.each do |method_name|
-            # Preserve the arity of the method we are overriding
+          predicates = ::Arel::Predications.instance_methods.map &:to_sym
+          predicates.each do |method_name|
             arity = ::Arel::Attribute.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
+            when 0
+              # No-op
             else
               raise "Unexpected arity #{arity} for #{method_name}"
             end

data/lib/has_enumeration/arel/table_extensions_arel_one.rb

@@ -0,0 +1,70 @@
+# Support for Arel 1.  Will eventually be removed once most people are on
+# Arel 2.
+module HasEnumeration
+  module Arel
+    module TableExtensionsArelOne
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :attributes, :has_enumeration
+
+          def self.has_enumeration_mappings
+            @has_enumeration_mappings ||= Hash.new {|h,k| h[k] = Hash.new}
+          end
+        end
+      end
+
+      def attributes_with_has_enumeration
+        return @attributes if @attributes
+        attrs = attributes_without_has_enumeration
+        mappings = self.class.has_enumeration_mappings[name]
+        if mappings
+          mappings.each do |attr_name, mapping|
+            attr = attrs[attr_name]
+            install_has_enumeration_attribute_mapping(attr, mapping)
+          end
+        end
+        attrs
+      end
+
+    private
+      def install_has_enumeration_attribute_mapping(arel_attr, mapping)
+        # For this attribute only, override all of the methods defined
+        # in Arel::Attribute::PREDICATES so that they will perform the
+        # symbol-to-underlying-value mapping before proceeding with their work.
+        (class <<arel_attr;self;end).class_eval do
+          define_method :map_enumeration_arg do |arg|
+            if arg.is_a?(Symbol)
+              unless mapping.has_key?(arg)
+                raise ArgumentError.new(
+                  "#{arg.inspect} is not one of {#{mapping.keys.map(&:inspect).sort.join(', ')}}"
+                )
+              end
+              mapping[arg]
+            elsif arg.is_a?(Array)
+              arg.map {|a| map_enumeration_arg(a)}
+            else
+              arg
+            end
+          end
+
+          ::Arel::Attribute::PREDICATES.each do |method_name|
+            # Preserve the arity of the method we are overriding
+            arity = ::Arel::Attribute.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
+end

data/lib/has_enumeration.rb

@@ -7,8 +7,13 @@ ActiveRecord::Base.extend(HasEnumeration::ClassMethods)
 # For ActiveRecord 3, extend Arel::Table, otherwise we'll need
 # our specialization of aggregate_conditions_override
 if ActiveRecord::VERSION::MAJOR >= 3
-  require 'has_enumeration/arel/table_extensions'
-  Arel::Table.send(:include, HasEnumeration::Arel::TableExtensions)
+  if Arel::VERSION >= '2.0.0'
+    require 'has_enumeration/arel/table_extensions'
+    Arel::Table.send(:include, HasEnumeration::Arel::TableExtensions)
+  else
+    require 'has_enumeration/arel/table_extensions_arel_one'
+    Arel::Table.send(:include, HasEnumeration::Arel::TableExtensionsArelOne)
+  end
 else
   require 'has_enumeration/aggregate_conditions_override'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_enumeration
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Greg Spurrier
@@ -15,10 +15,115 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 -07:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: meta_where
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: cucumber
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 9
+        - 3
+        version: 0.9.3
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sqlite3-ruby
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: jdbc-sqlite3
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: activerecord-jdbcsqlite3-adapter
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 9
+        - 7
+        version: 0.9.7
+  requirement: *id007
 description: |
   Extends ActiveRecord with the has_enumeration method allowing a symbolic
   enumeration to be stored in an ActiveRecord attribute.  The enumeration is
@@ -27,8 +132,8 @@ description: |
   and the symbols may be used in finder methods.  When using ActiveRecord 3,
   the symbols may also be used when interacting with the underlying Arel attribute
   for the enumeration.  has_enumeration has been tested with Ruby 1.8.7,
-  Ruby 1.9.2, JRuby 1.5.3, Rubinius 1.1.0, ActiveRecord 2.3.10, and ActiveRecord
-  3.0.1.
+  Ruby 1.9.2, JRuby 1.5.5, Rubinius 1.1.0, ActiveRecord 2.3.10, and ActiveRecord
+  3.0.3.
 
 email: greg@rujubu.com
 executables: []
@@ -45,6 +150,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - VERSION
 - features/arel_attributes.feature
 - features/explicitly_mapped_enumeration.feature
@@ -59,6 +165,7 @@ files:
 - lib/has_enumeration.rb
 - lib/has_enumeration/aggregate_conditions_override.rb
 - lib/has_enumeration/arel/table_extensions.rb
+- lib/has_enumeration/arel/table_extensions_arel_one.rb
 - lib/has_enumeration/class_methods.rb
 - spec/has_enumeration/has_enumeration_spec.rb
 - spec/spec_helper.rb
@@ -67,8 +174,8 @@ homepage: http://github.com/gregspurrier/has_enumeration
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement