has_enum 0.7.1 → 0.7.2

data/lib/has_enum/class_methods.rb

@@ -1,7 +1,8 @@
 module HasEnum::ClassMethods
 
   def enums
-    @enums ||= read_inheritable_attribute(:enums)
+    read_inheritable_attribute(:enums) ||
+      write_inheritable_attribute(:enums, HashWithIndifferentAccess.new)
   end
 
   def enum_values(attribute)
@@ -68,15 +69,19 @@ module HasEnum::ClassMethods
   end
 
   def human_enum_values(enum)
-    begin
-      options = {:default => nil, :raise => true, :count => nil}
-      HashWithIndifferentAccess.new(human_attribute_name("#{enum}_enum", options))
-    rescue I18n::MissingTranslationData
-      (enums[enum] || []).inject HashWithIndifferentAccess.new do |hash, value|
+    values = human_attribute_name("#{enum}_enum", :count => nil)
+    unless values.is_a? Hash
+      values = (enums[enum] || []).inject({}) do |hash, value|
         hash[value] = value.humanize
         hash
       end
     end
+    values.with_indifferent_access
+  end
+
+
+  def values_for_select_tag(enum)
+    human_enums[enum].invert.to_a
   end
 
 end

data/lib/has_enum/formtastic.rb

@@ -0,0 +1,24 @@
+begin
+  require 'formtastic'
+
+  Formtastic::SemanticFormBuilder.class_eval do
+
+    def enum_input(method, options = {})
+      options.merge! :collection => object.class.values_for_select_tag(method),
+                     :wrapper_html => {:class => :enum}
+      self.select_input(method, options)
+    end
+
+    def default_input_type_with_enum(method, options={})
+      if object.class.respond_to?(:enums) && object.class.has_enum?(method)
+        :enum
+      else
+        default_input_type_without_enum(method, options)
+      end
+    end
+
+    alias_method_chain :default_input_type, :enum
+
+  end
+rescue LoadError
+end

data/lib/has_enum/helpers.rb

@@ -25,7 +25,7 @@ class ActionView::Helpers::InstanceTag
   end
 
   def values_for_enum_tag
-    object.class.human_enums[method_name].invert.to_a
+    object.class.values_for_select_tag(method_name)
   end
 end
 

data/lib/has_enum/version.rb

@@ -1,3 +1,3 @@
 module HasEnum
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/has_enum.rb

@@ -3,7 +3,6 @@ module HasEnum
   autoload :ClassMethods,            'has_enum/class_methods'
 
   def self.included(base)
-    base.write_inheritable_attribute(:enums, HashWithIndifferentAccess.new)
     base.extend ClassMethods
   end
 
@@ -13,28 +12,4 @@ class ActiveRecord::Base
   include HasEnum
 end
 
-begin
-  require 'formtastic'
-
-  Formtastic::SemanticFormBuilder.class_eval do
-
-    def enum_input(method, options = {})
-      value = @object.send(method)
-      options.reverse_merge! :as => :select,
-                             :collection => @object.class.human_enums[method].invert.to_a
-      self.input(method, options).gsub(/class="select/, 'class="enum')
-    end
-
-    def input_with_enum(method, options={})
-      if @object.class.respond_to?(:enums) && @object.class.enums[method] && !options[:as]
-        enum_input(method, options)
-      else
-        input_without_enum(method, options)
-      end
-    end
-
-    alias_method_chain :input, :enum
-
-  end
-rescue LoadError
-end
+require 'has_enum/formtastic'

data/spec/ru.yml

@@ -1,11 +1,13 @@
 ru:
+  attributes:
+    size_enum:
+      small: "Маленький"
+      medium: "Средний"
+      large: "Большой"
+
   activerecord:
     attributes:
       test_model:
-        size_enum:
-          small: "Маленький"
-          medium: "Средний"
-          large: "Большой"
         status_enum:
           pending: "На рассмотрении"
           failed: "Обработано с ошибкой"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Andreas Korth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +07:00
+date: 2011-03-29 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - has_enum.gemspec
 - lib/has_enum.rb
 - lib/has_enum/class_methods.rb
+- lib/has_enum/formtastic.rb
 - lib/has_enum/helpers.rb
 - lib/has_enum/version.rb
 - spec/has_enum_spec.rb