thin_man 0.15.8 → 0.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6779a68452e92f36738fed109f92449110a66bcd
-  data.tar.gz: 0ae8efe05b5928b498d40875dee75aab50eb1e07
+  metadata.gz: eb59b80ee372136c2d30ce71712bf3f70cda3432
+  data.tar.gz: d4756037bcad8774858773769303360c14bc702c
 SHA512:
-  metadata.gz: b4ef51cf77238bdf29cad939d163dfe920bdc85541c27f8711c0e81eba46809e489dd19c64bdd522655026b924a60083e36a9e1b4e24a2b779725fae173510aa
-  data.tar.gz: aa501036540e2b82d583d8ead1a4ad3c500972e475832e841ddb85c1a4345a07e5856bb3f625b98f6ad1376f25864d1a6a66e4004ecfa3eb2c547732027dbf3f
+  metadata.gz: e0f1ccf59e2f46bd89b15cab567ef5d3f8f527f96ca53075639bb35af30b55cf6338ebea55cca01cb106815ed67224aa56bd17f813dfdc81cf9925aa5e1e894c
+  data.tar.gz: 73dfdc654606498b54894f3277a9c23deec0d84baefc088d706d84143abaaaf846fcccdffaa50743fa84b91078df0fce1b67ce38207da63b91c3ee3de9c6f850

data/app/assets/javascripts/thin_man.js

@@ -263,7 +263,7 @@ var initThinMan = function(){
     }),
     AjaxProgress: Class.extend({
       init: function(target,alt,progress_color){
-        if(target.length > 0 && target.is(':visible')){
+        if(target.length > 0 && target.is(':visible') && target.css('display') != 'inline'){
           this.progress_target = target;
         } else if(typeof(alt) != 'undefined' && alt.is(':visible')) {
           this.progress_target = alt;

data/lib/thin_man/ajax_helper.rb

@@ -1,6 +1,6 @@
 module ThinMan
   module AjaxHelper
-    def ajax_link(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)
+    def ajax_link(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)
       ajax_options = {
         'data-ajax-link' => true,
         'data-ajax-target' => target
@@ -11,12 +11,13 @@ module ThinMan
       ajax_options.merge!('data-empty-on-success' => empty_on_success) if empty_on_success.present?
       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?
       link_to(name,
               options,
               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, progress_target: nil)
+    def ajax_link_now(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil, progress_target: nil, progress_color: nil)
       ajax_options = {
         'data-ajax-link-now' => true,
         'data-ajax-target' => target
@@ -26,6 +27,7 @@ module ThinMan
       ajax_options.merge!('data-ajax-method' => http_method) if http_method.present?
       ajax_options.merge!('data-empty-on-success' => empty_on_success) if empty_on_success.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?
       link_to(name,
               options,
               html_options.merge(ajax_options))
@@ -46,7 +48,7 @@ module ThinMan
               html_options.merge(ajax_options))
     end
 
-    def ajax_form_hash(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, no_mouse_click: nil, progress_target: nil)
+    def ajax_form_hash(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, no_mouse_click: nil, progress_target: nil, progress_color: nil)
       ajax_options = {
         'data-ajax-form' => true,
         'data-ajax-target' => target
@@ -60,10 +62,11 @@ module ThinMan
       ajax_options.merge!('data-custom-progress' => custom_progress) if custom_progress.present?
       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
     end
 
-    def ajax_form_now(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, progress_target: nil)
+    def ajax_form_now(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, progress_target: nil, progress_color: nil)
       ajax_options = {
         'data-ajax-form-now' => true,
         'data-ajax-target' => target
@@ -76,10 +79,11 @@ module ThinMan
       ajax_options.merge!('data-reset-on-success' => reset_on_success) if reset_on_success.present?
       ajax_options.merge!('data-custom-progress' => custom_progress) if custom_progress.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
     end
 
-    def ajax_form_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, no_mouse_click: nil, progress_target: nil)
+    def ajax_form_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, no_mouse_click: nil, progress_target: nil, progress_color: nil)
       data_attrs = "data-ajax-form=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-sub-type=#{sub_class}" if sub_class
@@ -88,10 +92,11 @@ module ThinMan
       data_attrs += " data-error-target=#{error_target}" if error_target
       data_attrs += " data-no-mouse-click=#{no_mouse_click}" if no_mouse_click
       data_attrs += " data-progress-target=#{progress_target}" if progress_target
+      data_attrs += " data-progress-color=#{progress_color}" if progress_color
       data_attrs
     end
 
-    def ajax_form_now_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, progress_target: nil)
+    def ajax_form_now_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, progress_target: nil, progress_color: nil)
       data_attrs = "data-ajax-form-now=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-sub-type=#{sub_class}" if sub_class
@@ -99,10 +104,11 @@ module ThinMan
       data_attrs += " data-reset-on-success=#{reset_on_success}" if reset_on_success
       data_attrs += " data-error-target=#{error_target}" if error_target
       data_attrs += " data-progress-target=#{progress_target}" if progress_target
+      data_attrs += " data-progress-color=#{progress_color}" if progress_color
       data_attrs
     end
 
-    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil, progress_target: nil)
+    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil, progress_target: nil, progress_color: nil)
       data_attrs = "data-ajax-link=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-ajax-method=#{http_method}" if http_method
@@ -110,6 +116,7 @@ module ThinMan
       data_attrs += " data-empty-on-success=#{empty_on_success}" if empty_on_success
       data_attrs += " data-no-mouse-click=#{no_mouse_click}" if no_mouse_click
       data_attrs += " data-progress-target=#{progress_target}" if progress_target
+      data_attrs += " data-progress-color=#{progress_color}" if progress_color
       data_attrs
     end
 

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.15.8"
+  VERSION = "0.15.9"
 end

data/test/test_helper.rb

@@ -2,8 +2,12 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
 require "rails/test_help"
+require 'minitest/unit'
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'minitest/pride'
+require 'minitest/rails'
 
 Rails.backtrace_cleaner.remove_silencers!
 

data/test/thin_man_test.rb

@@ -1,7 +1,70 @@
 require 'test_helper'
 
-class ThinManTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, ThinMan
+class ThinManTest < ActionView::TestCase
+  include ThinMan::AjaxHelper
+
+  def setup
+    @html_options = {class: 'test_class'}
+    @target = '#target_element'
+    @error_target = '#error_target'
+    @insert_method = 'append'
+    @empty_on_success = '#empty_me'
+    @http_method = 'PATCH'
+    @no_mouse_click = true
+    @progress_target = '#progress_element'
+    @progress_color = 'blue'
+
+    @replace_response = true
+    @no_confirm = true
+    @custom_progress = '#custom_progress'
+  end
+
+  it "generates ajax link hash" do
+    test_link = ajax_link('test link', "http://test.com", @html_options, @target, insert_method: @insert_method, empty_on_success: @empty_on_success, http_method: @http_method, no_mouse_click: @no_mouse_click, progress_target: @progress_target, progress_color: @progress_color)
+    test_link.must_match "data-ajax-link="
+    test_link.must_match(/class=.test_class./)
+    test_link.must_match "data-ajax-target=\"#{@target}\""
+    test_link.must_match "data-insert-method=\"#{@insert_method}\""
+    test_link.must_match "data-empty-on-success=\"#{@empty_on_success}\""
+    test_link.must_match "data-ajax-method=\"#{@http_method}\""
+    test_link.must_match "data-no-mouse-click=\"#{@no_mouse_click}\""
+    test_link.must_match "data-progress-target=\"#{@progress_target}\""
+    test_link.must_match "data-progress-color=\"#{@progress_color}\""
+  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.must_match "data-ajax-link-now="
+    test_link.must_match(/class=.test_class./)
+    test_link.must_match "data-ajax-target=\"#{@target}\""
+    test_link.must_match "data-insert-method=\"#{@insert_method}\""
+    test_link.must_match "data-empty-on-success=\"#{@empty_on_success}\""
+    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}\""
   end
+
+  it "generates a delete link" do
+    test_link = ajax_delete('test link', "http://test.com", @html_options, @target, replace_response: @replace_response, no_confirm: @no_confirm, custom_progress: @custom_progress,  no_mouse_click: @no_mouse_click)
+    test_link.must_match "data-ajax-delete="
+    test_link.must_match(/class=.test_class./)
+    test_link.must_match "data-ajax-target=\"#{@target}\""
+    test_link.must_match "data-replace-response=\"#{@replace_response}\""
+    test_link.must_match "data-no-confirm=\"#{@no_confirm}\""
+    test_link.must_match "data-custom-progress=\"#{@custom_progress}\""
+    test_link.must_match "data-no-mouse-click=\"#{@no_mouse_click}\""
+  end
+
+  it "generates ajax form hash" do
+    form_hash = ajax_form_hash(@target, error_target: @error_target, insert_method: @insert_method, empty_on_success: @empty_on_success, no_mouse_click: @no_mouse_click, progress_target: @progress_target, progress_color: @progress_color)
+    form_hash['data-ajax-form'].must_equal true
+    form_hash['data-ajax-target'].must_equal @target
+    form_hash['data-error-target'].must_equal @error_target
+    form_hash['data-insert-method'].must_equal @insert_method
+    form_hash['data-empty-on-success'].must_equal @empty_on_success
+    form_hash['data-no-mouse-click'].must_equal @no_mouse_click
+    form_hash['data-progress-target'].must_equal @progress_target
+    form_hash['data-progress-color'].must_equal @progress_color
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.15.8
+  version: 0.15.9
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
@@ -44,6 +44,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: minitest-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: 'A Rails library that makes web apps lively while keeping all the logic
   on the server. '
 email: