lazy_high_charts 1.2.0 → 1.2.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+* Aug 31, 2012
+  1. Correct highchart js location
+    [issue#74](https://github.com/michelson/lazy_high_charts/issues/74)
+  2. support series data add javascript event
+    [issue#73](https://github.com/michelson/lazy_high_charts/issues/73)
+  3. remove default html options.
+    [issue#72](https://github.com/michelson/lazy_high_charts/issues/72)
+
 * Aug 26, 2012
   1. Troy Anderson (laptop) <troy@tlainvestments.com>
     Added ability to supply an array of axes or other objects and still use .js_code within the array of hashes.

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "http://ruby.taobao.org"
 
 # Specify your gem's dependencies in lazy_high_charts.gemspec
 gemspec
@@ -7,4 +7,8 @@ group :test, :development do # This causes the plugins to NOT load
   gem 'webrat','~> 0.7'
   gem 'rspec', '~> 2.0'
   gem 'rails'
+  gem 'ZenTest'
+  gem 'autotest'
 end
+
+

data/README.md

@@ -4,9 +4,8 @@ Easily displaying Highcharts graphs with gem style.
 [![Build Status](https://secure.travis-ci.org/michelson/lazy_high_charts.png)](http://travis-ci.org/michelson/lazy_high_charts)
 
 ## Notice
-
-lasted version: 1.2.0
-Thanks for Troy & David
+latest version: 1.2.2
+[ChangeLog](https://github.com/xiaods/lazy_high_charts/blob/master/CHANGELOG.md)
 
 ### Installation instructions for Rails 3
 
@@ -17,7 +16,7 @@ To install it, you just need to add it to your Gemfile:
 And then run this to install the javascript files:
     rails g lazy_high_charts:install
 
-### Installing it as a plugin for rails 2.3.5 and rails 3
+### Installing it as a plugin for rails 2.3.x
 
     script/plugin install git://github.com/michelson/lazy_high_charts.git ##(for rails 2)
 
@@ -30,6 +29,12 @@ And then run this to install the javascript files:
 
 About javascript Assets notes:
 
+### For Rails 3.2.x
+1. add your highcart js to app/assets/javascripts/application.js
+````
+//= require highcharts
+````
+
 ### For Rails 2.x/3.0.x
  
 1. you need manually put jquery/highcharts js to public/javascript
@@ -129,10 +134,15 @@ We're open to any contribution. It has to be tested properly though.
 * Test your changes. We won't accept any untested contributions (except if they're not testable).
 * Create an [issue](https://github.com/michelson/lazy_high_charts/issues) with a link to your commits.
 
+Contributer List:
+* [Troy Anderson](https://github.com/troya2)
+* [David Biehl](https://github.com/lazylodr)
+
+Thanks for Troy & David
 ## Maintainers
-* Miguel Michelson Martinez ([github/michelson]https://github.com/michelson)
-* Deshi Xiao ([github/xiaods]https://github.com/xiaods)
+* Miguel Michelson Martinez [github/michelson](https://github.com/michelson)
+* Deshi Xiao [github/xiaods](https://github.com/xiaods)
 
 ## License
-* Copyright 2011 Deshi Xiao,MIT License
+* Copyright (c) 2011,2012 Deshi Xiao,released under the MIT license
 * Copyright (c) 2010 Miguel Michelson Martinez, released under the MIT license

data/lib/generators/lazy_high_charts/install/install_generator.rb

@@ -1,17 +1,17 @@
 module LazyHighCharts
-    class InstallGenerator < Rails::Generators::Base
-      desc "This generator install highcharts javascripts"
-      
-      def install_highcharts(opts = nil)
-        say_status("installing", "Highcharts javascript (github STOCK branch)", :green)
-        if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
-         get 'http://highcharts.com/js/highstock.js', 'vendor/assets/javascripts/highcharts.js'
-        else
-          get "https://raw.github.com/highslide-software/highcharts.com/stock/js/highcharts.src.js","public/javascripts/highcharts.js"
-        end
-              rescue OpenURI::HTTPError
-        say_status("warning", "could not find Highcharts javascript file", :yellow)
+  class InstallGenerator < Rails::Generators::Base
+    desc "This generator install highcharts javascripts"
+
+    def install_highcharts(opts = nil)
+      say_status("installing", "Highcharts javascript(code.highcharts.com/stock version)", :green)
+      if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
+        get "http://code.highcharts.com/stock/highstock.js", "vendor/assets/javascripts/highcharts.js"
+      else
+        get "http://code.highcharts.com/stock/highstock.js","public/javascripts/highcharts.js"
       end
-      
+    rescue OpenURI::HTTPError
+      say_status("warning", "could not find Highcharts javascript file", :yellow)
     end
+
+  end
 end

data/lib/lazy_high_charts/high_chart.rb

@@ -1,7 +1,6 @@
 module LazyHighCharts
   class HighChart
-    CANVAS_DEFAULT_HTML_OPTIONS = { :style => "height: 300px; width:615px" }
-    SERIES_OPTIONS = %w(lines points bars shadowSize colors)
+    SERIES_OPTIONS = %w(data dataParser dataURL index legendIndex name stack type xAxis yAxis)
 
     attr_accessor :data, :options, :placeholder, :html_options
     alias  :canvas :placeholder
@@ -14,14 +13,13 @@ module LazyHighCharts
         high_chart.data       ||= []
         high_chart.options    ||= {}
         high_chart.defaults_options
-        high_chart.html_options = html_opts.reverse_merge(CANVAS_DEFAULT_HTML_OPTIONS)
+        high_chart.html_options ||={}
         high_chart.canvas       = canvas if canvas
         yield high_chart if block_given?
       end
     end
 
     #	title:		legend: 		xAxis: 		yAxis: 		tooltip: 	credits:  :plotOptions
-
     def defaults_options
       self.title({ :text=>"example test title from highcharts gem"})
       self.legend({ :layout=>"vertical", :style=>{} }) 
@@ -30,7 +28,7 @@ module LazyHighCharts
       self.tooltip({ :enabled=>true })
       self.credits({ :enabled => false})
       self.plotOptions({ :areaspline => { } })
-      self.chart({ :defaultSeriesType=>"areaspline" , :renderTo => nil})
+      self.chart({ :defaultSeriesType=>"line" , :renderTo => nil})
       self.subtitle({})
     end
 
@@ -38,7 +36,6 @@ module LazyHighCharts
     # Pass other methods through to the javascript high_chart object.
     #
     # For instance: <tt>high_chart.grid(:color => "#699")</tt>
-    #
     def method_missing(meth, opts = {})
       merge_options meth, opts
     end
@@ -48,12 +45,9 @@ module LazyHighCharts
     #   data = [[0,5], [1,5], [2,5]]
     #   @high_chart.series :name=>'Updated', :data=>data
     #   @high_chart.series :name=>'Updated', :data=>[5, 1, 6, 1, 5, 4, 9]
-    #
     def series(opts = {})
       @data ||= []
-      if opts.blank?
-        @data << series_options.merge(:name => label, :data => d)
-      else
+      if not opts.empty?
         @data << opts.merge(:name => opts[:name], :data => opts[:data])
       end
     end

data/lib/lazy_high_charts/layout_helper.rb

@@ -25,8 +25,7 @@ module LazyHighCharts
 
     def build_html_output(type, placeholder, object, &block)
       options_collection =  [ generate_json_from_hash(object.options) ]
-      
-      options_collection << %|"series": #{object.data.to_json}|
+      options_collection << %|"series": [#{generate_json_from_array(object.data)}]|
 
       core_js =<<-EOJS
         var options, chart;
@@ -57,7 +56,6 @@ module LazyHighCharts
         EOJS
       end
 
-
       if defined?(raw)
         return raw(graph) 
       else

data/lib/lazy_high_charts/version.rb

@@ -1,3 +1,3 @@
 module LazyHighCharts
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

data/spec/high_chart_spec.rb

@@ -34,7 +34,7 @@ describe "HighChart" do
          :tooltip=>{:enabled=>true}, 
          :credits=>{:enabled=>false}, 
          :plotOptions=>{:areaspline=>{}}, 
-         :chart=>{:defaultSeriesType=>"areaspline", :renderTo=>nil}, 
+         :chart=>{:defaultSeriesType=>"line", :renderTo=>nil}, 
          :subtitle=>{}}
     end
      

data/spec/lazy_high_charts_spec.rb

@@ -12,10 +12,9 @@ describe HighChartsHelper do
     @options     = "options"
   end
 
-  describe "layout_helper" do
+  context "layout_helper" do
     it "should return a div with an id of high_chart object" do
-      hc = LazyHighCharts::HighChart.new("placeholder", :class => 'stylin')
-      high_chart(hc.placeholder, hc).should have_selector('div', :id => hc.placeholder, :class => 'stylin')
+      high_chart(@placeholder, @chart).should have_selector('div', :id => @placeholder)
     end
 
     it "should return a script" do
@@ -24,7 +23,7 @@ describe HighChartsHelper do
     end
   end
 
-  describe "high_chart_graph" do
+  context "high_chart_graph" do
     describe "ready function" do
       it "should be a javascript script" do
         high_chart(@placeholder, @chart).should have_selector('script', :type => 'text/javascript')
@@ -115,4 +114,21 @@ describe HighChartsHelper do
     high_chart(@placeholder,chart).should match(/"formatter": function\(\) {return this.value \+ ' W';}/)
   end
 
+  it "should support js_code in Individual data label for each point" do
+    chart = LazyHighCharts::HighChart.new {|f|
+       f.series(
+         :data => [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, {
+         :dataLabels => {:enabled => true,
+                         :align => 'left',
+                         :x => 10,
+                         :y => 4, 
+                         :style => {:fontWeight => 'bold'},
+                         :formatter => "function() { return this.x; }".js_code
+                        },
+        :y => 54.4}
+        ])
+    }
+    high_chart(@placeholder,chart).should match(/"formatter": function\(\) {\ return this.x;\ }/)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_high_charts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,6 @@ files:
 - lib/lazy_high_charts/layout_helper.rb
 - lib/lazy_high_charts/railtie.rb
 - lib/lazy_high_charts/version.rb
-- lib/tasks/charts_tasks.rake
 - rails/init.rb
 - spec/high_chart_spec.rb
 - spec/lazy_high_charts_spec.rb
@@ -89,3 +88,4 @@ signing_key:
 specification_version: 3
 summary: lazy higcharts gem for rails
 test_files: []
+has_rdoc: 

data/lib/tasks/charts_tasks.rake

@@ -1,23 +0,0 @@
-# desc "Explaining what the task does"
-# task :lazy_highcharts do
-#   # Task goes here
-# end
-namespace :lazy_high_charts do
-  desc 'Installs required swf in public/ and javascript files to the public/javascripts directory.'
-  task :install do
-    puts "Copying files..."
-    dir = "javascripts"
-    ["excanvas.compiled.js", "highcharts.js"].each do |js_file|
-    	dest_file = File.join(::Rails.root.to_s, "public", dir, js_file)
-    	src_file = File.join(::Rails.root.to_s + "/vendor/plugins/lazy_high_charts" , dir, js_file)
-    	FileUtils.cp_r(src_file, dest_file)
-    end
-    puts "Files copied - Installation complete!"
-  end
-  desc 'Removes the javascripts for the plugin.'
-  task :remove do
-    %w{excanvas.compiled.js highcharts.js}.collect { |f|
-      FileUtils.rm ::Rails.root.to_s + "/public/javascripts/" + f unless !f.nil?  }
-    puts "Files removed - Finished!"
-  end
-end