chartkick 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f267372477ee8ee07e58cfd1d8aa238f46852804
-  data.tar.gz: 9d72a752e72eb9cbc2cbdc5b9a78864f1d889e5b
+  metadata.gz: ca23cf2a483dec9fdb551db05a0026cebaffb654
+  data.tar.gz: 787086c3fa0287b611c5895c1fe5c43902347b05
 SHA512:
-  metadata.gz: 3dded5fa96105623a3e52cfc18c6ad73cca64698583388da68df0bf30a2239f0c382c724ffd2a95acdae2207c5bb5db357c8cf8cba54aba88e37a5475efe2fe5
-  data.tar.gz: a71a15aa62707face8f1a3f84ee826e923ba6f6a8f59582e00d921daf0e9fda4930405b0ec214cdd20f3a1a1e9bb2f4e4115db793e65cfad5f537b2d284c0adc
+  metadata.gz: 6a4dcfde3aeb6f4068cda287772d4d36d3280eb88bbc9b64172b8d678f34319ffc89ab55e50b7e88ae38bd3041e9f56c26826ca151ad6880c9cbefba6518d96c
+  data.tar.gz: 2a3ee87316b2aa0c8faef093a042c8a7126d13b8b96adacec8623cb331465e8b26dc10a22c5c2a0cf546c0236d3dbba0e2ea49d7517fc0d28a46e8706df0f370

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.2
+
+- Fixed `except` error when not using Rails
+
 ## 1.3.1
 
 - Fixed blank screen bug

data/lib/chartkick/helper.rb

@@ -37,16 +37,16 @@ module Chartkick
     def chartkick_chart(klass, data_source, options, &block)
       @chartkick_chart_id ||= 0
       options = chartkick_deep_merge(Chartkick.options, options)
-      element_id = options[:id] || "chart-#{@chartkick_chart_id += 1}"
-      height = options[:height] || "300px"
+      element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
+      height = options.delete(:height) || "300px"
       # content_for: nil must override default
       content_for = options.has_key?(:content_for) ? options.delete(:content_for) : Chartkick.content_for
 
-      html = (options[:html] || %[<div id="%{id}" style="height: %{height}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">Loading...</div>]) % {id: ERB::Util.html_escape(element_id), height: ERB::Util.html_escape(height)}
+      html = (options.delete(:html) || %[<div id="%{id}" style="height: %{height}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">Loading...</div>]) % {id: ERB::Util.html_escape(element_id), height: ERB::Util.html_escape(height)}
 
       js = <<JS
 <script type="text/javascript">
-  new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.except(:id, :height, :html).to_json});
+  new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.to_json});
 </script>
 JS
       if content_for

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler