chartkick-remote 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0655801c196c86eb2b4df610851bd01cfe75824a
-  data.tar.gz: 53b374e3dcf082410e144bb944d0cd39dd22cabe
+  metadata.gz: d897dcbb67069a41ddad76a8828a6aa6e2fc8dda
+  data.tar.gz: dce74b0b5ec1594c91fbe7f342c41847b58bea7e
 SHA512:
-  metadata.gz: bf6ba0aa6def8bbbefbf3422aeb22a9d126b8a4bd6a93c9f1486d3622dfb5cff250baee8d292b890ddb1dd1b74ed8c437bfe740916bd5dfd679a58f3762f5d95
-  data.tar.gz: 43c8828817139754ba395074d24a92c1bd029b654dc2a058700a4d6971b2c50dbf63747fbe0385247949e7d3504b875053822710511f7c7fafdf78d4a0234b12
+  metadata.gz: 44d17923ceec8eaefeda18d35c763284426a9d58c67e718a002894857942727dc2108315ec24d0a63f76f32e5af9c8976867ed1bd3418ec2ff5a57b07d48d8c2
+  data.tar.gz: bff84fea3c14c40c9a29c1de7b30dedd699eaae154cd3cf3fc2ebdc49b63e2fa778fdfb47817b54847ac7ed5f55542e687cb14bb8b2f3d8408aad58526aa5768

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chartkick.gemspec
 gemspec
+
+eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

data/README.md

@@ -1,4 +1,4 @@
-# Chartkick Remote [![Travis CI Status](https://travis-ci.org/dontfidget/chartkick-remote.png?branch=master)](https://travis-ci.org/dontfidget/chartkick-remote) [![Code Climate](https://codeclimate.com/github/dontfidget/chartkick-remote.png)](https://codeclimate.com/github/dontfidget/chartkick-remote) [![Code Climate](https://codeclimate.com/github/dontfidget/chartkick-remote/coverage.png)](https://codeclimate.com/github/dontfidget/chartkick-remote)
+# Chartkick Remote [![Gem Version](https://badge.fury.io/rb/chartkick-remote.svg)](http://badge.fury.io/rb/chartkick-remote) [![Travis CI Status](https://travis-ci.org/dontfidget/chartkick-remote.png?branch=master)](https://travis-ci.org/dontfidget/chartkick-remote) [![Code Climate](https://codeclimate.com/github/dontfidget/chartkick-remote.png)](https://codeclimate.com/github/dontfidget/chartkick-remote) [![Code Climate](https://codeclimate.com/github/dontfidget/chartkick-remote/coverage.png)](https://codeclimate.com/github/dontfidget/chartkick-remote) [![Dependency Status](https://gemnasium.com/dontfidget/chartkick-remote.svg)](https://gemnasium.com/dontfidget/chartkick-remote)
 
 ## Usage
 
@@ -63,12 +63,22 @@ This gem works by *not* executing "remote" blocks when initially rendering your
 
 ## Handling *Many* Requests at Once
 
-Using this methodology, it's easy to write a page that makes many, many json requests, which may swamp your server and possibly even time out if you have a global `timeout` value set for your ajax requests.  @maccman's jquery.ajax.queue.coffee script provides a basic queueing transport layer for ajax requests which I've modified to provide an option to set the maximum number of requests that can be made in parallel (see https://gist.github.com/dontfidget/1ad9ab33971b64fe6fef).  If you include the javascript in this gist on your page, you can then specify the maximum number of allowable requests globally for your page as follows:
+Using this methodology, it's easy to write a page that makes many, many json requests, which may swamp your server and possibly even time out if you have a global `timeout` value set for your ajax requests.  `chartkick-remote` provides a javascript script, available as a rails asset, that can be used to limit the number of simultaneous assets on your page. 
+  
+You can include it by adding the following to your javascript manifest:
+ 
+ ```
+ //= require jquery.ajax.queue-concurrent
+ ```
+  
+If you include this javascript in this gist on your page, you can then specify the maximum number of allowable requests globally for your page as follows:
 
 ```javascript
   $.ajaxSetup({queue: true, queueMaxConcurrency: 2});
 ```
 
+This script is based on @maccman's jquery.ajax.queue.coffee script provides a basic queueing transport layer for ajax requests which I've modified to provide an option to set the maximum number of requests that can be made in parallel.  You can see the modifications with a link to the original at https://gist.github.com/dontfidget/1ad9ab33971b64fe6fef.  
+
 ## Standalone Mode (for debugging)
 
 Sometimes it's useful to be able to be able to debug a single chart at a time even though there may be several on the page.  Use the `standalone` option to add a link to each chart that opens the page in standalone mode, where only the single chart is shown.  

data/chartkick_remote.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 1.9'
 
+  spec.add_dependency "chartkick", '~> 1.2'
+  spec.add_dependency "railties", ">= 3.1"
+
   spec.add_development_dependency "bundler", '~> 1.3'
   spec.add_development_dependency "rake", '~> 10.3'
-  spec.add_development_dependency "chartkick", '~> 1.2'
   spec.add_development_dependency "activesupport", '~> 4.1'
   spec.add_development_dependency "rspec", '~> 3.0'
   spec.add_development_dependency "rspec-rails", '~> 3.0'
-  spec.add_development_dependency "pry", '~> 0'
-  spec.add_development_dependency "pry-doc", '~> 0'
   spec.add_development_dependency "travis-lint", '~> 1.8'
   spec.add_development_dependency "codeclimate-test-reporter", '~> 0.3'
   spec.add_development_dependency "rspec-html-matchers", '~> 0.6.1', '>= 0.6.1'

data/lib/assets/javascripts/jquery.ajax.queue-concurrent.coffee

@@ -0,0 +1,76 @@
+# from https://gist.github.com/dontfidget/1ad9ab33971b64fe6fef
+# derived from https://gist.github.com/maccman/5790509
+
+$ = jQuery
+
+queues  = {}
+
+queue = (name) ->
+  name = 'default' if name is true
+  queues[name] or= {entries: [], running: 0}
+
+next = (name, done) ->
+  list = queue(name)
+
+  if done
+    queue(name).running--
+
+  unless list.entries.length
+    return
+
+  [options, deferred] = list.entries[0]
+
+  if list.running >= (options.queueMaxConcurrency || 1)
+    return
+
+  list.entries.shift()
+
+  queue(name).running++
+
+  $.ajax(options)
+  .always(-> next(name, true))
+  .done(-> deferred.resolve(arguments...))
+  .fail(-> deferred.reject(arguments...))
+
+push = (name, options) ->
+  list = queue(name)
+  deferred = $.Deferred()
+
+  while options && list.entries.length >= options.queueMaxDepth
+    [overflowOptions, overflowDeferred] = list.entries.shift()
+    overflowDeferred.reject null, "queue overflow"
+
+  list.entries.push([options, deferred])
+
+  next(name)
+  deferred.promise()
+
+remove = (name, options) ->
+  list = queue(name)
+
+  for [value, _], i in list.entries when value is options
+    list.entries.splice(i, 1)
+    break
+
+$.ajaxTransport '+*', (options) ->
+  if options.queue
+    queuedOptions = $.extend({}, options)
+    queuedOptions.queue = false
+    queuedOptions.processData = false
+
+    send: (headers, complete) ->
+      push(options.queue, queuedOptions)
+      .done (data, textStatus, jqXHR) ->
+        complete(jqXHR.status,
+          jqXHR.statusText,
+          text: jqXHR.responseText,
+          jqXHR.getAllResponseHeaders())
+
+      .fail (jqXHR, textStatus, errorThrown) ->
+        complete(jqXHR.status,
+          jqXHR.statusText,
+          text: jqXHR.responseText,
+          jqXHR.getAllResponseHeaders())
+
+    abort: ->
+      remove(options.queue, queuedOptions)

data/lib/chartkick/remote.rb

@@ -1,5 +1,6 @@
 require 'chartkick/remote/helper'
 require 'chartkick/remote/remote'
+require 'chartkick/remote/engine' if defined?(Rails)
 
 ActiveSupport.on_load(:action_view) do
   include Chartkick::Remote::Helper

data/lib/chartkick/remote/engine.rb

@@ -0,0 +1,9 @@
+module Chartkick::Remote
+  class Engine < ::Rails::Engine
+
+    initializer "precompile", :group => :all do |app|
+      app.config.assets.precompile << 'jquery.ajax.queue-concurrent.js'
+    end
+
+  end
+end

data/lib/chartkick/remote/helper.rb

@@ -34,22 +34,23 @@ module Chartkick::Remote
         data_source = block.call
       end
 
+      standalone = options.delete(:standalone)
+
       result = send(:"#{type}_without_remote", data_source, options)
 
-      result = apply_standalone_mode(result) if options.delete(:standalone) && remote
+      result = apply_standalone_mode(result, @remote_chart_id) if standalone && remote
 
       result
     end
 
-    def apply_standalone_mode(result)
+    def apply_standalone_mode(result, chart_id)
       standalone_enabled = params[:_chartkick_remote_standalone].present?
-
-      skip = standalone_enabled && controller.params[:_chartkick_remote_chart_id].to_s != @remote_chart_id.to_s
+      skip = standalone_enabled && params[:_chartkick_remote_chart_id].to_s != chart_id.to_s
 
       if skip || !standalone_enabled
         result = '<div>Skipped by Standalone Mode</div>'.html_safe if standalone_enabled
         standalone_link = link_to 'Standalone',
-                                  url_for(params.merge(_chartkick_remote_chart_id: @remote_chart_id,
+                                  url_for(params.merge(_chartkick_remote_chart_id: chart_id,
                                                        _chartkick_remote_standalone: 1))
         result += standalone_link.html_safe
       elsif standalone_enabled && !skip

data/lib/chartkick/remote/version.rb

@@ -1,5 +1,5 @@
 module Chartkick
   module Remote
-    VERSION = "1.1.7"
+    VERSION = "1.2.0"
   end
 end

data/spec/spec_helper.rb

@@ -7,7 +7,11 @@ require 'action_controller'
 require 'rails/engine'
 require 'rspec/rails'
 require 'rspec-html-matchers'
-require 'pry'
+
+begin
+  require 'pry'
+rescue LoadError
+end
 
 module Rails
   def self.application

metadata

@@ -1,87 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: chartkick-remote
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew S. Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: chartkick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: chartkick
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -95,33 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +170,9 @@ files:
 - README.md
 - Rakefile
 - chartkick_remote.gemspec
+- lib/assets/javascripts/jquery.ajax.queue-concurrent.coffee
 - lib/chartkick/remote.rb
+- lib/chartkick/remote/engine.rb
 - lib/chartkick/remote/helper.rb
 - lib/chartkick/remote/remote.rb
 - lib/chartkick/remote/version.rb