selectable_attr_rails 0.3.7 → 0.3.8

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 3
-:patch: 7
+:build: 
 :major: 0
+:minor: 3
+:patch: 8

data/lib/selectable_attr_rails/db_loadable.rb

@@ -9,10 +9,38 @@ module SelectableAttrRails
     end
     
     module Entry
-      attr_accessor :name_from_db
-      def name
-        @name_from_db || super
+
+      if defined?(I18n)
+        def name_from_db
+          @names_from_db ||= {}
+          @names_from_db[I18n.locale.to_s]
+        end
+
+        def name_from_db=(value)
+          @names_from_db ||= {}
+          @names_from_db[I18n.locale.to_s] = value
+        end
+        
+        def name_with_from_db
+          name_from_db || name_without_from_db
+        end
+
+      else
+        
+        attr_accessor :name_from_db
+        def name_with_from_db
+          @name_from_db || name_without_from_db
+        end
+      
+      end
+
+      def self.extended(obj)
+        obj.instance_eval do
+          alias :name_without_from_db :name
+          alias :name :name_with_from_db
+        end
       end
+
     end
     
     module InstanceMethods
@@ -30,7 +58,7 @@ module SelectableAttrRails
         unless @original_entries
           @original_entries = @entries.dup
           @original_entries.each do |entry|
-            entry.extend(SelectableAttrRails::DbLoadable::Entry)
+            entry.extend(SelectableAttrRails::DbLoadable::Entry) unless respond_to?(:name_from_db)
           end
         end
         records = nil
@@ -38,7 +66,8 @@ module SelectableAttrRails
           records = @sql_to_update.call
         else
           @connection ||= ActiveRecord::Base.connection
-          records = @connection.select_rows(@sql_to_update)
+          sql = @sql_to_update.gsub(/\:locale/, I18n.locale.to_s.inspect)
+          records = @connection.select_rows(sql)
         end
         
         new_entries = []
@@ -48,6 +77,8 @@ module SelectableAttrRails
             new_entries << entry
           else
             entry = SelectableAttr::Enum::Entry.new(self, r.first, "entry_#{r.first}".to_sym, r.last)
+            entry.extend(SelectableAttrRails::DbLoadable::Entry)
+            entry.name_from_db = r.last
             new_entries << entry
           end
         end

data/lib/selectable_attr_rails/helpers/radio_button_group_helper.rb

@@ -2,6 +2,10 @@ module SelectableAttrRails::Helpers
   module RadioButtonGroupHelper
     class Builder < SelectableAttrRails::Helpers::AbstractSelectionBuilder
       
+      attr_reader :entry_hash_array 
+      attr_reader :entry_hash 
+      attr_accessor :radio_button_id 
+
       def initialize(object, object_name, method, options, template)
         super(object, object_name, method, options, template)
         @entry_hash_array ||= enum_hash_array_from_class

data/lib/selectable_attr_rails/helpers/select_helper.rb

@@ -26,7 +26,7 @@ module SelectableAttrRails::Helpers
       
       def single_enum_select(object_name, method, options = {}, html_options = {}, &block)
         options = update_enum_select_options(options, object_name, method)
-        object = options.delete(:object)
+        object = options[:object] # options.delete(:object)
         base_name = options.delete(:base_name)
         entry_hash_array = options.delete(:entry_hash_array) || object.class.send("#{base_name}_hash_array")
         container = entry_hash_array.map{|hash| [hash[:name].to_s, hash[:id]]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selectable_attr_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Takeshi Akima
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +09:00
+date: 2009-10-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency