lazy_high_charts 1.0.9 → 1.1.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
+  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
 
   Nov 30,2010
 * dumped to gem 0.0.1
@@ -10,7 +16,6 @@
   Sep 14,2010
 * update codebase to support rails3.0 and rspec2
 
-
   Oct 8,2010
 * update rake.it works now!
 

data/README.md

@@ -1,13 +1,24 @@
 LazyHighCharts
 =======
-LazyHighCharts is Rails 3.x Gem for displaying Highcharts graphs. 
+LazyHighCharts is Rails 2.x/3.x Gem for displaying Highcharts graphs. 
   
 Compatibility:
-lazy_high_charts 1.x is only compatible with Rails 3.x
+lazy_high_charts 1.x is compatible with Rails 2.x/3.x
 
-Current Version: 1.0.9
 Usage
 =======
+ About javascript Assets notes:
+ for Rails 2.x
+ 1.you need manually put jquery/highcharts js to public/javascript
+ 2.modify your layout html
+ Sample Code:
+ <%= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"  %>
+ <%= javascript_include_tag :high_charts  %>
+ 3. add gem name in your config/environment.rb
+	config.gem "lazy_high_charts"
+ 4.done!
+
+ For Rails 3.x
  In your Gemfile, add this line:
 	gem 'lazy_high_charts'
 
@@ -40,10 +51,7 @@ Usage
 
   Usage in layout:
       
-  <%= javascript_include_tag 'highcharts' %>
-  <!--[if IE]>
-  <%= javascript_include_tag 'excanvas.compiled' %>
-  <![endif]-->
+  <%= javascript_include_tag :high_charts %>
       
   Usage in view:
   
@@ -51,7 +59,7 @@ Usage
     
   Passing formatting options in the view to the helper block , because all the helper options declared in the controller are converted in strict/valid json (quoted key);  so we need to extend the json object with some js.
   
-      <% high_chart("my_id", @h) do |c| %>
+      <%= high_chart("my_id", @h) do |c| %>
          	<%= "options.tooltip.formatter = function() { return '<b>HEY!!!'+ this.series.name +'</b><br/>'+ this.x +': '+ this.y +' units';}" %>
          	<%= "options.xAxis.labels.formatter = function() { return 'ho';}" %>
          	<%= "options.yAxis.labels.formatter = function() { return 'hey';}" %>

data/init.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
-require 'LazyHighCharts'
-require 'LazyHighCharts/high_charts_helper'
-ActionView::Helpers::AssetTagHelper.register_javascript_expansion :high_charts => ["highcharts"]
-ActionView::Base.send :include, LazyHighCharts::LayoutHelper
+# encoding: 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

data/lib/lazy_high_charts.rb

@@ -1,8 +1,7 @@
-require 'lazy_high_charts/high_chart'
-require 'lazy_high_charts/layout_helper.rb'
-
+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 railtie]) if defined?(::Rails::Railtie)
 
 module LazyHighCharts
-  # Your code goes here...
+
 end

data/lib/lazy_high_charts/high_chart.rb

@@ -9,7 +9,6 @@ module LazyHighCharts
 
       def initialize(canvas = nil, html_opts = {})
 
-        @collection_filter = nil
         self.tap do |high_chart|
           high_chart.data       ||= []
           high_chart.options    ||= {}
@@ -26,17 +25,17 @@ module LazyHighCharts
       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.x_axis(
+      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.y_axis({:title=> {:text=> 'Fruit units'}, :labels=>{:align=>'right'} })
+      self.yAxis({:title=> {:text=> 'Fruit units'}, :labels=>{:align=>'right'} })
       self.tooltip({ :enabled=>true })
       self.credits({:enabled => false})
-      self.plot_options({
+      self.plotOptions({
         :areaspline => {
         :fillOpacity => 0.5
       }

data/lib/lazy_high_charts/layout_helper.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'rails' unless defined? ::Rails
 
 module LazyHighCharts
   module LayoutHelper
@@ -11,41 +12,40 @@ module LazyHighCharts
       end
     end
 
-    def high_graph(placeholder, object, &block)
-      @options = {
-        "chart"       => object.options[:chart],
-        "title"       => object.options[:title],
-        "legend"      => object.options[:legend],
-        "xAxis"       => object.options[:xAxis],
-        "yAxis"       => object.options[:yAxis],
-        "credits"     => object.options[:credits],
-        "plotOptions" => object.options[:plotOptions],
-        "series"      => object.options[:series],
-        "subtitle"    => object.options[:subtitle]
-      }.reject{|k,v| v.nil?}
-
-      graph =<<-EOJS
-      <script type="text/javascript">
-      jQuery(function() {
-            var options = { #{format_options} };
-      #{capture(&block) if block_given?}
-            var chart = new Highcharts.Chart(options);
-        });
-        </script>
-      EOJS
 
+  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) &&  ::Rails.version >= '3.0'
       return raw(graph) 
-
-    end
-
-    def format_options
-      options = []
-      @options.each do |k,v|
-        options << "#{k}: #{v.to_json}"
-      end
-      options << "tooltip:{}"
-      options.join(', ')
+    else
+      return graph unless block_given?
+      concat graph
     end
+  end    
 
   end
 end

data/lib/lazy_high_charts/railtie.rb

@@ -1,12 +1,19 @@
-# encoding: utf-8
+require 'lazy_high_charts'
+require 'lazy_high_charts/layout_helper'
+require 'rails'
 
 module LazyHighCharts
-  # @private
-  class Railtie < Rails::Railtie
-    initializer 'lazy_high_charts.initialize' do
-      ActiveSupport.on_load(:action_view) do
-        include LazyHighCharts::LayoutHelper
+
+    class Railtie < ::Rails::Railtie
+      config.before_configuration do
+        config.action_view.javascript_expansions[:high_charts] = %w(highcharts)
+      end
+
+      initializer 'lazy_high_charts.initialize' do
+        ActiveSupport.on_load(:action_view) do
+          include LazyHighCharts::LayoutHelper
+        end
       end
     end
-  end
-end
+    
+end

data/lib/lazy_high_charts/version.rb

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

data/rails/init.rb

@@ -1,2 +1,2 @@
 # encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

data/spec/high_chart_spec.rb

@@ -32,7 +32,7 @@ describe "HighChart" do
        LazyHighCharts::HighChart.new.options.should == {
          :subtitle=>{}, 
          :chart=>{:renderTo=>nil, :defaultSeriesType=>"areaspline"}, 
-         :plot_options=>{:areaspline=>{:fillOpacity=>0.5}}, 
+         :plotOptions=>{:areaspline=>{:fillOpacity=>0.5}}, 
          :legend=>{
            :borderWidth=>1, 
            :backgroundColor=>"#FFFFFF", 
@@ -41,11 +41,11 @@ describe "HighChart" do
              :left=>"150px", :position=>"absolute", :bottom=>"auto"}
              }, 
              :tooltip=>{:enabled=>true}, 
-             :x_axis=>{
+             :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}}, 
-               :y_axis=>{:title=>{:text=>"Fruit units"}, 
+               :yAxis=>{:title=>{:text=>"Fruit units"}, 
                :labels=>{:align=>"right"}}, 
                :title=>{:text=>"example test title from highcharts gem"}, 
                :credits=>{:enabled=>false}
@@ -76,11 +76,11 @@ describe "HighChart" do
           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"]
       end
       chart.data.should ==  [{:name=>"John", :data=>[3, 20]}, {:name=>"Jane", :data=>[1, 3]}]
       chart.options[:legend][:layout].should == "horizontal"
-      chart.options[:x_axis][:categories].should == ["uno" ,"dos" , "tres" , "cuatro"]
+      chart.options[:xAxis][:categories].should == ["uno" ,"dos" , "tres" , "cuatro"]
       chart.options[:chart][:defaultSeriesType].should == "area"
       chart.options[:chart][:inverted].should == true
     end
@@ -91,12 +91,12 @@ describe "HighChart" do
           f.series(:name=>'Jane', :data=>[1, 3] )        
           f.title({ :text=>"example test title from controller"})
           # without overriding 
-          f.x_axis(:categories => ["uno" ,"dos" , "tres" , "cuatro"] , :labels=>{:rotation=>-45 , :align => 'right'})
+          f.xAxis(:categories => ["uno" ,"dos" , "tres" , "cuatro"] , :labels=>{:rotation=>-45 , :align => 'right'})
           f.chart({:defaultSeriesType=>"spline" , :renderTo => "myRenderArea" , :inverted => true})
       end
-      chart.options[:x_axis][:categories].should == ["uno" ,"dos" , "tres" , "cuatro"]      
-      chart.options[:x_axis][:labels][:rotation].should == -45     
-      chart.options[:x_axis][:labels][:align].should == "right"    
+      chart.options[:xAxis][:categories].should == ["uno" ,"dos" , "tres" , "cuatro"]      
+      chart.options[:xAxis][:labels][:rotation].should == -45     
+      chart.options[:xAxis][:labels][:align].should == "right"    
       chart.options[:chart][:defaultSeriesType].should == "spline"    
       chart.options[:chart][:renderTo].should == "myRenderArea"    
       chart.options[:chart][:inverted].should == true    
@@ -117,4 +117,4 @@ describe "HighChart" do
      
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
+require 'rails'
 #require 'action_mailer'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/lazy_high_charts'))

metadata

@@ -2,7 +2,7 @@
 name: lazy_high_charts
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.9
+  version: 1.1.1
 platform: ruby
 authors: 
 - Miguel Michelson Martinez
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +08:00
+date: 2011-03-20 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency