ar-enums 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c34a6a56500c6697165a3252f1509a54cbfee915
+  data.tar.gz: 88e8e2f99106d56c1c596cf758d7f80398bac27d
+SHA512:
+  metadata.gz: f9bc984e495b93905ca602534a0248f405ec336db1d08318fef5ecb25111432e8a5c6430b4d39d5c9d68fdf201cd4dcbc8fde72f0b4cab051c8aee4411182250
+  data.tar.gz: 09f67c296f366917fcdecc0b5d2f99405517431e10ed815aa601c5a64564d2f7e208fdd0ca3fd7eb7386715d8b901173c00e8d8c09f5c72182df554ba3ef447a

data/.rbenv-version

@@ -0,0 +1 @@
+2.1.0

data/Gemfile.lock

@@ -1,30 +1,40 @@
 PATH
   remote: .
   specs:
-    ar-enums (1.0.0)
+    ar-enums (2.0.0)
       activerecord (>= 3.1.0)
       rake
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     diff-lcs (1.1.2)
-    i18n (0.6.0)
-    multi_json (1.0.3)
-    rake (0.9.2.2)
+    guard (1.4.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (0.4.5)
+      guard (>= 0.4.0)
+    i18n (0.6.11)
+    json (1.8.1)
+    listen (0.5.3)
+    minitest (5.4.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.3)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -34,12 +44,17 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
     sqlite3 (1.3.4)
-    tzinfo (0.3.31)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ar-enums!
+  guard-rspec
+  rb-fsevent
   rspec
   sqlite3 (>= 1.3.4)

data/Guardfile

@@ -0,0 +1,21 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
+

data/README.rdoc

@@ -27,7 +27,7 @@ This is the simplest and probably the most frecuent case:
   tl.state_id       # => 2
   tl.state.green?   # => true    
 
-As you can see each enum value is an instance of a dinamically generated class (which inherits from ActiveRecord::Enum) and has an ordinal value, id, autogenerated staring on 1.
+As you can see each enum value is an instance of a dinamically generated class (which inherits from ArEnums::Base) and has an ordinal value, id, autogenerated staring on 1.
 
 The enumerations array is accessed with a class method:
 
@@ -69,7 +69,7 @@ the enumeration can be on it's own class, as the State enum in the following exa
     enum :state
   end
   
-  class State < ActiveRecord::Enum
+  class State < ArEnums::Base
     enumeration do
       red :stop_traffic => true, :rgb => 0xF00, :desc => 'Rojo'
       green :stop_traffic => false, :rgb => 0x0F0, :desc => 'Verde'

data/ar_enums.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_development_dependency "rspec"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "rb-fsevent"
   # s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "sqlite3", ">= 1.3.4"
   s.add_dependency "activerecord", ">= 3.1.0"

data/lib/ar-enums.rb

@@ -1,4 +1,4 @@
 require 'active_record'
-%w[metaprogramming_extensions options_helper enum enum_block enum_field factory enum_definition].each do |f|
+%w[metaprogramming_extensions options_helper base enum_block enum_field factory enum_definition].each do |f|
   require "ar_enums/#{f}"
 end

data/lib/ar_enums/{enum.rb → base.rb}

@@ -1,6 +1,6 @@
-module ActiveRecord
-  class Enum
-    extend ActiveRecord::Enumerations::OptionsHelper
+module ArEnums
+  class Base
+    extend OptionsHelper
     
     attr_reader :id, :name, :extra_columns
     class_attribute :label_method
@@ -14,7 +14,7 @@ module ActiveRecord
     def self.create_from value, values, options
       required_attrs = case value
       when String, Symbol
-        { :name => value }
+        { name: value }
       else
         value
       end
@@ -23,7 +23,7 @@ module ActiveRecord
     end
     
     def == other
-      return id == other.id if other.is_a?(Enum)
+      return id == other.id if other.is_a?(Base)
       [id.to_s, name].include?(other.to_s)
     end
     alias_method :eql?, :==
@@ -41,8 +41,8 @@ module ActiveRecord
     end
     
     def self.enumeration *config, &block
-      add_option config, :class_name => self
-      define_enums_getter ActiveRecord::Enumerations::Factory.make_enums(*config, &block)
+      add_option config, class_name: self
+      define_enums_getter ArEnums::Factory.make_enums(*config, &block)
     end
     
     def self.[] name_or_id

data/lib/ar_enums/enum_block.rb

@@ -1,18 +1,16 @@
-module ActiveRecord
-  module Enumerations
-    class EnumBlock    
-      def initialize enum_class, options = {}
-        @enums = []
-        @last_id = 0
-        @enum_class = enum_class
-        @options = options
-      end
-    
-      def method_missing method, args = {}
-        attrs = @options.merge(args).merge(:name => method)
-        attrs[:id] ||= @last_id += 1
-        @enums << @enum_class.new(attrs)
-      end
+module ArEnums
+  class EnumBlock    
+    def initialize enum_class, options = {}
+      @enums = []
+      @last_id = 0
+      @enum_class = enum_class
+      @options = options
+    end
+  
+    def method_missing method, args = {}
+      attrs = @options.merge(args).merge(:name => method)
+      attrs[:id] ||= @last_id += 1
+      @enums << @enum_class.new(attrs)
     end
   end
 end

data/lib/ar_enums/enum_definition.rb

@@ -1,21 +1,22 @@
-module ActiveRecord
-  module Enumerations
+module ArEnums
+  module EnumDefinition
     def self.included(base)
       base.send :extend, ClassMethods
     end
   
     module ClassMethods
-      include ActiveRecord::Enumerations::OptionsHelper
+      include ArEnums::OptionsHelper
       
       def enum field_name, *config, &block
         field = EnumField.new field_name
-        add_option config, :field => field, :active_record => self
+        add_option config, field: field, active_record: self
         enums = Factory.make_enums *config, &block
         define_enums_getter field, enums
         define_enum_getter_and_setter field, enums      
       end
     
       private
+      
       def asume_external_style field
         lambda { |options| external_class(field, options).all }
       end
@@ -41,4 +42,4 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.send :include, ActiveRecord::Enumerations
+ActiveRecord::Base.send :include, ArEnums::EnumDefinition

data/lib/ar_enums/enum_field.rb

@@ -1,23 +1,21 @@
-module ActiveRecord
-  module Enumerations
-    class EnumField
-      attr_reader :name
-  
-      def initialize name
-        @name = name.to_s
-      end
-  
-      def enums_getter
-        name.pluralize
-      end
-  
-      def enums_setter
-        "#{enums_getter}="
-      end
-  
-      def foreign_key
-        "#{name}_id"
-      end    
+module ArEnums
+  class EnumField
+    attr_reader :name
+
+    def initialize name
+      @name = name.to_s
     end
+
+    def enums_getter
+      name.pluralize
+    end
+
+    def enums_setter
+      "#{enums_getter}="
+    end
+
+    def foreign_key
+      "#{name}_id"
+    end    
   end
 end

data/lib/ar_enums/factory.rb

@@ -1,82 +1,80 @@
-module ActiveRecord
-  module Enumerations
-    class Factory
-      extend OptionsHelper
-      
-      def self.make_enums *config, &block
-        values, options = extract_values_and_options config
-        new(values, options, &block).make_enums
-      end
-      
-      def initialize values, options, &block
-        @values, @options, @block = values, options, block
-        @active_record = @options.delete :active_record
-        @field = @options.delete :field
-        @class_name = @options.delete(:class_name) || @field.name.camelize
-        @label_method = @options.delete(:label) || :desc
-      end
+module ArEnums
+  class Factory
+    extend OptionsHelper
     
-      def make_enums
-        enum_class.label_method = @label_method
-        create_enums.tap do |enums|
-          define_question_methods enums
-          define_extra_columns_methods enums
-        end
-      end
-      
-      def enum_class
-        @enum_class ||= eval_external_class || create_inner_enum_class
-      end
+    def self.make_enums *config, &block
+      values, options = extract_values_and_options config
+      new(values, options, &block).make_enums
+    end
     
-      private      
-      def eval_external_class
-        @class_name.is_a?(String) || @class_name.is_a?(Symbol) ? @active_record.send(:compute_type, @class_name) : @class_name
-      rescue NameError
-        nil
-      end
-      
-      def create_inner_enum_class
-        @active_record.const_set @class_name, Class.new(Enum)
-      end
-      
-      def create_enums
-        if @block
-          block_style
-        elsif @values.any?
-          array_of_values_or_hashes_style
-        else
-          enum_class.all
-        end
+    def initialize values, options, &block
+      @values, @options, @block = values, options, block
+      @active_record = @options.delete :active_record
+      @field = @options.delete :field
+      @class_name = @options.delete(:class_name) || @field.name.camelize
+      @label_method = @options.delete(:label) || :desc
+    end
+  
+    def make_enums
+      enum_class.label_method = @label_method
+      create_enums.tap do |enums|
+        define_question_methods enums
+        define_extra_columns_methods enums
       end
+    end
     
-      def block_style 
-        EnumBlock.new(enum_class, @options).instance_eval(&@block)
-      end
+    def enum_class
+      @enum_class ||= eval_external_class || create_inner_enum_class
+    end
+  
+    private      
+    def eval_external_class
+      @class_name.is_a?(String) || @class_name.is_a?(Symbol) ? @active_record.send(:compute_type, @class_name) : @class_name
+    rescue NameError
+      nil
+    end
     
-      def array_of_values_or_hashes_style 
-        @values.map { |value| enum_class.create_from(value, @values, @options) }
+    def create_inner_enum_class
+      @active_record.const_set @class_name, Class.new(Base)
+    end
+    
+    def create_enums
+      if @block
+        block_style
+      elsif @values.any?
+        array_of_values_or_hashes_style
+      else
+        enum_class.all
       end
-      
-      def define_question_methods enums
-        enums.each do |e|
-          enum_class.class_eval %Q{
-            def #{e.name}?
-              self == :#{e.name}
-            end
-          }
-        end
+    end
+  
+    def block_style 
+      EnumBlock.new(enum_class, @options).instance_eval(&@block)
+    end
+  
+    def array_of_values_or_hashes_style 
+      @values.map { |value| enum_class.create_from(value, @values, @options) }
+    end
+    
+    def define_question_methods enums
+      enums.each do |e|
+        enum_class.class_eval %Q{
+          def #{e.name}?
+            self == :#{e.name}
+          end
+        }
       end
-      
-      def define_extra_columns_methods enums
-        extra_columns_names = enums.map(&:extra_columns).map(&:keys).flatten.uniq
-        extra_columns_names.each do |ecn|
-          enum_class.class_eval %Q{
-            def #{ecn}
-              extra_columns[:#{ecn}]
-            end
-          }
-        end
+    end
+    
+    def define_extra_columns_methods enums
+      extra_columns_names = enums.map(&:extra_columns).map(&:keys).flatten.uniq
+      extra_columns_names.each do |ecn|
+        enum_class.class_eval %Q{
+          def #{ecn}
+            extra_columns[:#{ecn}]
+          end
+        }
       end
     end
   end
-end
+end

data/lib/ar_enums/options_helper.rb

@@ -1,22 +1,20 @@
-module ActiveRecord
-  module Enumerations
-    module OptionsHelper
-      def add_option config, option
-        new_config = if config.first.is_a?(Array)
-          [config[0], (config[1] || {}).merge(option)]
-        else
-          [(config[0] || {}).merge(option)]
-        end
-        config.replace new_config
+module ArEnums
+  module OptionsHelper
+    def add_option config, option
+      new_config = if config.first.is_a?(Array)
+        [config[0], (config[1] || {}).merge(option)]
+      else
+        [(config[0] || {}).merge(option)]
       end
-      alias_method :add_options, :add_option
-      
-      def extract_values_and_options config
-        if config.first.is_a?(Array)
-          [config[0], config[1] || {}]
-        else
-          [[], config[0] || {}]
-        end
+      config.replace new_config
+    end
+    alias_method :add_options, :add_option
+    
+    def extract_values_and_options config
+      if config.first.is_a?(Array)
+        [config[0], config[1] || {}]
+      else
+        [[], config[0] || {}]
       end
     end
   end

data/lib/ar_enums/version.rb

@@ -1,3 +1,3 @@
 module ArEnums
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/spec/ar_enums/{enum_spec.rb → base_spec.rb}

@@ -2,42 +2,42 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe "Enum" do
   it "should provide :to_sym method returning name as symbols" do
-    ActiveRecord::Enum.new(:name => :green).to_sym.should == :green
+    ArEnums::Base.new(name: :green).to_sym.should == :green
   end
   
   it "should store extra columns as a hash without the :enum_class that is passed from other classes" do
-    ActiveRecord::Enum.new(:name => :green, :factor => 1.5, :enum_class => Class.new).extra_columns.should == { :factor => 1.5 }
+    ArEnums::Base.new(name: :green, factor: 1.5, enum_class: Class.new).extra_columns.should == { factor: 1.5 }
   end
 
   context "External enums" do
     before do
-      define_model_class 'Color', 'ActiveRecord::Enum' do
+      define_model_class 'Color', 'ArEnums::Base' do
         enumeration do
-          red :rgb => 0xF00
-          green :rgb => 0x0F0
-          blue :rgb => 0x00F
+          red rgb: 0xF00
+          green rgb: 0x0F0
+          blue rgb: 0x00F
         end
       end    
 
-      define_model_class 'State', 'ActiveRecord::Enum' do
+      define_model_class 'State', 'ArEnums::Base' do
         enumeration do
-          on :id => 80
-          off :id => 90
+          on id: 80
+          off id: 90
         end
       end    
     end
     
     it "should provide :all method to access the enums" do
-      Color.all[0].should be_enum_with(:name => 'red', :rgb => 0xF00)
-      Color.all[1].should be_enum_with(:name => 'green', :rgb => 0x0F0)
-      State.all[0].should be_enum_with(:name => 'on', :id => 80)
-      State.all[1].should be_enum_with(:name => 'off', :id => 90)
+      Color.all[0].should be_enum_with(name: 'red', rgb: 0xF00)
+      Color.all[1].should be_enum_with(name: 'green', rgb: 0x0F0)
+      State.all[0].should be_enum_with(name: 'on', id: 80)
+      State.all[1].should be_enum_with(name: 'off', id: 90)
     end
     
     it "should provide [] method to access the enums" do
-      Color[:red].should be_enum_with(:name => 'red')
-      Color['green'].should be_enum_with(:name => 'green')
-      Color[2].should be_enum_with(:name => 'green')
+      Color[:red].should be_enum_with(name: 'red')
+      Color['green'].should be_enum_with(name: 'green')
+      Color[2].should be_enum_with(name: 'green')
     end
   end
   
@@ -50,11 +50,11 @@ describe "Enum" do
   end
   
   it "in? should check if == to any" do
-    define_model_class 'Color', 'ActiveRecord::Enum' do
+    define_model_class 'Color', 'ArEnums::Base' do
       enumeration do
-        red :rgb => 0xF00
-        green :rgb => 0x0F0
-        blue :rgb => 0x00F
+        red rgb: 0xF00
+        green rgb: 0x0F0
+        blue rgb: 0x00F
       end
     end    
     

data/spec/ar_enums/enum_definition_spec.rb

@@ -83,7 +83,7 @@ end
 
 describe "External enumerations" do
   before do
-    define_model_class 'State', 'ActiveRecord::Enum' do
+    define_model_class 'State', 'ArEnums::Base' do
       enumeration do
         ca
         tx
@@ -94,7 +94,7 @@ describe "External enumerations" do
       enum :state
     end
     
-    define_model_class 'TrafficLightState', 'ActiveRecord::Enum' do
+    define_model_class 'TrafficLightState', 'ArEnums::Base' do
       enumeration do
         green :rgb => 0x0F0
         red :rgb => 0xF00
@@ -130,7 +130,7 @@ describe "External enumerations" do
     end
     
     it "should be posible to define new methods in Enum subclass" do
-      define_model_class 'State', 'ActiveRecord::Enum' do
+      define_model_class 'State', 'ArEnums::Base' do
         enumeration do
           green :factor => 1
           red :factor => 2

data/spec/ar_enums/factory_spec.rb

@@ -1,19 +1,19 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe "Enums creation styles" do
-  include ActiveRecord::Enumerations::OptionsHelper
+  include ArEnums::OptionsHelper
 
   def make_enums *config, &block
-    add_option config, :class_name => ActiveRecord::Enum
-    ActiveRecord::Enumerations::Factory.make_enums *config, &block
+    add_option config, class_name: ArEnums::Base
+    ArEnums::Factory.make_enums *config, &block
   end
   
   context "array of values style" do
     it "should generate ids" do
       enums = make_enums %w[red green blue]
-      enums[0].should be_enum_with(:id => 1, :name => 'red')
-      enums[1].should be_enum_with(:id => 2, :name => 'green')
-      enums[2].should be_enum_with(:id => 3, :name => 'blue')
+      enums[0].should be_enum_with(id: 1, name: 'red')
+      enums[1].should be_enum_with(id: 2, name: 'green')
+      enums[2].should be_enum_with(id: 3, name: 'blue')
     end
     
     it "default to_s should be name titleized" do
@@ -21,42 +21,42 @@ describe "Enums creation styles" do
     end
 
     it "should override default to_s" do
-      make_enums(%w[green red], :label => :upcase).map(&:to_s).should == %w[GREEN RED]
+      make_enums(%w[green red], label: :upcase).map(&:to_s).should == %w[GREEN RED]
     end
   end
   
   context "array of hashes style" do
     it "should accept ids if provided" do
-      enums = make_enums [{ :id => 20, :name => :red }, { :id => 10, :name => :green }]
-      enums[0].should be_enum_with(:id => 20, :name => 'red')
-      enums[1].should be_enum_with(:id => 10, :name => 'green')
+      enums = make_enums [{ id: 20, name: :red }, { id: 10, name: :green }]
+      enums[0].should be_enum_with(id: 20, name: 'red')
+      enums[1].should be_enum_with(id: 10, name: 'green')
     end
     
     it "should generate ids if not provided" do
-      enums = make_enums [{ :name => :red }, { :name => :green }]
-      enums[0].should be_enum_with(:id => 1, :name => 'red')
-      enums[1].should be_enum_with(:id => 2, :name => 'green')
+      enums = make_enums [{ name: :red }, { name: :green }]
+      enums[0].should be_enum_with(id: 1, name: 'red')
+      enums[1].should be_enum_with(id: 2, name: 'green')
     end
 
     it "default to_s should be :desc column" do
-      enums = make_enums [{ :name => :red, :desc => 'Rojo' }, { :name => :green, :desc => 'Verde' }]
+      enums = make_enums [{ name: :red, desc: 'Rojo' }, { name: :green, desc: 'Verde' }]
       enums.map(&:to_s).should == %w[Rojo Verde]
     end      
     
     it ":label options can be a method to call on name" do
-      enums = make_enums [{ :name => :red }, { :name => :green }], :label => :upcase
+      enums = make_enums [{ name: :red }, { name: :green }], label: :upcase
       enums.map(&:to_s).should == %w[RED GREEN]
     end   
        
     it ":label option can be a enum column" do
-      enums = make_enums [{ :name => :red, :title => 'Rojo' }, { :name => :green, :title => 'Verde' }], :label => :title
+      enums = make_enums [{ name: :red, title: 'Rojo' }, { name: :green, title: 'Verde' }], label: :title
       enums.map(&:to_s).should == %w[Rojo Verde]
     end      
     
     it "should accept extra columns" do
       enums = make_enums [
-        { :name => :red, :factor => 1.5, :stop_traffic => true },
-        { :name => :green, :factor => 2.5, :stop_traffic => false }
+        { name: :red, factor: 1.5, stop_traffic: true },
+        { name: :green, factor: 2.5, stop_traffic: false }
       ]
       enums.map(&:factor).should == [1.5, 2.5]
       enums.map(&:stop_traffic).should == [true, false]
@@ -66,32 +66,32 @@ describe "Enums creation styles" do
   context "block style" do
     it "can be created with a block" do
       enums = make_enums do
-        red :rgb => 0xF00
-        green :rgb => 0x0F0
+        red rgb: 0xF00
+        green rgb: 0x0F0
       end
-      enums[0].should be_enum_with(:id => 1, :name => 'red', :rgb => 0xF00)
-      enums[1].should be_enum_with(:id => 2, :name => 'green', :rgb => 0x0F0)
+      enums[0].should be_enum_with(id: 1, name: 'red', rgb: 0xF00)
+      enums[1].should be_enum_with(id: 2, name: 'green', rgb: 0x0F0)
     end    
     
     it "should accept :label option" do
-      enums = make_enums :label => :title do
-        red :title => 'Rojo'
-        green :title => 'Verde'
+      enums = make_enums label: :title do
+        red title: 'Rojo'
+        green title: 'Verde'
       end
       enums.map(&:to_s).should == %w[Rojo Verde]
     end
     
     it "should accept extra columns" do
       enums = make_enums do
-        red :factor => 1.5
-        green :factor => 2.5
+        red factor: 1.5
+        green factor: 2.5
       end
       enums.map(&:factor).should == [1.5, 2.5]
     end
 
     it "when extra column is empty should return nil" do
       enums = make_enums do
-        red :factor => 1.5
+        red factor: 1.5
         green
       end
       enums.map(&:factor).should == [1.5, nil]

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ end
 
 RSpec::Matchers.define :be_enum_with do |expected_attrs|
   match do |enum|
-    enum.should be_a(ActiveRecord::Enum)
+    enum.should be_a(ArEnums::Base)
     expected_attrs.each do |atrib, expected_value|
       enum.send(atrib).should == expected_value
     end

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: ar-enums
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273332269460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273332269460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70273332268960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70273332268960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70273332268460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273332268460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70273332268080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273332268080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - emmanicolau@gmail.com
@@ -62,12 +101,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .rvmrc
+- ".autotest"
+- ".gitignore"
+- ".rbenv-version"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -75,7 +115,7 @@ files:
 - autotest/discover.rb
 - examples/internal_enums.rb
 - lib/ar-enums.rb
-- lib/ar_enums/enum.rb
+- lib/ar_enums/base.rb
 - lib/ar_enums/enum_block.rb
 - lib/ar_enums/enum_definition.rb
 - lib/ar_enums/enum_field.rb
@@ -83,44 +123,37 @@ files:
 - lib/ar_enums/metaprogramming_extensions.rb
 - lib/ar_enums/options_helper.rb
 - lib/ar_enums/version.rb
+- spec/ar_enums/base_spec.rb
 - spec/ar_enums/enum_definition_spec.rb
-- spec/ar_enums/enum_spec.rb
 - spec/ar_enums/factory_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -209326541352629550
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -209326541352629550
 requirements: []
 rubyforge_project: ar-enums
-rubygems_version: 1.8.10
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a simple way for defining enumerations in ActiveRecord models
 test_files:
+- spec/ar_enums/base_spec.rb
 - spec/ar_enums/enum_definition_spec.rb
-- spec/ar_enums/enum_spec.rb
 - spec/ar_enums/factory_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3-p0