lazy_high_charts 1.0.8 → 1.0.9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+  Mar 19,2011
+* refactor my gem code,dumped to 1.0.9
+
   Nov 30,2010
 * dumped to gem 0.0.1
   

data/README.md

@@ -1,19 +1,11 @@
 LazyHighCharts
 =======
-= update(Dec 4,2010)
-bumping version to gem 0.0.3
-
-- Test Environment
-  ruby 1.9.2p0 (2010-08-18 revision 29036) [x86_64-darwin10.4.0]
-  rspec 2.0
-  rails 3.0.1
-- Result(autotest)
-Finished in 0.01502 seconds
-9 examples, 0 failures
+LazyHighCharts is Rails 3.x Gem for displaying Highcharts graphs. 
   
-Attention:
-this gem Only support Rails 3.x
+Compatibility:
+lazy_high_charts 1.x is only compatible with Rails 3.x
 
+Current Version: 1.0.9
 Usage
 =======
  In your Gemfile, add this line:
@@ -74,10 +66,9 @@ Usage
 
 
     
-h2.Contributors
-LayHighCharts gem is maintained by "Deshi Xiao":https://github.com/xiaods
-
-@git shortlog -n -s --no-merges@
-
+Contributors
+=======
+	LazyHighCharts gem is maintained by "Deshi Xiao":https://github.com/xiaods
+  git shortlog -n -s --no-merges
 
 Copyright (c) 2010 Miguel Michelson Martinez, released under the MIT license

data/lazy_high_charts.gemspec

@@ -17,16 +17,16 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "CHANGELOG.md" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = "~> 1.3"
 
   s.add_dependency "bundler", "~> 1.0"
 
-  s.add_development_dependency "webrat", "~> 0.7"
+  s.add_development_dependency "webrat","~> 0.7"
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "rails", "~> 3.0"
 
   s.description = <<-DESC
-    Lazy_high_charts provides a Rails interface for utilize highcharts to displaying graphs.
+    lazy_high_charts is a Rails 3.x gem for displaying Highcharts graphs.
   DESC
 
   s.files = `git ls-files`.split("\n")

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

@@ -1,7 +1,6 @@
 module LazyHighCharts
     class InstallGenerator < Rails::Generators::Base
       desc "This generator install highcharts javascripts"
-      @@version = "2.1.1"
       
       def install_highcharts
         say_status("installing", "Highcharts javascript (github HEAD)", :green)
@@ -11,4 +10,4 @@ module LazyHighCharts
       end
       
     end
-end
+end

data/lib/lazy_high_charts.rb

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

data/lib/lazy_high_charts/high_chart.rb

@@ -1,6 +1,5 @@
 module LazyHighCharts
   class HighChart
-    CANVAS_DEFAULT_HTML_OPTIONS = {:style => "height: 300px, width:615px" }
     SERIES_OPTIONS = %w(lines points bars shadowSize colors)
 
     attr_accessor :data, :options, :placeholder, :html_options
@@ -15,7 +14,7 @@ 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 = html_opts
           high_chart.canvas       = canvas if canvas
           yield high_chart if block_given?
         end

data/lib/lazy_high_charts/layout_helper.rb

@@ -0,0 +1,51 @@
+# coding: utf-8
+
+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
+    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
+
+      return raw(graph) 
+
+    end
+
+    def format_options
+      options = []
+      @options.each do |k,v|
+        options << "#{k}: #{v.to_json}"
+      end
+      options << "tooltip:{}"
+      options.join(', ')
+    end
+
+  end
+end

data/lib/lazy_high_charts/railtie.rb

@@ -1,15 +1,12 @@
 # encoding: utf-8
 
-require 'lazy_high_charts'
-require 'lazy_high_charts/high_charts_helper.rb'
-
-require 'rails'
-
 module LazyHighCharts
+  # @private
   class Railtie < Rails::Railtie
-    initializer 'lazy_high_charts.initialize', :after => :after_initialize do
-      ActionView::Base.send :include, LazyHighCharts::LayoutHelper
-      ActionView::Base.send(:include, LazyHighCharts::LayoutHelper)
+    initializer 'lazy_high_charts.initialize' do
+      ActiveSupport.on_load(:action_view) do
+        include LazyHighCharts::LayoutHelper
+      end
     end
   end
 end

data/lib/lazy_high_charts/version.rb

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

data/spec/lazy_high_charts_spec.rb

@@ -1,9 +1,8 @@
 # coding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
-require 'pp'
 
-describe HighChartsHelper do  
-  include HighChartsHelper
+describe LazyHighCharts::LayoutHelper do  
+  include LazyHighCharts::LayoutHelper
 
   before(:each) do
     @class       = "stylin"
@@ -13,7 +12,7 @@ describe HighChartsHelper do
     @options     = "options"
   end
   
-  describe "high_chart_helper" do
+  describe "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')

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'action_controller'
 #require 'action_mailer'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/lazy_high_charts'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/lazy_high_charts/high_charts_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/lazy_high_charts/layout_helper'))
 
 require 'webrat'
 require 'rspec'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: lazy_high_charts
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 8
-  version: 1.0.8
+  prerelease: 
+  version: 1.0.9
 platform: ruby
 authors: 
 - Miguel Michelson Martinez
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +08:00
+date: 2011-03-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +22,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -40,9 +33,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
         version: "0.7"
   type: :development
   version_requirements: *id002
@@ -54,9 +44,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id003
@@ -68,13 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :development
   version_requirements: *id004
-description: "    Lazy_high_charts provides a Rails interface for utilize highcharts to displaying graphs.\n"
+description: "    lazy_high_charts is a Rails 3.x gem for displaying Highcharts graphs.\n"
 email: 
 - miguelmichelson@gmail.com
 - xiaods@gmail.com
@@ -99,7 +83,7 @@ files:
 - lib/generators/lazy_high_charts/install/install_generator.rb
 - lib/lazy_high_charts.rb
 - lib/lazy_high_charts/high_chart.rb
-- lib/lazy_high_charts/high_charts_helper.rb
+- lib/lazy_high_charts/layout_helper.rb
 - lib/lazy_high_charts/railtie.rb
 - lib/lazy_high_charts/version.rb
 - rails/init.rb
@@ -120,23 +104,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      version: "1.3"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: lazy higcharts plugin for rails

data/lib/lazy_high_charts/high_charts_helper.rb

@@ -1,46 +0,0 @@
-# coding: utf-8
-
-module LazyHighCharts
-  module LayoutHelper
-    # ActiveSupport::JSON.unquote_hash_key_identifiers = false
-    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_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}
-                        };
-
-          // 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
-  end
-end
-