assoc_whisperer 1.2.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b0faee0f011a70f467c0952840bf4f9769b2d7
-  data.tar.gz: 3c79fa3dd430cd87812df970f2587c3582fedbf0
+  metadata.gz: c12d3a84dff2b3fcedf60c2abd790d235626c566
+  data.tar.gz: aacfc5036d39c470b1301cc6b7f853f0dded41d0
 SHA512:
-  metadata.gz: 03278adaba130fbe47971380cfb6c34c3835fd19d1aa8fd2df0a7f018f658ecfac25a976e642761ec4bd0c3a9b0cfd8cb06e09f5f2bb01bd080a7138514d915d
-  data.tar.gz: c368cf1dcb3f33d4fb6c258d810d6a197403da440f411cff62aafe43b46d02edca3424db4383ee965c5c707ee0a29e8d934653045c64573970b9bb2fd4a31883
+  metadata.gz: 760054c15cc9fc0aea5357f11db45cfb81e5245a3747f574ba6fccc1abeb3a50aac045d17a08e26a09122f238e5744ea18239fb4775977ef388cc82bc481c9ce
+  data.tar.gz: 6309409f36c8087a4460dc542eaaf2b3d05fa1850f0df4cd5f2d20a4dd145eb97812a5cd4eafb542d946b9f9658576e0233bfb9c0f4917f75e33d0c45939c3bc

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, opts, params, _timer;
+        var el, w, opts, _nodes, _timer;
 
         el = $(dom_node);
         _nodes = {
@@ -25,22 +25,25 @@ document.AssocWhisperer = (function () {
             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 (!opts['action']) throw 'Missing action path in '+JSON.stringify(opts);
         if (typeof opts['params']!=='object') opts['params'] = {};
+//        opts['cs'] = parseInt(opts['cs']);
 
         w = Object.create(proto, {
             nodes: {value: _nodes},
-            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: opts['cs']===true},
-            preload: {value: opts['pre']===true},
-            full_data: {value: null, writable: true}
+            // setting
+            action: {value: opts['action']},
+            params: {value: opts['params']}
         });
-        w.params['data_action'] = w.action;
+//        if (!isNaN(opts['cs'])) {
+//            // client side
+//            Object.defineProperties({
+//                client_side: {value: opts['cs']},
+//                full_data: {value: null, writable: true}
+//            });
+//        }
 
         _nodes.text_field.on('keyup', function(e){
             var input_text;
@@ -67,11 +70,11 @@ document.AssocWhisperer = (function () {
                 }
                 _timer = setTimeout(function () {
                     if (w.client_side) {
-                        if (!w.full_data) query(w, null, function (html_text) {
-                            w.full_data = $(html_text);
-                            showList(digest(input_text));
-                        });
-                        else showList(digest(input_text));
+//                        if (!w.full_data) query(w, null, function (html_text) {
+//                            w.full_data = $(html_text);
+//                            showList(digest(input_text));
+//                        });
+//                        else showList(digest(input_text));
                     }
                     else query(w, input_text, function (html_text) {
                         showList($(html_text));
@@ -86,20 +89,20 @@ document.AssocWhisperer = (function () {
             var f;
             if (_timer) clearTimeout(_timer);
             if (w.client_side) {
-                f = function () {
-                    var input_text;
-                    if (w.filled) showList(w.full_data);
-                    else {
-                        input_text = _nodes['text_field'].val();
-                        showList(digest(input_text==='' ? null : input_text));
-                    }
-                    _nodes['list'].focus();
-                };
-                if (!w.full_data) query(w, null, function (html_text) {
-                    w.full_data = $(html_text);
-                    f();
-                });
-                else f();
+//                f = function () {
+//                    var input_text;
+//                    if (w.filled) showList(w.full_data);
+//                    else {
+//                        input_text = _nodes['text_field'].val();
+//                        showList(digest(input_text==='' ? null : input_text));
+//                    }
+//                    _nodes['list'].focus();
+//                };
+//                if (!w.full_data) query(w, null, function (html_text) {
+//                    w.full_data = $(html_text);
+//                    f();
+//                });
+//                else f();
             }
             else {
                 query(w, (w.filled ? null : _nodes['text_field'].val()), function (html_text) {
@@ -110,19 +113,19 @@ 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) {
-            var narrowed_list = w.full_data;
-            if (input_text && input_text!=='') {
-                input_text = input_text.toLowerCase();
-                narrowed_list = $(narrowed_list[0].cloneNode());
-                w.full_data.children().each(function () {
-                    if (this.innerText.toLowerCase().indexOf(input_text)!==-1)
-                        narrowed_list.append($(this).clone());
-                });
-            }
-            return narrowed_list;
-        }
+//        // For local full_data finds matching rows and shows them.
+//        function digest(input_text) {
+//            var narrowed_list = w.full_data;
+//            if (input_text && input_text!=='') {
+//                input_text = input_text.toLowerCase();
+//                narrowed_list = $(narrowed_list[0].cloneNode());
+//                w.full_data.children().each(function () {
+//                    if (this.innerText.toLowerCase().indexOf(input_text)!==-1)
+//                        narrowed_list.append($(this).clone());
+//                });
+//            }
+//            return narrowed_list;
+//        }
 
         // Attaches a List sent by html string within Whisperer's tag. Positions it underneath the text field.
         function showList (list) {
@@ -187,8 +190,8 @@ document.AssocWhisperer = (function () {
         klass.querying = true;
         btn = w.nodes['base'].find('.dropdown_button');
         btn.addClass('querying');
-        w.params['input'] = input || '';
-        $.ajax(w.url, {
+        w.params['input'] = input;
+        $.ajax(w.action, {
                 type: 'GET',
                 dataType: 'html',
                 data: w.params,
@@ -206,7 +209,6 @@ document.AssocWhisperer = (function () {
     //                                          public interface                                                      //
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
     klass = Object.create(Object, {querying: {value: false, writable: true}});
 
     // Return a Whisperer instance by its data-action attribute.
@@ -214,7 +216,7 @@ document.AssocWhisperer = (function () {
         var i, w;
         for (i = 0; i < all_array.length; i += 1) {
             w = all_array[i];
-            if (w.action===action) return w;
+            if (w.params['action']===action || w.action.indexOf(action)!==-1) return w;
         }
         return null;
     }

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

@@ -3,54 +3,29 @@ module ActionView
 
     module AssocWhispererHelper
 
-      # Createa an association whisperer tag, that will attach javascript object to self
-      # allowing user to select a text but stores something differend (mostly respective id).
-      #
-      # ==== Examples
-      #   assoc_whisperer :task, :worker, :workers, size: 25, url: '/whisp'
-      #   # => <span class="assoc_whisperer" data-action="workers" data-url="/whisp">
-      #        <input class="value_field" id="task_worker_id" name="task[worker_id]" type="hidden" value="">
-      #        <input autocomplete="off" class="text_field unfilled" id="task_worker_txt" name="task[worker_txt]" size="25" type="text" value="">
-      #        <span class="dropdown_button">▾</span></span>
-      #
-      # Let's say your association looks like this:
-      #
-      #   class Task
-      #     belongs_to :worker, class_name: 'Worker', foreign_key: :manager
-      #   end
-      #   class Worker
-      #     def full_name; end
-      #     def manager_id; end
-      #   end
-      #
-      #   assoc_whisperer :task, :worker, :workers, name: :manager, value_method: :manager_id, text_method: :full_name
-      #   # => <span class="assoc_whisperer" data-action="workers" data-url="">
-      #        <input class="value_field" id="task_manager" name="task[manager]" type="hidden" value="">
-      #        <input autocomplete="off" class="text_field unfilled" id="task_manager_txt" name="task[manager_txt]" size="12" type="text" value="">
-      #        <span class="dropdown_button">▾</span></span>
-      #
-      # 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
+      def whisperer(object_name, method, template, field_attrs={})
+        raise "Helper '#whisperer' cannot be used in Rails < 4.x. Use '#whisperer_tag' instead." if Rails::VERSION::STRING.to_i < 4
+        wrapper_whisperer_assets
 
-        Tags::AssocWhispererField.new(object_name, method, self, data_action, options).render
+        Tags::AssocWhispererField.new(object_name, method, self, template, field_attrs).render
       end
 
-      def assoc_whisperer_tag(name, data_action, options = {})
-        wrapper_assoc_whisperer_assets
+      def whisperer_tag(name, template, field_attrs={})
+        wrapper_whisperer_assets
 
-        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
+        content_tag :span, template.tag_contents(name, field_attrs).html_safe, 'class' => 'assoc_whisperer',
+                    'data-opts' => template.whisperer_settings.to_json
+      end
+
+      def whisperer_template(action, opts={})
+        AssocWhisperer::Template.new action, opts
       end
 
       private
 
-      def wrapper_assoc_whisperer_assets
+      def wrapper_whisperer_assets
         unless @assoc_whisp_attached
-          attach_method = AssocWhisperer.attach_assets_method
+          attach_method = AssocWhisperer.attach_assets
           self.send attach_method if attach_method && self.respond_to?(attach_method)
           @assoc_whisp_attached = true
         end
@@ -59,8 +34,8 @@ module ActionView
     end
 
     class FormBuilder
-      def assoc_whisperer(method, data_action, options = {})
-        @template.assoc_whisperer @object_name, method, data_action, objectify_options(options)
+      def whisperer(method, template, field_attrs={})
+        @template.assoc_whisperer @object_name, method, template, objectify_options(field_attrs)
       end
     end
 

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

@@ -3,20 +3,20 @@ module ActionView
     module Tags # :nodoc:
       class AssocWhispererField < Base # :nodoc:
 
-        def initialize(object_name, method_name, template_object, action, options={})
-          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
+        def initialize(object_name, method_name, template_object, whisp_template, options={})
+          @whisp_template = whisp_template
           super object_name, method_name, template_object, options
-          @template = AssocWhisperer::Template.new action, @options
         end
 
         def render
-          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
+          @whisp_template.value_text whispered_object
+
+          contents = @whisp_template.value_field_tag value_tag_id, value_tag_name
+          contents += @whisp_template.text_field_tag text_tag_id, text_tag_name, @options
+          contents += @whisp_template.dropdown_button_tag
 
           content_tag :span, contents.html_safe, 'class' => 'assoc_whisperer',
-                      'data-opts' => @template.whisperer_options.to_json
+                      'data-opts' => @whisp_template.whisperer_settings.to_json
         end
 
         private
@@ -25,11 +25,6 @@ module ActionView
           @whispered_object ||= value @object
         end
 
-        def whispered_object_attribute(method)
-          wo = whispered_object
-          wo.send method if wo && wo.respond_to?(method)
-        end
-
         def text_tag_name
           "#{@object_name}[#{text_sanitized_method_name}]"
         end
@@ -38,18 +33,8 @@ module ActionView
           "#{sanitized_object_name}_#{text_sanitized_method_name}"
         end
 
-        def text_tag_value
-          text = @template.opts[:text_method]
-          text = if text.respond_to? :call
-                   text.call whispered_object
-                 else
-                   whispered_object_attribute(text)
-                 end
-          ERB::Util.html_escape text
-        end
-
         def text_sanitized_method_name
-          @text_sanitized_method_name ||= "#{@template.opts[:name] || @method_name}_txt".sub(/\?$/,"")
+          @text_sanitized_method_name ||= "#{@whisp_template.opts[:name] || @method_name}_txt".sub(/\?$/,"")
         end
 
         def value_tag_name
@@ -60,18 +45,14 @@ module ActionView
           "#{sanitized_object_name}_#{value_sanitized_method_name}"
         end
 
-        def value_tag_value
-          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 @template.opts[:name]
-                   @template.opts[:name].to_s
+          name = if @whisp_template.opts[:name]
+                   @whisp_template.opts[:name].to_s
                  else
-                   "#{@method_name}_#{@template.opts[:value_method]}"
+                   "#{@method_name}_#{@template.opts[:value]}"
                  end
-          @value_sanitized_method_name = wsmn.sub(/\?$/,"")
+          @value_sanitized_method_name = name.sub(/\?$/, '')
         end
 
       end

data/app/views/assoc_whisperer/list.html.erb

@@ -1,9 +1,9 @@
 <%
    text_method = local_assigns[:text] || :to_s
-   val_method = local_assigns[:val] || :id
+   value_method = local_assigns[:value] || :id
 %>
 <div tabindex=0 class="list">
   <% @objects.each do |o| %>
-    <div data-value="<%= o.send val_method %>"><%= o.send text_method %></div>
+    <div data-value="<%= o.send value_method %>"><%= o.send text_method %></div>
   <% end %>
 </div>

data/lib/assoc_whisperer/template.rb

@@ -2,47 +2,64 @@
 
 module AssocWhisperer
   class Template
-    attr_reader :action, :opts
+    attr_reader :opts
 
     def initialize(action, opts={})
-      @action = action
+      @action = action[0]=='/' ? action : "#{AssocWhisperer.def_url}/#{action}"
       @opts = opts
     end
 
-    def simple_tag_contents(input_name)
+    def params(params)
+      @params = params
+      self
+    end
+
+    def value_text(object_or_params, name=nil)
+      if object_or_params.is_a?(Hash) && name
+        @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)
+      else
+        @value = nil
+        @text = nil
+      end
+      self
+    end
+
+    def tag_contents(input_name, field_attrs={})
       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 = value_field_tag sanitized_id, input_name
+      contents += text_field_tag "#{sanitized_id}_txt", text_tag_name, field_attrs
       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?
+    def whisperer_settings
+      h = {action: @action}
+      # h[:cs] = @opts[:client_side] if @opts[:client_side]
+      h[:params] = @params if @params
       h
     end
 
-    def value_field_tag(id, name, value)
-      %(<input type="hidden" id="#{id}" name="#{name}" value="#{value}" class="value_field">)
+    def value_field_tag(id, name)
+      %(<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 * ' '
+    def text_field_tag(id, name, attrs={})
+      attrs[:size] = 12 unless attrs.has_key? :size
+      keys_whitelist = (attrs.keys & [:size, :placeholder, :maxlength, :title])
+      attrs = keys_whitelist.inject [] do |arr, k|
+        arr << %(#{k}="#{attrs[k]}")
+        arr
       end
-      %(<input type="text" autocomplete="off" id="#{id}" name="#{name}" value="#{value}" class="text_field#{' unfilled' if unfilled}"#{opts}>)
+      %(<input type="text" autocomplete="off" id="#{id}" name="#{name}" value="#{@text}" class="text_field#{' unfilled' unless @value}"#{attrs * ' '}>)
     end
 
     def dropdown_button_tag

data/lib/assoc_whisperer/version.rb

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

data/lib/assoc_whisperer.rb

@@ -5,7 +5,7 @@ require 'assoc_whisperer/template'
 module AssocWhisperer
 
   class << self
-    attr_accessor :def_url, :attach_assets_method, :def_value_method, :def_text_method
+    attr_accessor :def_url, :attach_assets, :def_value, :def_text
   end
 
   module Rails
@@ -13,23 +13,10 @@ 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.attach_assets = :attach_whisperer_assets
 
-AssocWhisperer.def_value_method = :id
-AssocWhisperer.def_text_method = :to_s
+AssocWhisperer.def_value = :id
+AssocWhisperer.def_text = :to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assoc_whisperer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler