chartkick 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5427cbb9ac6410183b5b75d934a86401f44edcf
-  data.tar.gz: ba02320221736a07ac93952fddfb9f2009de9116
+  metadata.gz: 887154ecd859185c3907f75ebb240aa9ee516704
+  data.tar.gz: 5bded63b803870a2b8a305aaddc0205aa8ec429d
 SHA512:
-  metadata.gz: 2b6fc819285107bf34dd80c1bde51a893be46ebf32bf4caed959c9e341ade192e9158fdb9d7946124349152e9e933f2b708fd803373bcd49a8db5f3214fd14ad
-  data.tar.gz: f6b741b21283906af8017217cb92e41a7abff4da91fe267d4d29ed467265516ae0808b00bfab23b658be8a6f6d0b535ff56eef129a7c1e597cbe8f8122a4375f
+  metadata.gz: e953c7d8cbeac11247fd16b62dc20913af5d692abfc622c91682d3b656d02233768c092b4fe0b1378d71826847b18114d2907d307e111f967238cdb918f5ad47
+  data.tar.gz: 15116b19bf888405dfeea20d08d39c436a9aeda8d6ffb6a37670c113c3e48d688db7b5d68ae9150594562e89469cfbe26992b7f53b354c8d83f30fa070182645

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 1.1.0
+
+- Added support for Padrino and Rails 2.3+
+
 ## 1.0.1
 
-Updated chartkick.js to v1.0.1
+- Updated chartkick.js to v1.0.1
 
 ## 1.0.0
 

data/README.md

@@ -4,7 +4,7 @@ Create beautiful Javascript charts with one line of Ruby. No more fighting with
 
 [See it in action](http://ankane.github.io/chartkick/)
 
-Works with Rails 3.1+ and most browsers (including IE 6)
+Works with Rails, Padrino and most browsers (including IE 6)
 
 :two_hearts: A perfect companion to [groupdate](http://ankane.github.io/groupdate/)
 
@@ -102,9 +102,7 @@ Add this line to your application's Gemfile:
 gem "chartkick"
 ```
 
-And add the javascript files to your views. `chartkick.js` runs as a Rails engine - no need to install it.
-
-**Note:** These files must be included **before** the helper methods.
+And add the javascript files to your views.  These files must be included **before** the helper methods.
 
 For Google Charts, use:
 
@@ -118,9 +116,27 @@ If you prefer Highcharts, use:
 <%= javascript_include_tag "path/to/highcharts.js", "chartkick" %>
 ```
 
+### For Rails 3.1+
+
+`chartkick.js` runs as a Rails engine - no need to install it.
+
+### For Rails 2.3 and 3.0
+
+You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
+
+### For Padrino
+
+You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
+
+In addition, you must specify `http` or `https` if you use Google Charts, since Padrino tries to append `.js` to protocol relative urls.
+
+```erb
+<%= javascript_include_tag "https://www.google.com/jsapi", "chartkick" %>
+```
+
 ## No Ruby? No Problem
 
-Check out [chartkick.js](https://github.com/ankane/chartkick.js).
+Check out [chartkick.js](https://github.com/ankane/chartkick.js)
 
 ## Credits
 

data/chartkick.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "railties", ">= 3.1"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/chartkick.rb

@@ -1,3 +1,4 @@
 require "chartkick/version"
-require "chartkick/engine"
 require "chartkick/helper"
+require "chartkick/rails" if defined?(Rails)
+require "chartkick/padrino" if defined?(Padrino)

data/lib/chartkick/helper.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module Chartkick
   module Helper
 
@@ -25,10 +27,10 @@ module Chartkick
       div_tag = content_tag :div, :id => element_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;" do
         concat "Loading..."
       end
-      script_tag = javascript_tag do
+      script_tag = content_tag :script do
         concat "new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});".html_safe
       end
-      div_tag + script_tag
+      div_tag + script_tag if div_tag # nil for padrino
     end
 
   end

data/lib/chartkick/padrino.rb

@@ -0,0 +1,3 @@
+class Padrino::Application
+  helpers Chartkick::Helper
+end

data/lib/chartkick/rails.rb

@@ -0,0 +1,5 @@
+if Rails.version >= "3.1"
+  require "chartkick/engine"
+else
+  ActionView::Base.send :include, Chartkick::Helper
+end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +56,8 @@ files:
 - lib/chartkick.rb
 - lib/chartkick/engine.rb
 - lib/chartkick/helper.rb
+- lib/chartkick/padrino.rb
+- lib/chartkick/rails.rb
 - lib/chartkick/version.rb
 homepage: ''
 licenses: