turboboost 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62f444668b545d3f748164b0a7ad8d0f6ddce5f
-  data.tar.gz: 380c2f65d317b85a0597b4fdd529c5bf5fe19511
+  metadata.gz: 1e54f385fd5a0fb3aeb452f91f9a84df07f86ea3
+  data.tar.gz: 010b5b416127a3ec3ebafa35b05004734ac71950
 SHA512:
-  metadata.gz: 11cff951ad36b13036fd84adf7cd87dbd8664c78b3e6b0572add842b6caab25b4f0c855ad047aa219bb0de37fc5f964f3e3c54c79e54497c7d53ded5d6742971
-  data.tar.gz: e8f6dbac731bab61e458176ce116b389a0f5252c6a1081aeb549ecf023dfaacbbd56d3b4906e6cc90487533d66c37dcb80cf99b516afc69dd896d3aeb30b083a
+  metadata.gz: 0164cd06e9387aa2b611245fbb8760f48821a406e24ecb68be18046194161d0f3234cf0cdcb28a76cb59b9ae759c54ecb4ed3868625d153b7fb7f4fc1efe4ea1
+  data.tar.gz: d735cfb64bc74194e124c0372ed83f9c3835fe311649f85c88f1cf5ba4a87b25c169669073415b6f4ead73871e59688312cdfdd8bcf68fccad02139df4df9333

data/Gemfile

@@ -6,4 +6,3 @@ gem 'mocha'
 gem 'turn'
 gem 'awesome_print'
 gem 'sqlite3'
-gem 'appraisal'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    turboboost (0.0.12)
+    turboboost (0.1.0)
       coffee-rails
       jquery-rails
       railties
@@ -30,8 +30,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.4.3)
-    appraisal (2.0.1)
-      activesupport (>= 3.2.21)
+    appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
@@ -55,13 +54,13 @@ GEM
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     metaclass (0.0.1)
-    mini_portile (0.6.2)
+    mini_portile2 (2.1.0)
     minitest (5.7.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -92,7 +91,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 2.1)
   awesome_print
   bundler (~> 1.3)
   mocha
@@ -100,3 +99,6 @@ DEPENDENCIES
   sqlite3
   turboboost!
   turn
+
+BUNDLED WITH
+   1.13.2

data/README.md

@@ -1,6 +1,6 @@
 ## Turboboost ##
 
-Turboboost extends the power of Turbolinks into the forms of your Rails app and provides additional convenient AJAX handlers for forms and links. It aims to be a seemless and logical addition to any Turbolinks-rocking Rails 3.2/4+ app. Currently it depends on jQuery. The main features are:
+Turboboost extends the power of Turbolinks into the forms of your Rails app and provides additional convenient AJAX handlers for forms and links. It aims to be a seemless and logical addition to any Turbolinks-rocking Rails 3.2+ app. Currently it depends on jQuery. The main features are:
 
 * Form response redirection is handled by Turbolinks.
 * Customizable success and error handling through registered JavaScript, with support for Rails' Flash and optional error rendering built-in.

data/app/assets/javascripts/turboboost/turboboost.js.coffee

@@ -7,11 +7,14 @@ turboboostable = "[data-turboboost]"
 errID = "#error_explanation"
 errTemplate = (errors) ->
   "<ul><li>#{$.makeArray(errors).join('</li><li>')}</li></ul>"
+formProcessingClass = 'turboboost-form-processing'
 
 enableForm = ($form) ->
+  $form.removeClass(formProcessingClass)
   $form.find("[type='submit']").removeAttr('disabled').data('turboboostDisabled', false)
 
 disableForm = ($form) ->
+  $form.addClass(formProcessingClass)
   $form.find("[type='submit']").attr('disabled', 'disabled').data('turboboostDisabled', true)
 
 tryJSONParse = (str) ->
@@ -46,8 +49,9 @@ turboboostFormError = (e, errors) ->
 turboboostComplete = (e, resp) ->
   $el = $(@)
   isForm = @nodeName is "FORM"
+  status = parseInt(resp.status)
 
-  if 200 <= resp.status < 300
+  if 200 <= status < 300
     $el.trigger "turboboost:success", tryJSONParse resp.getResponseHeader('X-Flash')
     $el.find(errID).remove() if Turboboost.insertErrors and isForm
     if (location = resp.getResponseHeader('Location')) and !$el.attr('data-no-turboboost-redirect')
@@ -58,13 +62,13 @@ turboboostComplete = (e, resp) ->
     else
       enableForm $el if isForm and Turboboost.handleFormDisabling
       $inserted = maybeInsertSuccessResponseBody(resp)
-  else if 400 <= resp.status  < 600
+  else if 400 <= status  < 600
     enableForm $el if isForm and Turboboost.handleFormDisabling
     $el.trigger "turboboost:error", resp.responseText
 
   if $.contains(document.documentElement, $el[0])
     $el.trigger "turboboost:complete"
-  else
+  else if $inserted
     $inserted.trigger "turboboost:complete"
 
 turboboostBeforeSend = (e, xhr, settings) ->
@@ -72,7 +76,7 @@ turboboostBeforeSend = (e, xhr, settings) ->
   isForm = @nodeName is "FORM"
   return e.stopPropagation() unless isForm
   $el = $(@)
-  disableForm $el if Turboboost.handleFormDisabling
+  disableForm $el if isForm and Turboboost.handleFormDisabling
   if settings.type is "GET" and !$el.attr('data-no-turboboost-redirect')
     Turbolinks.visit [@action, $el.serialize()].join("?")
     return false
@@ -101,7 +105,7 @@ maybeInsertSuccessResponseBody = (resp) ->
 
 maybeReenableForms = ->
   return unless Turboboost.handleFormDisabling
-  $("form#{turboboostable} input[type='submit']").each ->
+  $("form#{turboboostable} [type='submit']").each ->
     enableForm $(@).closest('form') if $(@).data('turboboostDisabled')
 
 $(document)

data/gemfiles/rails_3_2.gemfile

@@ -6,7 +6,6 @@ gem "mocha"
 gem "turn"
 gem "awesome_print"
 gem "sqlite3"
-gem "appraisal"
 gem "rails", "~> 3.2.21"
 gem "test-unit"
 gem "strong_parameters"

data/gemfiles/rails_4_0.gemfile

@@ -6,7 +6,6 @@ gem "mocha"
 gem "turn"
 gem "awesome_print"
 gem "sqlite3"
-gem "appraisal"
 gem "rails", "~> 4.0.13"
 
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -6,7 +6,6 @@ gem "mocha"
 gem "turn"
 gem "awesome_print"
 gem "sqlite3"
-gem "appraisal"
 gem "rails", "~> 4.1.9"
 
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -6,7 +6,6 @@ gem "mocha"
 gem "turn"
 gem "awesome_print"
 gem "sqlite3"
-gem "appraisal"
 gem "rails", "~> 4.2.0"
 gem "responders", "~> 2.0"
 

data/lib/turboboost.rb

@@ -5,7 +5,7 @@ require 'turboboost/version'
 module Turboboost
   class Engine < Rails::Engine
     initializer :turboboost do
-      ActionView::Base.send :include, Turboboost::FormHelper
+      ActionView::Base.send :prepend, Turboboost::FormHelper
     end
   end
 end

data/lib/turboboost/form_helper.rb

@@ -1,35 +1,25 @@
 module Turboboost
-  # borrowed from - https://github.com/fs/turboforms/blob/master/lib/turboforms.rb
   module FormHelper
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :form_for, :data_turboboost
-      alias_method_chain :form_tag, :data_turboboost
-    end
-
-    def form_for_with_data_turboboost(record_or_name_or_array, *args, &proc)
+    def form_for(record_or_name_or_array, *args, &proc)
       options = args.extract_options!
-
       if options.key?(:turboboost) && options.delete(:turboboost)
         options[:html] ||= {}
         options[:html]['data-turboboost'] = true
         options[:remote] = true
       end
-
-      form_for_without_data_turboboost(record_or_name_or_array, *(args << options), &proc)
+      super(record_or_name_or_array, *(args << options), &proc)
     end
 
-    def form_tag_with_data_turboboost(record_or_name_or_array, *args, &proc)
+    def form_tag(url_for_options = {}, *args, &proc)
       options = args.extract_options!
-
       if options.key?(:turboboost) && options.delete(:turboboost)
         options[:data] ||= {}
         options[:data]['turboboost'] = true
         options[:remote] = true
       end
-
-      form_tag_without_data_turboboost(record_or_name_or_array, *(args << options), &proc)
+      super(url_for_options, *(args << options), &proc)
     end
 
     def convert_options_to_data_attributes(options, html_options)

data/lib/turboboost/version.rb

@@ -1,3 +1,3 @@
 module Turboboost
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/turboboost.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'appraisal', '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turboboost
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Talbott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Enhanced AJAX handling for Rails apps.
 email:
 - justin@waymondo.com
@@ -148,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Turboboost extends the power of Turbolinks into the forms of your Rails app