combo_box 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/combo_box/action_controller.rb

@@ -10,6 +10,8 @@ module ComboBox
 
       # Generates a default action which is the resource for a combo_box.
       # It generates an helper which takes in account selected columns for displaying.
+      # The label used to display items is based on the used columns. These columns can be
+      # used with I18n. The key used is: +views.combo_boxes.<controller>.<action>+
       # 
       # @macro [new] options_details
       #   @param [Hash] options Options to build controller action

data/lib/combo_box/generator.rb

@@ -135,7 +135,8 @@ module ComboBox
         # order = ", :order=>"+@columns.collect{|column| "#{column[0]} ASC"}.join(', ').inspect
         # limit = ", :limit=>"+(@options[:limit]||80).to_s
         joins = @options[:joins] ? ".joins(#{@options[:joins].inspect}).include(#{@options[:joins].inspect})" : ""
-        order = ".order("+@columns.collect{|c| "#{c.sql_name} ASC"}.join(', ').inspect+")"
+        
+        order = @options[:order] ? ".order(#{@options[:order].inspect})" : ".order("+@columns.collect{|c| "#{c.sql_name} ASC"}.join(', ').inspect+")"
         limit = ".limit(#{@options[:limit]||80})"
 
         partial = @options[:partial]
@@ -194,6 +195,21 @@ module ComboBox
         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(', ')+"')"
       end
 
+      def sanitize_conditions(value)
+        if value.is_a? Array
+          if value.size == 1 and value[0].is_a? String
+            value[0].to_s
+          else
+            value.inspect
+          end
+        elsif value.is_a? String
+          '"'+value.gsub('"','\"')+'"'
+        elsif [Date, DateTime].include? value.class
+          '"'+value.to_formatted_s(:db)+'"'
+        else
+          value.to_s
+        end
+      end
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_box
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21071460 !ruby/object:Gem::Requirement
+  requirement: &19675440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *21071460
+  version_requirements: *19675440
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &21070980 !ruby/object:Gem::Requirement
+  requirement: &19674960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21070980
+  version_requirements: *19674960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21070500 !ruby/object:Gem::Requirement
+  requirement: &19674480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21070500
+  version_requirements: *19674480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21070020 !ruby/object:Gem::Requirement
+  requirement: &19674000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21070020
+  version_requirements: *19674000
 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.
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2484117035189926183
+      hash: 1493692048347508204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: