ar-enums 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/ar-enums.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-enums}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emmanuel Nicolau"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-12}
   s.description = %q{Provides a simple way for defining enumerations in ActiveRecord models}
   s.email = %q{emmanicolau@gmail.com}
   s.extra_rdoc_files = [

data/lib/enum.rb

@@ -36,7 +36,7 @@ module ActiveRecord
     end
     
     def self.enumeration *config, &block
-      add_option config, :enum_class => self
+      add_option config, :class_name => self
       define_enums_getter ActiveRecord::Enumerations::Factory.make_enums(*config, &block)
     end
     

data/lib/enum_block.rb

@@ -1,16 +1,17 @@
 module ActiveRecord
   module Enumerations
     class EnumBlock    
-      def initialize options = {}
+      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 << @options[:enum_class].new(attrs)
+        @enums << @enum_class.new(attrs)
       end
     end
   end

data/lib/enum_definition.rb

@@ -9,10 +9,8 @@ module ActiveRecord
       
       def enum field_name, *config, &block
         field = EnumField.new field_name
-        enum_class = Class.new Enum
-        const_set field.name.camelize, enum_class
-        add_options config, :enum_class => enum_class, :on_style_not_matched => asume_external_style(field)
-        enums = Factory.new.make_enums *config, &block
+        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

data/lib/factory.rb

@@ -1,41 +1,63 @@
 module ActiveRecord
   module Enumerations
     class Factory
-      include OptionsHelper
+      extend OptionsHelper
       
       def self.make_enums *config, &block
-        new.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
     
-      def make_enums *config, &block
-        values, options = extract_values_and_options config
-        options[:enum_class].label_method = options.delete(:label) || :desc
-        create_enums(values, options, &block).tap do |enums|
-          define_question_methods options[:enum_class], enums
-          define_extra_columns_methods options[:enum_class], enums
+      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
     
-      private
-      def create_enums values, options, &block
-        enums = if block_given?
-          block_style options, &block
-        elsif values.any?
-          array_of_values_or_hashes_style values, options
-        elsif options[:on_style_not_matched]
-          options[:on_style_not_matched].call options
+      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
+        enums = if @block
+          block_style
+        elsif @values.any?
+          array_of_values_or_hashes_style
+        else
+          enum_class.all
         end
       end
     
-      def block_style options, &block
-        EnumBlock.new(options).instance_eval(&block)
+      def block_style 
+        EnumBlock.new(enum_class, @options).instance_eval(&@block)
       end
     
-      def array_of_values_or_hashes_style values, options
-        values.map { |value| options[:enum_class].create_from(value, values, options) }
+      def array_of_values_or_hashes_style 
+        @values.map { |value| enum_class.create_from(value, @values, @options) }
       end
       
-      def define_question_methods enum_class, enums
+      def define_question_methods enums
         enums.each do |e|
           enum_class.class_eval %Q{
             def #{e.name}?
@@ -45,7 +67,7 @@ module ActiveRecord
         end
       end
       
-      def define_extra_columns_methods enum_class, enums
+      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{

data/spec/enum_definition_spec.rb

@@ -83,23 +83,23 @@ end
 
 describe "External enumerations" do
   before do
-    define_model_class 'CountryState', 'ActiveRecord::Enum' do
+    define_model_class 'State', 'ActiveRecord::Enum' do
       enumeration do
         ca
         tx
       end
     end
-
+    
     define_model_class 'Country' do
-      enum :state, :class_name => 'CountryState'
-    end    
+      enum :state
+    end
     
     define_model_class 'TrafficLightState', 'ActiveRecord::Enum' do
       enumeration do
         green :rgb => 0x0F0
         red :rgb => 0xF00
       end
-    end    
+    end
     
     define_model_class 'TrafficLight' do
       enum :state, :class_name => 'TrafficLightState'
@@ -113,7 +113,7 @@ describe "External enumerations" do
 
     it "should be posible to access all enums from withing the owner" do
       TrafficLight.states.should equal(TrafficLightState.all)
-      Country.states.should equal(CountryState.all)
+      Country.states.should equal(State.all)
     end
 
     it "should accept :class_name options to override de class of the external enum" do
@@ -139,6 +139,13 @@ describe "External enumerations" do
         def double_factor() factor * 2 end
       end    
       State.all.map(&:double_factor).should == [2, 4]
-    end    
+    end 
+    
+    it "should not define new constant form enum class" do
+      define_model_class 'TrafficLight' do
+        enum :estado, :class_name => 'TrafficLightState'
+      end
+      expect { TrafficLight.const_get(:Estado) }.to raise_error NameError
+    end   
   end
 end

data/spec/factory_spec.rb

@@ -4,7 +4,7 @@ describe "Enums creation styles" do
   include ActiveRecord::Enumerations::OptionsHelper
 
   def make_enums *config, &block
-    add_option config, :enum_class => ActiveRecord::Enum
+    add_option config, :class_name => ActiveRecord::Enum
     ActiveRecord::Enumerations::Factory.make_enums *config, &block
   end
   

data/spec/spec.opts

@@ -1,2 +1,3 @@
 --color
 --debugger
+--backtrace

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Emmanuel Nicolau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -03:00
+date: 2010-08-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency