lazy_high_charts 1.1.7 → 1.2.0

data/CHANGELOG.md

@@ -1,8 +1,16 @@
+* 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.
+  2. David Biehl <lazylodr@gmail.com>
+    removing the window.onload function for AJAX requests
+
 * Jun 27, 2012
-  update assets path for rails 3.x
+    update assets path for rails 3.x
+
 * Jun 25, 2012
-  support inline javascript in click event on ruby runtime.
-  https://github.com/michelson/lazy_high_charts/issues/57
+    support inline javascript in click event on ruby runtime.
+    https://github.com/michelson/lazy_high_charts/issues/57
+
 * Jul 14, 2011
   add support rails 3.1 rc4 now
 

data/README.md

@@ -5,7 +5,8 @@ Easily displaying Highcharts graphs with gem style.
 
 ## Notice
 
-lasted version: 1.1.7
+lasted version: 1.2.0
+Thanks for Troy & David
 
 ### Installation instructions for Rails 3
 
@@ -36,7 +37,7 @@ About javascript Assets notes:
    Sample Code:
   ````
    <%= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"  %>
-   <%= javascript_include_tag :high_charts  %>
+   <%= javascript_include_tag :highcharts  %>
   ````
 
 3. add gem name in your config/environment.rb
@@ -45,17 +46,7 @@ config.gem "lazy_high_charts"
 ````
 4. Done!
 
-### For Rails 3.1
-In your Gemfile, add this line:
-````
-gem 'lazy_high_charts', '~> 1.1.5'
-````
-then execuate command:
-````
-Rails g lazy_high_charts:install
-````
-
-### Usage in Controller:
+### Demo Usage in Controller:
 ````
 @h = LazyHighCharts::HighChart.new('graph') do |f|
   f.options[:chart][:defaultSeriesType] = "area"
@@ -89,7 +80,7 @@ Overriding entire option:
 
 Usage in layout:
 ````
-<%= javascript_include_tag :high_charts %>
+<%= javascript_include_tag :highcharts %>
 ````
 
 Usage in view:

data/lib/lazy_high_charts/high_chart.rb

@@ -1,6 +1,6 @@
 module LazyHighCharts
   class HighChart
-    CANVAS_DEFAULT_HTML_OPTIONS = { :style => "height: 300px, width:615px" }
+    CANVAS_DEFAULT_HTML_OPTIONS = { :style => "height: 300px; width:615px" }
     SERIES_OPTIONS = %w(lines points bars shadowSize colors)
 
     attr_accessor :data, :options, :placeholder, :html_options

data/lib/lazy_high_charts/layout_helper.rb

@@ -27,22 +27,37 @@ module LazyHighCharts
       options_collection =  [ generate_json_from_hash(object.options) ]
       
       options_collection << %|"series": #{object.data.to_json}|
-      
-      graph =<<-EOJS
-      <script type="text/javascript">
-      (function() {
-        var onload = window.onload;
-        window.onload = function(){
-          if (typeof onload == "function") onload();
-          var options, chart;
-          options = { #{options_collection.join(',')} };
-          #{capture(&block) if block_given?}
-          chart = new Highcharts.#{type}(options);
-        };
-      })()
-      </script>
+
+      core_js =<<-EOJS
+        var options, chart;
+        options = { #{options_collection.join(',')} };
+        #{capture(&block) if block_given?}
+        chart = new Highcharts.#{type}(options);
       EOJS
 
+      if defined?(request) && request.respond_to?(:xhr?) && request.xhr?
+        graph =<<-EOJS
+        <script type="text/javascript">
+        (function() {
+          #{core_js}
+        })()
+        </script>
+        EOJS
+      else
+        graph =<<-EOJS
+        <script type="text/javascript">
+        (function() {
+          var onload = window.onload;
+          window.onload = function(){
+            if (typeof onload == "function") onload();
+            #{core_js}
+          };
+        })()
+        </script>
+        EOJS
+      end
+
+
       if defined?(raw)
         return raw(graph) 
       else
@@ -52,21 +67,29 @@ module LazyHighCharts
     end
     
     private
-    
-    def generate_json_from_hash hash  
+
+    def generate_json_from_hash hash
       hash.each_pair.map do |key, value|
         k = key.to_s.camelize.gsub!(/\b\w/) { $&.downcase }
-        if value.is_a? Hash
-          %|"#{k}": { #{generate_json_from_hash(value)} }|
-        else
-          if value.respond_to?(:js_code) && value.js_code?
-            %|"#{k}": #{value}|
-          else
-            %|"#{k}": #{value.to_json}|
-          end
-        end
+        %|"#{k}": #{generate_json_from_value value}|
       end.flatten.join(',')
     end
+
+    def generate_json_from_value value
+      if value.is_a? Hash
+        %|{ #{generate_json_from_hash value} }|
+      elsif value.is_a? Array
+        %|[ #{generate_json_from_array value} ]|
+      elsif value.respond_to?(:js_code) && value.js_code?
+        value
+      else
+        value.to_json
+      end
+    end
+
+    def generate_json_from_array array
+      array.map{|value| generate_json_from_value(value)}.join(",")
+    end
     
   end
 end

data/lib/lazy_high_charts/version.rb

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

data/spec/lazy_high_charts_spec.rb

@@ -102,4 +102,17 @@ describe HighChartsHelper do
     high_chart(@placeholder, chart).should match(/barFoo/) 
   end
 
+  # issue #62 .js_code setting ignored
+  # https://github.com/michelson/lazy_high_charts/issues/62
+  it "should allow js code in array && nest attributs" do
+    chart = LazyHighCharts::HighChart.new {|f|
+      f.yAxis([{
+        :labels => {
+                  :formatter => %|function() {return this.value + ' W';}|.js_code
+              }
+      }])
+    }
+    high_chart(@placeholder,chart).should match(/"formatter": function\(\) {return this.value \+ ' W';}/)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_high_charts
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,4 +89,3 @@ signing_key:
 specification_version: 3
 summary: lazy higcharts gem for rails
 test_files: []
-has_rdoc: