combo_box 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/combo_box/generator.rb

@@ -12,6 +12,7 @@ module ComboBox
         @model = model
         @name = name.to_s
         @filter = options.delete(:filter) || "%X%"
+        @code = options.delete(:code)
         @interpolation_key = options.delete(:interpolation_key) || @name.gsub(/\W/, '_')
         klass = @model
         @through = (options.delete(:through) || []).collect do |reflection|
@@ -29,16 +30,20 @@ module ComboBox
       end
 
       def value_code(record='record')
-        code  = ""
-        value = "#{record}#{'.'+@through.join('.') unless @through.empty?}.#{name}"
+        code  = "("
+        value = "(#{record}#{'.'+@through.join('.') unless @through.empty?}.#{name})"
         @through.each_index do |i|
           code << "#{record}.#{@through[0..i].join('.')}.nil? ? '' : "
         end
-        if [:date, :datetime, :timestamp].include? self.type
-          code = "(#{code}#{value}.nil? ? '' : ::I18n.localize(#{value}))"
-        else
-          code = "(#{code}#{value}).to_s"
-        end
+        code << if @code
+                  @code.gsub(/RECORD/, record).gsub(/DATUM/, value)
+                elsif[:date, :datetime, :timestamp].include? self.type
+                  "(#{value}.nil? ? '' : ::I18n.localize(#{value}))"
+                else
+                  value
+                end
+        code << ")"
+        code << ".to_s" unless name.to_s == "count"
         return code
       end
 
@@ -187,13 +192,14 @@ module ComboBox
         code << "    return ''\n"
         code << "  end\n"
         code << "end\n"
+        # puts code
         return code
       end
 
       private
 
       def item_label(record, options={})
-        return "::I18n.translate('views.combo_boxes.#{@controller.controller_name}.#{@action_name}', "+@columns.collect{|c| ":#{c.interpolation_key}=>#{c.value_code(record)}"}.join(', ')+", :default=>'"+@columns.collect{|c| "%{#{c.interpolation_key}}"}.join(', ')+"')"
+        return "::I18n.translate('views.combo_boxes.#{@controller.controller_name}.#{@action_name}', "+@columns.collect{|c| ":#{c.interpolation_key}=>#{c.value_code(record)}"}.join(', ')+", :default=>[:'labels.#{@action_name}', '"+@columns.collect{|c| "%{#{c.interpolation_key}}"}.join(', ')+"']).gsub(/%s/, \"\\u{00A0}\")"
       end
 
       def sanitize_conditions(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_box
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16108240 !ruby/object:Gem::Requirement
+  requirement: &23382560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *16108240
+  version_requirements: *23382560
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &16107280 !ruby/object:Gem::Requirement
+  requirement: &23381940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16107280
+  version_requirements: *23381940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16106440 !ruby/object:Gem::Requirement
+  requirement: &23381300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *16106440
+  version_requirements: *23381300
 description: Adds helpers for Rails views and controller in order to manage 'dynamic
   select'. It uses jQuery UI as support for inobtrusive use in forms. It's not the
   classic Autocompleter, its use is limited to belongs_to reflections.
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3255549222173850358
+      hash: 2856060928740621467
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: