thin_man 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06e9191250030954e43aa80ec1039a04387c6da
-  data.tar.gz: 5f79ff39a656093021667941d8aea2accffd4749
+  metadata.gz: 889c8c7807a4ed374dd0bb78ab34768f9f641f66
+  data.tar.gz: cb5199ac9ddd6a2471ca0f91e039d0123270d4e3
 SHA512:
-  metadata.gz: 2a84356d1c56ca333fcc91aa5a27b1cbb84438228daec8c86e2076c925daa416f210120aaaab845acc93e383563bb7dde58dd49f858573ab9e2848536eb8a1eb
-  data.tar.gz: 2edf5c8474575ecf040aa91f958cc74b6c2f0cc7c6f86b52b324089a837d83159b8900f5e3a0a34d3e73ee746a4396467e9b6625406ab0a37ccc59640c684183
+  metadata.gz: 2b8c563c47e60e8f4b6167d34c2cc6863671343cfd7cbaca583bed57f7fa56a2283d7c4951904fd9ca9373a6e889fc8f7317710fc2d526ee83ae77e615e6e45b
+  data.tar.gz: ac17499c839a3096abf2d69d4fcea1889b4b290ffc245c1e9298b0e18d11e744427f354b818d083b66d21dab5c497002e963682c86838ab00fc7f42847cd4c9f

data/app/assets/javascripts/thin_man.js

@@ -8,6 +8,51 @@ var initThinMan = function(){
       }
       return this_class;
     },
+    getLinkGroup: function(name){
+      if(thin_man.hasOwnProperty('link_groups') && thin_man.link_groups.hasOwnProperty(name)){
+        return thin_man.link_groups[name]        
+      } else {
+        return thin_man.addLinkGroup(name)
+      }
+    },
+    addLinkGroup: function(name){
+      if(!thin_man.hasOwnProperty('link_groups')){
+        thin_man.link_groups = {}
+      }
+      if(!thin_man.link_groups.hasOwnProperty(name)){
+        var this_group = new thin_man.LinkGroup(name)
+        thin_man.link_groups[name] = this_group
+        return this_group
+      }
+    },
+    addLinkToGroup: function(link, sequence_number, group_name){
+      var group = thin_man.getLinkGroup(group_name)
+      group.addLink(link,sequence_number)
+    },
+    LinkGroup: Class.extend({
+      init: function(name){
+        this.name = name
+        this.links = {}
+        this.current_number = 0
+      },
+      addLink: function(link_submission, sequence_number){
+        this.links[sequence_number] = link_submission
+        link_submission.addWatcher(this)
+        if(sequence_number == this.current_number){
+          this.fire()
+        }
+      },
+      fire: function(){
+        if(this.links.hasOwnProperty(this.current_number)){
+          this.links[this.current_number].fire()
+          delete this.links[this.current_number]
+        }
+      },
+      linkCompleted: function(link_submission){
+        this.current_number += 1
+        this.fire()
+      }
+    }),
     AjaxSubmission: Class.extend({
       init: function(jq_obj,params){
         this.jq_obj = jq_obj;
@@ -24,6 +69,7 @@ var initThinMan = function(){
         this.progress_target = $(jq_obj.data('progress-target'));
         this.custom_progress = typeof(jq_obj.data('custom-progress')) != 'undefined';
         this.scroll_to = jq_obj.data('scroll-to')
+        this.watchers = []
         if(this.progress_target.length == 0 && this.trigger.length > 0){
           this.progress_target = this.trigger
           this.trigger_is_progress_target = true
@@ -48,8 +94,30 @@ var initThinMan = function(){
           this.ajax_options.xhr = this.customXHR
           this.ajax_options.thin_man_obj = this;
         }
+        this.handleGroup()
+        if(this.readyToFire()){
+          this.fire()
+        }
+      },
+      fire: function(){
         $.ajax(this.ajax_options);
       },
+      readyToFire: function(){
+        if(!this.sequence_group){ return true }
+      },
+      handleGroup: function(){
+        this.sequence_group = this.jq_obj.data('sequence-group');
+        this.sequence_number = this.jq_obj.data('sequence-number');
+        if(typeof(this.sequence_number) == 'number' && !this.sequence_group){
+          console.log('Warning! Thin Man Link has sequence number but no sequence group.')
+        }
+        if(this.sequence_group && typeof(this.sequence_number) != 'number'){
+          console.log('Warning! Thin Man Link has sequence group ' + this.sequence_group + ' but no sequence number.')
+        }
+        if(this.sequence_group){
+          thin_man.addLinkToGroup(this, this.sequence_number, this.sequence_group)
+        }
+      },
       getTarget: function(){
         var target_selector = this.jq_obj.data('ajax-target');
         if(target_selector){
@@ -173,8 +241,20 @@ var initThinMan = function(){
           this.jq_obj.find('.help-inline').remove()
         }
       },
+      addWatcher: function(watcher){
+        if(!this.hasOwnProperty('watchers')){
+          this.watchers = []
+        }
+        this.watchers.push(watcher)
+      },
+      notifyWatchers: function(){
+        $.each(this.watchers, function(){
+          this.linkCompleted(this)
+        })
+      },
       ajaxComplete: function(jqXHR) {
         this.showTrigger();
+        this.notifyWatchers();
         if(this.progress_indicator){
           this.progress_indicator.stop();
         } else if(!this.trigger_is_progress_target){

data/lib/thin_man/ajax_helper.rb

@@ -21,7 +21,10 @@ module ThinMan
               html_options.merge(ajax_options))
     end
 
-    def ajax_link_now(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil, progress_target: nil, progress_color: nil)
+    def ajax_link_now(name, options, html_options, target,
+      sub_class: nil, insert_method: nil, empty_on_success: nil,
+      http_method: nil, no_mouse_click: nil, progress_target: nil,
+      progress_color: nil, sequence_group: nil, sequence_number: nil)
       ajax_options = {
         'data-ajax-link-now' => true,
         'data-ajax-target' => target
@@ -33,6 +36,8 @@ module ThinMan
       ajax_options.merge!('data-no-mouse-click' => no_mouse_click) if no_mouse_click.present?
       ajax_options.merge!('data-progress-target' => progress_target) if progress_target.present?
       ajax_options.merge!('data-progress-color' => progress_color) if progress_color.present?
+      ajax_options.merge!('data-sequence-group' => sequence_group) if sequence_group.present?
+      ajax_options.merge!('data-sequence-number' => sequence_number) if sequence_number.present?
       link_to(name,
               options,
               html_options.merge(ajax_options))

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.17.0"
+  VERSION = "0.18.0"
 end

data/test/javascript/spec/thinManSpec.js

@@ -113,10 +113,26 @@ describe("thin_man", function(){
       expect(getAjaxArg("url")).toMatch("/url");
       expect(getAjaxArg("type")).toMatch("PATCH");
       expect(getAjaxArg("datatype")).toMatch("json");
+      expect(thin_man.hasOwnProperty('link_groups')).toEqual(false)
     });
-
+    it("fires grouped links in sequence", function(){
+      var $link_zero = affix('a[data-ajax-link-now="true"][data-ajax-target="#test_dom_id"][href="/url"][data-ajax-method="PATCH"][data-sequence-group="test_group"][data-sequence-number="0"]');
+      var $link_one = affix('a[data-ajax-link-now="true"][data-ajax-target="#test_dom_id"][href="/url"][data-ajax-method="PATCH"][data-sequence-group="test_group"][data-sequence-number="1"]');
+      var $link_two = affix('a[data-ajax-link-now="true"][data-ajax-target="#test_dom_id"][href="/url"][data-ajax-method="PATCH"][data-sequence-group="test_group"][data-sequence-number="2"]');
+      zero = new thin_man.AjaxLinkSubmission($link_zero)
+      one = new thin_man.AjaxLinkSubmission($link_one)
+      two = new thin_man.AjaxLinkSubmission($link_two)
+      expect(thin_man.hasOwnProperty('link_groups')).toEqual(true)
+      spyOn(one,'fire')
+      spyOn(two,'fire')
+      zero.ajaxComplete()
+      expect(one.fire).toHaveBeenCalled();
+      expect(two.fire).not.toHaveBeenCalled();
+      one.ajaxComplete()
+      expect(one.fire.calls.count()).toEqual(1);
+      expect(two.fire).toHaveBeenCalled();
+    })
   });
-
   describe("DeleteLink", function(){
     it("submits an ajax delete call with options", function(){
       var $link = affix('a[data-ajax-delete="true"][data-ajax-target="#test_dom_id"][href="/url"]');

data/test/thin_man_test.rb

@@ -14,6 +14,8 @@ class ThinManTest < ActionView::TestCase
     @progress_target = '#progress_element'
     @progress_color = 'blue'
     @scroll_to = true
+    @sequence_group = 'test_group'
+    @sequence_number = 0
 
     @replace_response = true
     @no_confirm = true
@@ -39,7 +41,11 @@ class ThinManTest < ActionView::TestCase
   end
 
   it "generates an instant link" do
-    test_link = ajax_link_now('test link', "http://test.com", @html_options, @target, insert_method: @insert_method, empty_on_success: @empty_on_success, http_method: @http_method, progress_target: @progress_target, progress_color: @progress_color)
+    test_link = ajax_link_now('test link', "http://test.com", @html_options, @target,
+        insert_method: @insert_method, empty_on_success: @empty_on_success,
+        http_method: @http_method, progress_target: @progress_target,
+        progress_color: @progress_color, sequence_number: @sequence_number,
+        sequence_group: @sequence_group)
     test_link.must_match "data-ajax-link-now="
     test_link.must_match(/class=.test_class./)
     test_link.must_match "data-ajax-target=\"#{@target}\""
@@ -48,6 +54,8 @@ class ThinManTest < ActionView::TestCase
     test_link.must_match "data-ajax-method=\"#{@http_method}\""
     test_link.must_match "data-progress-target=\"#{@progress_target}\""
     test_link.must_match "data-progress-color=\"#{@progress_color}\""
+    test_link.must_match "data-sequence-group=\"#{@sequence_group}\""
+    test_link.must_match "data-sequence-number=\"#{@sequence_number}\""
   end
 
   it "generates a delete link" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails