enum_table 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ae29ffdc710d5a06627e243e256b7a8b46ae55
-  data.tar.gz: aaa6e9b0c95804dd10760b8b67289f9121d23738
+  metadata.gz: 9efb4a2edbe205dac4da12d14820d33a78ddb91f
+  data.tar.gz: 8f4aeb6cbc9ae4455bd2efaefbc7e0a16342d31a
 SHA512:
-  metadata.gz: 47f827c8bbd52a3102c06df809be0ef29031ec1d194ed5a186da9698127eba253a01efad0d10487949829a019a5ce896969c2e973c92f432b3a49faac1ad4e0b
-  data.tar.gz: a0ffcf59c9ae8d1c3330eb18909d04c6462b95fa8c659b3f41a1615c01f95584d323358130448f43c65f74985c9f7f284d0d40233aed07929219cdad6d261b87
+  metadata.gz: 678a59b0aedd78bcd0ef41b501bf9dfb7e093fee99e348c607353cb812f93ee5d36bcf70827e3b8f291b3eee65fa463c846bbc486e6007c09d19396097eaaa57
+  data.tar.gz: 18c93a939a2a712412133779b92a4f39a4154e8c1b9646d41c9da2087c8aac9d824a778cf090b417f64214f98d96c683b6253d18cbdc599e05918f9e6bf20c13

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+bundler_args: --without dev
+script: bundle exec testrb test
+rvm:
+  - 2.0.0
+  - 2.1.0
+gemfile:
+  - Gemfile
+  - Gemfile.ar3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.5.0 2014-03-26
+
+ * Rails 4 support.
+
 == 0.4.0 2014-02-10
 
  * Allow missing tables when migrating. [Kenneth Lay]

data/Gemfile

@@ -1,6 +1,13 @@
 source 'https://rubygems.org'
+gem 'activerecord'
 gem 'sqlite3'
 gem 'mysql2'
 gem 'pg'
 gem 'minitest', '~> 4.0'
 gemspec
+
+group :dev do
+  gem 'ruby-debug-base', platform: :jruby
+  gem 'debugger', platform: :mri_19
+  gem 'byebug', platform: [:mri_20, :mri_21]
+end

data/Gemfile.ar3

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+gem 'activerecord', '~> 3'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+gem 'minitest', '~> 4.0'
+gemspec
+
+group :dev do
+  gem 'ruby-debug-base', platform: :jruby
+  gem 'debugger', platform: :mri_19
+  gem 'byebug', platform: [:mri_20, :mri_21]
+end

data/README.markdown

@@ -1,4 +1,4 @@
-## Enum Table
+## Enum Table [![Build Status](https://travis-ci.org/howaboutwe/enum_table.svg)](https://travis-ci.org/howaboutwe/enum_table)
 
 Table-based enumerations for ActiveRecord.
 

data/enum_table.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.unshift File.expand_path('lib', File.dirname(__FILE__))
 require 'enum_table/version'
 
@@ -16,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.add_runtime_dependency 'activerecord', '~> 3.2.0'
+  gem.add_runtime_dependency 'activerecord', '>= 3', '< 5'
   gem.add_development_dependency 'ritual', '~> 0.4.1'
 end

data/lib/enum_table/record.rb

@@ -106,7 +106,7 @@ module EnumTable
         (reflection = inheritance_enum) ? super(reflection.value(type_name).to_s) : super
       end
 
-      # Enables .find_by_name(value) for enums.
+      # Enables .where(name: value) for enums.
       def expand_hash_conditions_for_aggregates(attrs)  # :nodoc:
         conditions = super
         enums.each do |name, reflection|
@@ -127,14 +127,16 @@ module EnumTable
         conditions
       end
 
-      # Enables .where(name: value) for enums.
-      def expand_attribute_names_for_aggregates(attribute_names)  # :nodoc:
-        attribute_names = super
-        enums.each do |name, reflection|
-          index = attribute_names.index(name) and
-            attribute_names[index] = reflection.id_name
+      if ActiveRecord::VERSION::MAJOR < 4
+        # Enables .find_by_name(value) for enums.
+        def expand_attribute_names_for_aggregates(attribute_names)  # :nodoc:
+          attribute_names = super
+          enums.each do |name, reflection|
+            index = attribute_names.index(name) and
+              attribute_names[index] = reflection.id_name
+          end
+          attribute_names
         end
-        attribute_names
       end
 
       # Enables state_machine to set initial values for states. Ick.

data/lib/enum_table/version.rb

@@ -1,5 +1,5 @@
 module EnumTable
-  VERSION = [0, 4, 0]
+  VERSION = [0, 5, 0]
 
   class << VERSION
     include Comparable

data/test/enum_table/test_record.rb

@@ -8,6 +8,7 @@ describe EnumTable do
       t.integer :gender_id
       t.integer :status_id
       t.string :user_type
+      t.integer :lock_version
     end
     Object.const_set :User, Class.new(ActiveRecord::Base)
   end
@@ -186,9 +187,13 @@ describe EnumTable do
       attributes.must_equal('gender_id' => 1)
     end
 
-    it "does not prevent optimistic locking from working, which also uses this internal method" do
-      attributes = User.initialize_attributes('lock_version' => nil)
-      attributes.must_equal('lock_version' => 0)
+    it "does not prevent optimistic locking from working, which also uses this internal method in AR < 4" do
+      user = User.create(gender: :male)
+      user.lock_version.must_equal 0
+
+      user = User.find(user.id)
+      user.update_attributes(gender: :female)
+      user.lock_version.must_equal 1
     end
 
     it "should favor the ID if both the id and value are present in the attributes hash (so enums override columns)" do
@@ -513,14 +518,14 @@ describe EnumTable do
       User.enum :gender, table: {female: 1, male: 2}
       female = User.create(gender_id: 1)
       male   = User.create(gender_id: 2)
-      User.where(gender: :female).all.must_equal [female]
+      User.where(gender: :female).to_a.must_equal [female]
     end
 
     it "supports filtering by enums with string keys" do
       User.enum :gender, table: {female: 1, male: 2}
       female = User.create(gender_id: 1)
       male   = User.create(gender_id: 2)
-      User.where('gender' => :female).all.must_equal [female]
+      User.where('gender' => :female).to_a.must_equal [female]
     end
 
     it "supports filtering by multiple values" do
@@ -528,7 +533,7 @@ describe EnumTable do
       female = User.create(gender_id: 1)
       male   = User.create(gender_id: 2)
       other  = User.create(gender_id: 3)
-      User.where(gender: [:female, :male]).all.must_equal [female, male]
+      User.where(gender: [:female, :male]).to_a.must_equal [female, male]
     end
 
     it "still supports filtering by other attributes" do
@@ -536,18 +541,41 @@ describe EnumTable do
       female1 = User.create(gender_id: 1, status_id: 1)
       male1   = User.create(gender_id: 2, status_id: 1)
       male2   = User.create(gender_id: 2, status_id: 2)
-      User.where(gender: :male, status_id: 1).all.must_equal [male1]
+      User.where(gender: :male, status_id: 1).to_a.must_equal [male1]
     end
   end
 
-  describe "dynamic finders" do
-    it "support retrieval by enums" do
-      User.enum :gender, table: {female: 1, male: 2}
-      female = User.create(gender_id: 1)
-      male   = User.create(gender_id: 2)
+  if ActiveRecord::VERSION::MAJOR < 4
+    describe "dynamic finders" do
+      it "support retrieval by enums" do
+        User.enum :gender, table: {female: 1, male: 2}
+        female = User.create(gender_id: 1)
+        male   = User.create(gender_id: 2)
 
-      User.find_by_gender(:female).must_equal female
-      User.find_all_by_gender(:female).must_equal [female]
+        User.find_by_gender(:female).must_equal female
+        User.find_all_by_gender(:female).must_equal [female]
+      end
+    end
+  else
+    describe ".find_or_initialize_by" do
+      it "supports building with enums" do
+        User.enum :gender, table: {female: 1, male: 2}
+
+        user = User.find_or_initialize_by(gender: :female)
+        user.gender_id.must_equal 1
+        user.gender.must_equal :female
+        user.save!
+      end
+
+      it "supports finding by enums" do
+        female = User.create(gender_id: 1)
+        male   = User.create(gender_id: 2)
+
+        User.enum :gender, table: {female: 1, male: 2}
+
+        user = User.find_or_initialize_by(gender: :female)
+        user.must_equal female
+      end
     end
   end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: enum_table
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: ritual
   requirement: !ruby/object:Gem::Requirement
@@ -46,8 +52,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
+- Gemfile.ar3
 - LICENSE
 - README.markdown
 - Rakefile
@@ -85,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enumeration tables for ActiveRecord