lazy_high_charts 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,15 +1,13 @@
-  Mar 20,2011
-* be compatible to rails 2.3 
-* dump to 1.1.1
-* Rename options[:x_axis] and options[:y_axis] to options[:xAxis] and options[:yAxis], and options[:plot_options] to options[:plotOptions] to make it consistent with highcharts.
- 
-  Mar 19,2011
-* refactor my gem code,dumped to 1.0.9
-* fix activeview load expansion tag
+* Jul 13, 2011
+  HighStock support
+  remove some defaults
+
+  Jan 31, 2011
+* backwards compatibility for rails 2.3.x in rendering callbacks options
 
   Nov 30,2010
 * dumped to gem 0.0.1
-  
+
   Sep 13,2010 
 * truely support rails 3.0(returning is deprecate function,use tap) deshi(xiaods@gmail.com) 
 

data/README.md

@@ -5,6 +5,16 @@ LazyHighCharts is Rails 2.x/3.x Gem for displaying Highcharts graphs.
 Compatibility:
 lazy_high_charts 1.x is compatible with Rails 2.x/3.x
 
+=======
+### plugin support for rails 2.3.5 and rails 3
+  
+    script/plugin install git://github.com/michelson/lazy_high_charts.git ##(for rails 2)
+  
+    rails plugin install git://github.com/michelson/lazy_high_charts.git  ##(for rails 3)
+
+#HighStocks
+  LazyHighCharts now compatible with beta HighStock, http://www.highcharts.com/stock/demo/
+
 Usage
 =======
  About javascript Assets notes:
@@ -37,7 +47,7 @@ Usage
           f.options[:chart][:defaultSeriesType] = "area"
           f.options[:chart][:inverted] = true
           f.options[:legend][:layout] = "horizontal"
-          f.options[:x_axis][:categories] = ["uno" ,"dos" , "tres" , "cuatro"]
+          f.options[:xAxis][:categories] = ["uno" ,"dos" , "tres" , "cuatro"]
      ......
 
   Overriding entire option: 
@@ -67,11 +77,21 @@ Usage
       
 
 
+
+   HighStock Support:
+
+     ##just call HighChart Helper this way:
+
+       <%= high_stock("my_id", @h) %>
+
+
   Option reference:
 
      http://www.highcharts.com/ref/
 
-
+  HighCharts License:
+  
+     http://www.highcharts.com/license
 
     
 Contributors

data/init.rb

@@ -1,6 +1,5 @@
-# encoding: utf-8
+# coding: utf-8
 require 'lazy_high_charts'
 require 'lazy_high_charts/layout_helper'
-
 ActionView::Helpers::AssetTagHelper.register_javascript_expansion :high_charts => ["highcharts"]
-ActionView::Base.send :include, LazyHighCharts::LayoutHelper
+ActionView::Base.send :include, LazyHighCharts::LayoutHelper

data/lazy_high_charts.gemspec

@@ -3,7 +3,6 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'lazy_high_charts/version'
 
-
 Gem::Specification.new do |s|
   s.name        = "lazy_high_charts"
   s.version     = LazyHighCharts::VERSION

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

@@ -2,9 +2,9 @@ module LazyHighCharts
     class InstallGenerator < Rails::Generators::Base
       desc "This generator install highcharts javascripts"
       
-      def install_highcharts
-        say_status("installing", "Highcharts javascript (github HEAD)", :green)
-        get "https://github.com/highslide-software/highcharts.com/raw/master/js/highcharts.src.js","public/javascripts/highcharts.js"
+      def install_highcharts(opts = nil)
+        say_status("installing", "Highcharts javascript (github STOCK branch)", :green)
+        get "https://raw.github.com/highslide-software/highcharts.com/stock/js/highcharts.src.js","public/javascripts/highcharts.js"
       rescue OpenURI::HTTPError
         say_status("warning", "could not find Highcharts javascript file", :yellow)
       end

data/lib/lazy_high_charts.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), *%w[lazy_high_charts high_chart])
-require File.join(File.dirname(__FILE__), *%w[lazy_high_charts layout_helper]) 
+require File.join(File.dirname(__FILE__), *%w[lazy_high_charts layout_helper])
 require File.join(File.dirname(__FILE__), *%w[lazy_high_charts railtie]) if defined?(::Rails::Railtie)
 
 module LazyHighCharts

data/lib/lazy_high_charts/high_chart.rb

@@ -6,41 +6,30 @@ module LazyHighCharts
     alias  :canvas :placeholder
     alias  :canvas= :placeholder=
 
+    def initialize(canvas = nil, html_opts = {})
 
-      def initialize(canvas = nil, html_opts = {})
-
-        self.tap do |high_chart|
-          high_chart.data       ||= []
-          high_chart.options    ||= {}
-          high_chart.defaults_options
-          high_chart.html_options = html_opts
-          high_chart.canvas       = canvas if canvas
-          yield high_chart if block_given?
-        end
+      @collection_filter = nil
+      self.tap do |high_chart|
+        high_chart.data       ||= []
+        high_chart.options    ||= {}
+        high_chart.defaults_options
+        high_chart.html_options = html_opts.reverse_merge(CANVAS_DEFAULT_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=>{:position=>'absolute', :bottom=>'auto', :left=>'150px', :top=>'150px'} , :borderWidth=> 1,
-                  :backgroundColor=>'#FFFFFF'}) 
-      self.xAxis(
-        {:categories=> ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
-          :plotBands=> [{ 
-        :from=> 6.0,:to=> 6.5,:color=> 'rgba(68, 170, 213, .2)'
-      }],
-      :labels=>{ :align=>'right',:rotation=>45 }
-      })
-      self.yAxis({:title=> {:text=> 'Fruit units'}, :labels=>{:align=>'right'} })
+      self.legend({ :layout=>"vertical", :style=>{} }) 
+      self.x_axis({})
+      self.y_axis({ :title=> {:text=> nil}, :labels=>{} })
       self.tooltip({ :enabled=>true })
-      self.credits({:enabled => false})
-      self.plotOptions({
-        :areaspline => {
-        :fillOpacity => 0.5
-      }
-      })
-      self.chart({:defaultSeriesType=>"areaspline" , :renderTo => nil})
+      self.credits({ :enabled => false})
+      self.plot_options({ :areaspline => { } })
+      self.chart({ :defaultSeriesType=>nil , :renderTo => nil})
       self.subtitle({})
     end
 
@@ -68,7 +57,8 @@ module LazyHighCharts
       end
     end
 
-    private
+private
+
     def series_options
       @options.reject {|k,v| SERIES_OPTIONS.include?(k.to_s) == false}
     end

data/lib/lazy_high_charts/layout_helper.rb

@@ -1,51 +1,86 @@
 # coding: utf-8
-require 'rails' unless defined? ::Rails
-
 module LazyHighCharts
   module LayoutHelper
-
-    def high_chart(placeholder, object, &block)
-      if object
-        object.html_options.merge!({:id=>placeholder})
-        object.options[:chart][:renderTo] = placeholder
-        high_graph(placeholder,object , &block).concat(content_tag("div","", object.html_options))
-      end
+    
+    def high_chart(placeholder, object  , &block)
+      object.html_options.merge!({:id=>placeholder})
+      object.options[:chart][:renderTo] = placeholder
+      high_graph(placeholder,object , &block).concat(content_tag("div","", object.html_options))
+    end
+    
+    def high_stock(placeholder, object  , &block)
+      object.html_options.merge!({:id=>placeholder})
+      object.options[:chart][:renderTo] = placeholder
+      high_graph_stock(placeholder,object , &block).concat(content_tag("div","", object.html_options))
     end
 
+    def high_graph(placeholder, object, &block)
+      graph =<<-EOJS
+      <script type="text/javascript">
+      jQuery(function() {
+            // 1. Define JSON options
+            var options = {
+                          chart: #{object.options[:chart].to_json},
+                                  title: #{object.options[:title].to_json},
+                                  legend: #{object.options[:legend].to_json},
+                                  xAxis: #{object.options[:x_axis].to_json},
+                                  yAxis: #{object.options[:y_axis].to_json},
+                                  tooltip:  #{object.options[:tooltip].to_json},
+                                  credits: #{object.options[:credits].to_json},
+                                  plotOptions: #{object.options[:plot_options].to_json},
+                                  series: #{object.data.to_json},
+                                  subtitle: #{object.options[:subtitle].to_json}
+                          };
 
-  def high_graph(placeholder, object, &block)
-    graph =<<-EOJS
-    <script type="text/javascript">
-    jQuery(function() {
-          // 1. Define JSON options
-          var options = {
-                        chart: #{object.options[:chart].to_json},
-                                title: #{object.options[:title].to_json},
-                                legend: #{object.options[:legend].to_json},
-                                xAxis: #{object.options[:xAxis].to_json},
-                                yAxis: #{object.options[:yAxis].to_json},
-                                tooltip:  #{object.options[:tooltip].to_json},
-                                credits: #{object.options[:credits].to_json},
-                                plotOptions: #{object.options[:plotOptions].to_json},
-                                series: #{object.data.to_json},
-                                subtitle: #{object.options[:subtitle].to_json}
-                        };
+            // 2. Add callbacks (non-JSON compliant)
+                                  #{capture(&block) if block_given?}
+            // 3. Build the chart
+            var chart = new Highcharts.Chart(options);
+        });
+        </script>
+      EOJS
+      
+      if defined?(raw)
+        return raw(graph) 
+      else
+        return graph
+      end
+      
+    end
 
-          // 2. Add callbacks (non-JSON compliant)
-          #{capture(&block) if block_given?}
-          // 3. Build the chart
-          var chart = new Highcharts.Chart(options);
-      });
-      </script>
-    EOJS
+    def high_graph_stock(placeholder, object, &block)
+      graph =<<-EOJS
+      <script type="text/javascript">
+      jQuery(function() {
+            // 1. Define JSON options
+            var options = {
+                          chart: #{object.options[:chart].to_json},
+                                  title: #{object.options[:title].to_json},
+                                  legend: #{object.options[:legend].to_json},
+                                  xAxis: #{object.options[:x_axis].to_json},
+                                  yAxis: #{object.options[:y_axis].to_json},
+                                  tooltip:  #{object.options[:tooltip].to_json},
+                                  credits: #{object.options[:credits].to_json},
+                                  plotOptions: #{object.options[:plot_options].to_json},
+                                  series: #{object.data.to_json},
+                                  subtitle: #{object.options[:subtitle].to_json}
+                          };
 
-    if defined?(raw) &&  ::Rails.version >= '3.0'
-      return raw(graph) 
-    else
-      return graph unless block_given?
-      concat graph
+            // 2. Add callbacks (non-JSON compliant)
+                                  #{capture(&block) if block_given?}
+            // 3. Build the chart
+            var chart = new Highcharts.StockChart(options);
+        });
+        </script>
+      EOJS
+      
+      if defined?(raw)
+        return raw(graph) 
+      else
+        return graph
+      end
+      
     end
-  end    
 
   end
 end

data/lib/lazy_high_charts/railtie.rb

@@ -1,5 +1,6 @@
 require 'lazy_high_charts'
-require 'lazy_high_charts/layout_helper'
+require 'lazy_high_charts/layout_helper.rb'
+
 require 'rails'
 
 module LazyHighCharts
@@ -16,4 +17,4 @@ module LazyHighCharts
       end
     end
     
-end
+end

data/lib/lazy_high_charts/version.rb

@@ -1,3 +1,3 @@
 module LazyHighCharts
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/high_chart_spec.rb

@@ -22,36 +22,25 @@ describe "HighChart" do
     it "should take an optional 'placeholder' argument" do
        LazyHighCharts::HighChart.new(@placeholder).placeholder.should == @placeholder
        LazyHighCharts::HighChart.new.placeholder.should == nil
-     end
+    end
      
     it "should take an optional html_options argument (defaulting to 300px height)" do
        LazyHighCharts::HighChart.new(@html_options).placeholder.should == @html_options
-     end
+    end
      
     it "should set options by default" do
        LazyHighCharts::HighChart.new.options.should == {
-         :subtitle=>{}, 
-         :chart=>{:renderTo=>nil, :defaultSeriesType=>"areaspline"}, 
-         :plotOptions=>{:areaspline=>{:fillOpacity=>0.5}}, 
-         :legend=>{
-           :borderWidth=>1, 
-           :backgroundColor=>"#FFFFFF", 
-           :layout=>"vertical", 
-           :style=>{:top=>"150px", 
-             :left=>"150px", :position=>"absolute", :bottom=>"auto"}
-             }, 
-             :tooltip=>{:enabled=>true}, 
-             :xAxis=>{
-               :categories=>["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], 
-               :plotBands=>[{:to=>6.5, :from=>6.0, :color=>"rgba(68, 170, 213, .2)"}], 
-               :labels=>{:align=>"right", :rotation=>45}}, 
-               :yAxis=>{:title=>{:text=>"Fruit units"}, 
-               :labels=>{:align=>"right"}}, 
-               :title=>{:text=>"example test title from highcharts gem"}, 
-               :credits=>{:enabled=>false}
-               }          
-           
-     end
+         :plot_options=>{:areaspline=>{}},
+         :x_axis=>{},
+         :chart=>{:defaultSeriesType=>nil, :renderTo=>nil},
+         :y_axis=>{:title=>{:text=>nil},
+         :labels=>{}},
+         :title=>{:text=>"example test title from highcharts gem"},
+         :subtitle=>{},
+         :credits=>{:enabled=>false},
+         :legend=>{:layout=>"vertical", :style=>{}},
+         :tooltip=>{:enabled=>true}}
+    end
      
     it "should set data empty by default" do
       LazyHighCharts::HighChart.new.data.should == []

data/spec/lazy_high_charts_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe LazyHighCharts::LayoutHelper do  
+describe HighChartsHelper do  
   include LazyHighCharts::LayoutHelper
 
   before(:each) do
@@ -43,8 +43,12 @@ describe LazyHighCharts::LayoutHelper do
       it "should set chart renderTo" do  
         high_chart(@placeholder, @chart).should match(/\"renderTo\":\"placeholder\"/)
       end
-
+      
+      it "should set Chart Stock" do
+        high_stock(@placeholder, @chart).should match(/var\s+chart\s+=\s+new\s+Highcharts.StockChart/)
+      end
     end
+
   end
   
 

metadata

@@ -2,7 +2,7 @@
 name: lazy_high_charts
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Miguel Michelson Martinez
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +08:00
+date: 2011-07-14 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: lazy higcharts plugin for rails