splendeo-dependent_select 0.6.2 → 0.6.4

data/lib/dependent_select/dependent_select.rb

@@ -5,13 +5,13 @@ module DependentSelect
   # Example:
   #   # At the bottom of config/environment.rb:
   #   DependentSelect.default_options.update(
-  #     :collapse_blanks => false
+  #     :collapse_spaces => false
   #   )
   def self.default_options
-    @default_options ||= { :collapse_blanks => true }
+    @default_options ||= { :collapse_spaces => true }
   end
 
-  # By default, blank spaces are collapsed on browsers when printing the select option texts
+  # By default, spaces are collapsed on browsers when printing the select option texts
   # For example:
   #    <select>
   #       <option>This  option    should   have      lots of       spaces   on its text</option>
@@ -21,8 +21,8 @@ module DependentSelect
   # Setting collapse_blanks to false will replace the blanks with the &nbsp; character, using
   # javascript
   #    option_text.replace(/ /g, "\240"); // "\240" is the octal representation of charcode 160 (nbsp)
-  def self.collapse_blanks=(value)
-    default_options[:collapse_blanks] = value
+  def self.collapse_spaces=(value)
+    default_options[:collapse_spaces] = value
   end
 
 end

data/lib/dependent_select/form_helpers.rb

@@ -39,7 +39,7 @@ module DependentSelect::FormHelpers
   #    </select>
   # Most browsers will "collapse" the spaces, and present something like this instead:
   #       "This option should have lots of spaces on its text"
-  # Setting collapse_blanks to false will replace the blanks with the &nbsp; character.
+  # Setting collapse_spaces to false will replace the blanks with the &nbsp; character.
   # This is accomplised on the javascript function using code similar to the following
   #
   #    option_text.replace(/ /g, "\240"); // "\240" is the octal representation of charcode 160 (nbsp)
@@ -267,11 +267,11 @@ module DependentSelect::FormHelpers
   def dependent_collection_select(object_name, method, collection, value_method, 
     text_method, filter_method, options = {}, html_options = {}
   )
-    object, options, extra_options = dependent_select_process_options(options)
+    object, options, extra_options = dependent_select_process_options(object_name, options)
 
     initial_collection = dependent_select_initial_collection(object,
       method, collection, value_method)
-
+    
     tag = collection_select(object_name, method, initial_collection, value_method, 
       text_method, options, html_options)
 
@@ -331,7 +331,7 @@ module DependentSelect::FormHelpers
   def dependent_select(object_name, method, choices_with_filter, filter_method,
     options = {}, html_options = {})
 
-    object, options, extra_options = dependent_select_process_options(options)
+    object, options, extra_options = dependent_select_process_options(object_name, options)
 
     initial_choices = dependent_select_initial_choices(object, method, choices_with_filter)
     
@@ -350,14 +350,16 @@ module DependentSelect::FormHelpers
     end
   
     # extracts any options passed into calendar date select, appropriating them to either the Javascript call or the html tag.
-    def dependent_select_process_options(options)
+    def dependent_select_process_options(object_name, options)
       options, extra_options = DependentSelect.default_options.merge(options), {}
       for key in [:collapse_spaces, :filter_field, :complete_filter_field, :array_name]
         extra_options[key] = options.delete(key) if options.has_key?(key)
       end
        
-      object = options.delete(:object) || instance_variable_get("@#{object}")
-        
+      object = options.delete(:object) || instance_variable_get("@#{object_name}")
+      
+      options[:object]=object
+
       [object, options, extra_options]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splendeo-dependent_select
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors: 
 - Enrique Garcia Cota (egarcia)
@@ -31,6 +31,7 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/splendeo/dependent_select
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -51,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: generates a select with some js code that updates if if another field is modified.