assoc_whisperer 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2960496ba2056b1cbdaa67fa844d589f6d99e16
-  data.tar.gz: 974d3d0c13f0076d4a9999939b2f174179e6dfea
+  metadata.gz: e3b0faee0f011a70f467c0952840bf4f9769b2d7
+  data.tar.gz: 3c79fa3dd430cd87812df970f2587c3582fedbf0
 SHA512:
-  metadata.gz: 8bd9f8f5160f64f80771260787bc1d6c8cc29bf75f534ddd42401a035a60b6b2979194cb70af5f517938b4e83066fd942e8c3cc212e0c45b989b7d4c00a0f7ad
-  data.tar.gz: d041b0693d85f550207a0ee1a9ffc48e7ce7e5206a5471831477c1ed25b4e572a9bfb45b34f5fbb914497162d6239d817ec8abe6fff0265bf2a86e5463f54a92
+  metadata.gz: 03278adaba130fbe47971380cfb6c34c3835fd19d1aa8fd2df0a7f018f658ecfac25a976e642761ec4bd0c3a9b0cfd8cb06e09f5f2bb01bd080a7138514d915d
+  data.tar.gz: c368cf1dcb3f33d4fb6c258d810d6a197403da440f411cff62aafe43b46d02edca3424db4383ee965c5c707ee0a29e8d934653045c64573970b9bb2fd4a31883

data/app/assets/javascripts/assoc_whisp.js

@@ -15,7 +15,7 @@ document.AssocWhisperer = (function () {
 
     // This is where Whisperer Object is created - with all hidden inner methods.
     function createWhisperer(dom_node) {
-        var el, w, _nodes, _timer;
+        var el, w, _nodes, opts, params, _timer;
 
         el = $(dom_node);
         _nodes = {
@@ -24,16 +24,23 @@ document.AssocWhisperer = (function () {
             value_field: el.children('.value_field'),
             list: null
         };
+        opts = el.data('opts');
+        if (!opts['action']) throw 'Missing action in '+JSON.stringify(opts);
+        if (!opts['url']) throw 'Missing url in '+JSON.stringify(opts);
+        if (typeof opts['params']!=='object') opts['params'] = {};
 
         w = Object.create(proto, {
             nodes: {value: _nodes},
-            action: {value: el.attr('data-action')},
-            url: {value: el.attr('data-url')},
+            action: {value: opts['action']},
+            url: {value: opts['url']},
+            params: {value: opts['params']},
             focused: {value: false, writable: true},
             filled: {value: _nodes['value_field'].val()!=='', writable: true},
-            client_side: {value: el.attr('data-client-side')==='true'},
+            client_side: {value: opts['cs']===true},
+            preload: {value: opts['pre']===true},
             full_data: {value: null, writable: true}
         });
+        w.params['data_action'] = w.action;
 
         _nodes.text_field.on('keyup', function(e){
             var input_text;
@@ -101,6 +108,7 @@ document.AssocWhisperer = (function () {
                 });
             }
         });
+        el.children('.dropdown_button').removeClass('querying'); // css class is set, hence gif gets pre-loaded
 
         // For local full_data finds matching rows and shows them.
         function digest(input_text) {
@@ -179,10 +187,11 @@ document.AssocWhisperer = (function () {
         klass.querying = true;
         btn = w.nodes['base'].find('.dropdown_button');
         btn.addClass('querying');
+        w.params['input'] = input || '';
         $.ajax(w.url, {
                 type: 'GET',
                 dataType: 'html',
-                data: {data_action: w.action, input: (input||'')},
+                data: w.params,
                 error: function () { w.removeList(); },
                 success: on_success,
                 complete: function () {

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

@@ -32,28 +32,18 @@ module ActionView
       # And the 'value_field' would be filled by +manager_id+ of +worker+ associated to +task+, 'text_field' by his +full_name+
       #
       def assoc_whisperer(object_name, method, data_action, options={})
+        raise "Helper '#assoc_whisperer' is for Rails >= 4.x. Use '#assoc_whisperer_tag' instead." if Rails::VERSION::STRING.to_i < 4
         wrapper_assoc_whisperer_assets
 
-        options[:url] = AssocWhisperer.def_url unless options.has_key? :url
         Tags::AssocWhispererField.new(object_name, method, self, data_action, options).render
       end
 
       def assoc_whisperer_tag(name, data_action, options = {})
         wrapper_assoc_whisperer_assets
 
-        sanitized_id = name.to_s.delete(']').gsub(/[^-a-zA-Z0-9:.]/, "_")
-        text_tag_name = name.to_s.dup
-        text_tag_name.insert (text_tag_name[-1]==']' ? -2 : -1), '_txt'
-
-        content = %Q(<input class="value_field" id="#{sanitized_id}" name="#{name}" type="hidden")
-        content << %Q( value="#{options[:value]}">)
-        content << %Q(<input autocomplete="off" class="text_field#{' unfilled' if options[:value].blank?}")
-        content << %Q( id="#{sanitized_id}_txt" name="#{text_tag_name}" size="#{options[:size]||12}")
-        content << %Q( type="text" value="#{options[:text]}">)
-        content << %Q(<span class="dropdown_button">\u25BE</span>)
-        content_tag :span, content.html_safe, 'data-url' => (options[:url]||AssocWhisperer.def_url),
-                    'data-action' => data_action, 'data-client-side' => (options[:client_side] && 'true'),
-                    'class' => 'assoc_whisperer'
+        template = AssocWhisperer::Template.new data_action, options
+        content_tag :span, template.simple_tag_contents(name).html_safe, 'class' => 'assoc_whisperer',
+                    'data-opts' => template.whisperer_options.to_json
       end
 
       private

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

@@ -4,21 +4,19 @@ module ActionView
       class AssocWhispererField < Base # :nodoc:
 
         def initialize(object_name, method_name, template_object, action, options={})
-          @action = action
-          options[:value_method] = :id unless options.has_key? :value_method
-          options[:text_method] = :to_s unless options.has_key? :text_method
+          options[:value_method] = AssocWhisperer.def_value_method unless options.has_key? :value_method
+          options[:text_method] = AssocWhisperer.def_text_method unless options.has_key? :text_method
           super object_name, method_name, template_object, options
+          @template = AssocWhisperer::Template.new action, @options
         end
 
         def render
-          content = %Q(<input class="value_field" id="#{value_tag_id}" name="#{value_tag_name}" type="hidden")
-          content << %Q( value="#{value_tag_value}">)
-          content << %Q(<input autocomplete="off" class="text_field#{' unfilled' unless whispered_object}")
-          content << %Q( id="#{text_tag_id}" name="#{text_tag_name}" size="#{@options[:size]||12}")
-          content << %Q( type="text" value="#{text_tag_value}">)
-          content << %Q(<span class="dropdown_button">\u25BE</span>)
-          content_tag :span, content.html_safe, 'data-url' => @options[:url], 'data-action' => @action,
-                      'data-client-side' => (@options[:client_side] && 'true'), 'class' => 'assoc_whisperer'
+          contents = @template.value_field_tag value_tag_id, value_tag_name, value_tag_value
+          contents += @template.text_field_tag text_tag_id, text_tag_name, text_tag_value, !whispered_object
+          contents += @template.dropdown_button_tag
+
+          content_tag :span, contents.html_safe, 'class' => 'assoc_whisperer',
+                      'data-opts' => @template.whisperer_options.to_json
         end
 
         private
@@ -41,7 +39,7 @@ module ActionView
         end
 
         def text_tag_value
-          text = @options[:text_method]
+          text = @template.opts[:text_method]
           text = if text.respond_to? :call
                    text.call whispered_object
                  else
@@ -51,13 +49,7 @@ module ActionView
         end
 
         def text_sanitized_method_name
-          return @text_sanitized_method_name if defined? @text_sanitized_method_name
-          wsmn = if @options[:name]
-                   "#{@options[:name]}_txt"
-                 else
-                   "#{@method_name}_txt"
-                 end
-          @text_sanitized_method_name = wsmn.sub(/\?$/,"")
+          @text_sanitized_method_name ||= "#{@template.opts[:name] || @method_name}_txt".sub(/\?$/,"")
         end
 
         def value_tag_name
@@ -69,15 +61,15 @@ module ActionView
         end
 
         def value_tag_value
-          whispered_object_attribute @options[:value_method]
+          whispered_object_attribute @template.opts[:value_method]
         end
 
         def value_sanitized_method_name
           return @value_sanitized_method_name if defined? @value_sanitized_method_name
-          wsmn = if @options[:name]
-                   @options[:name].to_s
+          wsmn = if @template.opts[:name]
+                   @template.opts[:name].to_s
                  else
-                   "#{@method_name}_#{@options[:value_method]}"
+                   "#{@method_name}_#{@template.opts[:value_method]}"
                  end
           @value_sanitized_method_name = wsmn.sub(/\?$/,"")
         end

data/lib/assoc_whisperer.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
-require "assoc_whisperer/version"
+require 'assoc_whisperer/version'
+require 'assoc_whisperer/template'
 
 module AssocWhisperer
 
   class << self
-    attr_accessor :def_url, :attach_assets_method
+    attr_accessor :def_url, :attach_assets_method, :def_value_method, :def_text_method
   end
 
   module Rails
@@ -12,7 +13,23 @@ module AssocWhisperer
     end
   end
 
+  def self.value_field_html(id, name, value)
+    %(<input type="hidden" id="#{id}" name="#{name}" value="#{value}" class="value_field">)
+  end
+
+  def self.text_field_html(id, name, value, unfilled=true, opts={})
+    opts = opts.keys.inject([]){|arr, k| arr << %(#{k}="#{opts[k]}"); arr }*' '
+    %(<input type="text" id="#{id}" name="#{name}" value="#{value} class="text_field#{' unfilled' if unfilled}"#{opts}>)
+  end
+
+  def self.dropdown_button_html
+    @dropdown_button_html ||= "<span class=\"dropdown_button\">\u25BE</span>"
+  end
+
 end
 
 AssocWhisperer.def_url = '/whisp'
 AssocWhisperer.attach_assets_method = :attach_assoc_whisperer_assets
+
+AssocWhisperer.def_value_method = :id
+AssocWhisperer.def_text_method = :to_s

data/lib/assoc_whisperer/template.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+
+module AssocWhisperer
+  class Template
+    attr_reader :action, :opts
+
+    def initialize(action, opts={})
+      @action = action
+      @opts = opts
+    end
+
+    def simple_tag_contents(input_name)
+      input_name = input_name.to_s
+      sanitized_id = input_name.dup.delete(']').gsub(/[^-a-zA-Z0-9:.]/, "_")
+      text_tag_name = input_name.dup
+      text_tag_name.insert (text_tag_name[-1]==']' ? -2 : -1), '_txt'
+
+      contents = value_field_tag sanitized_id, input_name, @opts[:value]
+      contents += text_field_tag "#{sanitized_id}_txt", text_tag_name, @opts[:text], @opts[:value].blank?
+      contents + dropdown_button_tag
+    end
+
+    def whisperer_options
+      h = {url: (@opts[:url]||AssocWhisperer.def_url), action: @action}
+      h.merge cs: true, pre: !!@opts[:preload] if @opts[:client_side]
+      h[:params] = @opts[:params] unless @opts[:params].blank?
+      h
+    end
+
+    def value_field_tag(id, name, value)
+      %(<input type="hidden" id="#{id}" name="#{name}" value="#{value}" class="value_field">)
+    end
+
+    def text_field_tag(id, name, value, unfilled=true)
+      opts = @opts[:text_field]
+      if opts
+        opts[:size] ||= 12
+        keys_whitelist = (opts.keys & [:size, :placeholder, :maxlength, :title])
+        opts = keys_whitelist.inject [] do |arr, k|
+          arr << %(#{k}="#{opts[k]}")
+          arr
+        end
+        opts = opts * ' '
+      end
+      %(<input type="text" autocomplete="off" id="#{id}" name="#{name}" value="#{value}" class="text_field#{' unfilled' if unfilled}"#{opts}>)
+    end
+
+    def dropdown_button_tag
+      "<span class=\"dropdown_button querying\">\u25BE</span>"
+    end
+
+  end
+end

data/lib/assoc_whisperer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assoc_whisperer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - app/views/assoc_whisperer/list_array.html.erb
 - assoc_whisperer.gemspec
 - lib/assoc_whisperer.rb
+- lib/assoc_whisperer/template.rb
 - lib/assoc_whisperer/version.rb
 homepage: ''
 licenses: