assoc_whisperer 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27b9b727c24d4854931accf16f95b6a7e5a37057
-  data.tar.gz: 43ecbae14277e0a36f996810f630c2ddce36ce82
+  metadata.gz: ca1ca5cce6d22e7055f31b9b78882841b189f566
+  data.tar.gz: 1c70ae286a41c2dc043d2c5473a4637c53cac426
 SHA512:
-  metadata.gz: 920c4fa5f5ddf259352295b986077d31642efa307da7ced452693d9df971637dd9d24b1b9254d3ad703eb6346fd1cd09b863a7aaa791c6ee5ef05e44a50ef186
-  data.tar.gz: 57e24abab50e7e490d7c5ac592920b6014c2fe92f3262205632d3a731bbcda1e0cf60fd3e6d11636f7964be620a8b9bb1d00033e43d5b907a67f01e763bf8743
+  metadata.gz: ec3f05c46e88412964b0184c6ce8629accca9e8c54bb5ed363b3c810e4f0b69a8ad138f94c558f2117bca923512fc9d3b88e81d35efdafc5710cb5aa1d9cbbf4
+  data.tar.gz: 8724e1498fe5d2b3ac71a1a61f15e5bb6172b8010b3f78bbb32910d9e2f4d5b72da3abba55d101d413e033ccd74f00678b904449aaf339bb6a5be6f707292aa8

data/app/helpers/action_view/helpers/assoc_whisperer_helper.rb

@@ -35,7 +35,7 @@ module ActionView
 
     class FormBuilder
       def whisperer(method, template, field_attrs={})
-        @template.assoc_whisperer @object_name, method, template, objectify_options(field_attrs)
+        @template.whisperer @object_name, method, template, objectify_options(field_attrs)
       end
     end
 

data/app/helpers/action_view/helpers/tags/assoc_whisperer_field.rb

@@ -50,7 +50,7 @@ module ActionView
           name = if @whisp_template.opts[:name]
                    @whisp_template.opts[:name].to_s
                  else
-                   "#{@method_name}_#{@template.opts[:value]}"
+                   "#{@method_name}_#{@whisp_template.opts[:value]}"
                  end
           @value_sanitized_method_name = name.sub(/\?$/, '')
         end

data/lib/assoc_whisperer/template.rb

@@ -7,7 +7,9 @@ module AssocWhisperer
     def initialize(action, opts={})
       @action = action[0]=='/' ? action : "#{AssocWhisperer.def_url}/#{action}"
       @opts = opts
-      @opts[:dropdown_button] = true if @opts[:dropdown_button].nil?
+      @opts[:value] = AssocWhisperer.def_value unless @opts[:value]
+      @opts[:text] = AssocWhisperer.def_text unless @opts[:text]
+      @opts[:button] = true if @opts[:button].nil?
     end
 
     def params(params)
@@ -20,10 +22,8 @@ module AssocWhisperer
         @value = object_or_params[name]
         @text = object_or_params["#{name}_txt"]
       elsif object_or_params
-        value = @opts[:value] || AssocWhisperer.def_value
-        text = @opts[:text] || AssocWhisperer.def_text
-        @value = (object_or_params.send value if object_or_params.respond_to? value)
-        @text = (object_or_params.send text if object_or_params.respond_to? text)
+        @value = (object_or_params.send @opts[:value] if object_or_params.respond_to? @opts[:value])
+        @text = (object_or_params.send @opts[:text] if object_or_params.respond_to? @opts[:text])
       else
         @value = nil
         @text = nil
@@ -64,7 +64,7 @@ module AssocWhisperer
     end
 
     def dropdown_button_tag
-      return '' unless @opts[:dropdown_button].is_a? TrueClass
+      return '' unless @opts[:button].is_a? TrueClass
       "<span class=\"dropdown_button querying\">\u25BE</span>"
     end
 

data/lib/assoc_whisperer/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module AssocWhisperer
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assoc_whisperer
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler