chartify 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99adce276ba3286967a95fb4e69945856a37d36e
-  data.tar.gz: cd16d06e9a0c70b42fa6296fb17dac5879d12d25
+  metadata.gz: 1a84aaa269508d4800411f45b4bc9fc32e4afe96
+  data.tar.gz: dc1a5b2d9870c4f6c8e34c9d54761ab420532783
 SHA512:
-  metadata.gz: 6636b438419a0e2b0fdc1b2b1ad33e6848ff2446414a2a79ad3b6949812d2bb64b1e37266f885894b985aac322e6e8c64ee876628325b7750c146fb0878b3b9c
-  data.tar.gz: 22bef703c2f0fac5dc28bef9c9e9a5120b733e94b8160850ae7a9eeb0e1848fbd18cbf9f89402063feae75cfc4614a046d91bad9d8002774612f0665fada6ecf
+  metadata.gz: e95056a8fb0daa61d68e3342214f0e5dd9c13e535059d76c0700e9cda84434f8f0960b0b436c4e614a84fac38720d4e880734b6824e9408148a86623c0310d20
+  data.tar.gz: 1f24b86302ceea18ae5191b96b318f38dc518f2b806d3c65f9963385624060a2249f1a2df5b6496a501786bbd53a3786e78757ebab3c057cb9f08a74818201c1

data/lib/chartify.rb

@@ -11,6 +11,20 @@ module Chartify
 
   configure do |config|
     config.web_api_name = :google_chart
+    config.image_theme = {
+        :colors => [
+            '#3366CC', # blue
+            '#DC3912', # red
+            '#FF9900', # yellow
+            '#109618', # green
+            '#990099', # dk purple
+            '#0099C6', # sky
+            '#DD4477' # grey
+        ],
+        :marker_color => '#aea9a9', # Grey
+        :font_color => '#666666',
+        :background_colors => '#FFFFFF'
+    }
 
     config.web do |wc|
       wc.background_color = '#FFFFFF'

data/lib/chartify/area_chart.rb

@@ -14,7 +14,7 @@ module Chartify
   class AreaChart < ChartBase
     def to_blob
       raise 'Need to specify label_column' unless label_column.present?
-      g = prepare_gruff(:area)
+      g = instantiate_gruff(:area)
 
       columns.each do |column|
         if column.kind_of?(Array)

data/lib/chartify/bar_chart.rb

@@ -5,7 +5,7 @@ module Chartify
   class BarChart < ChartBase
     def to_blob
       raise 'Need to specify label_column' unless label_column.present?
-      g = prepare_gruff(:side_bar)
+      g = instantiate_gruff(:side_bar)
 
       columns.each do |column|
         if column.kind_of?(Array)

data/lib/chartify/chart_base.rb

@@ -18,10 +18,8 @@ module Chartify
     end
 
     def render_chart(html_dom_id, options = {})
-      api_name = options[:web_api_name] || config.web_api_name.to_s
-      class_name = self.class.name.split("::")[1]
-      load "chartify/web_chart/#{api_name}/#{class_name.underscore}.rb"
-      chart = "Chartify::WebChart::#{api_name.camelize}::#{class_name}".constantize.new
+      api_name = fetch_api_name(options)
+      chart = instantiate_chart(api_name)
       chart.data, chart.columns, chart.label_column = self.data, self.columns, self.label_column
       html = <<-HTML
       <script type="application/javascript" class="chart_script">
@@ -36,13 +34,23 @@ module Chartify
     end
 
     protected
+    def instantiate_chart(api_name)
+      class_name = self.class.name.split("::")[1]
+      load "chartify/web_chart/#{api_name}/#{class_name.underscore}.rb"
+      "Chartify::WebChart::#{api_name.camelize}::#{class_name}".constantize.new
+    end
+
+    def fetch_api_name(options)
+      options[:web_api_name] || config.web_api_name.to_s
+    end
+
     # @param type - type of the Gruff. It's a factory to create the appropriate
-    def prepare_gruff(type)
+    def instantiate_gruff(type)
       chart_type = type.to_s.classify
       chart_type = "Gruff::#{chart_type}".constantize
 
       g = chart_type.new
-      g.theme = Chartify::Themes::GOOGLE_CHART
+      g.theme = config.image_theme
       g.title = self.title
       g
     end

data/lib/chartify/column_chart.rb

@@ -5,7 +5,7 @@ module Chartify
   class ColumnChart < ChartBase
     def to_blob
       raise 'Need to specify label_column' unless label_column.present?
-      g = prepare_gruff(:bar)
+      g = instantiate_gruff(:bar)
 
       columns.each do |column|
         if column.kind_of?(Array)

data/lib/chartify/config.rb

@@ -2,7 +2,8 @@ module Chartify
   class Configuration
     include ActiveSupport::Configurable
     config_accessor :web_api_name
-    config_accessor :chart
+    # config_accessor :chart
+    config_accessor :image_theme
 
     def web(&block)
       yield @web_config ||= Chartify::WebConfiguration.new

data/lib/chartify/line_chart.rb

@@ -15,7 +15,7 @@ module Chartify
   class LineChart < ChartBase
     def to_blob
       raise 'Need to specify label_column' unless label_column.present?
-      g = prepare_gruff(:line)
+      g = instantiate_gruff(:line)
 
       columns.each do |column|
         if column.kind_of?(Array)

data/lib/chartify/pie_chart.rb

@@ -16,7 +16,7 @@ module Chartify
     end
 
     def to_blob
-      g = prepare_gruff(:pie)
+      g = instantiate_gruff(:pie)
 
       data.each do |row|
         if row.kind_of?(Array)

data/lib/chartify/version.rb

@@ -1,3 +1,3 @@
 module Chartify
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/chartify/web_chart/google_chart/area_chart.rb

@@ -9,14 +9,11 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
-            function drawChart#{timestamp}() {
-              var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
-              var chart = new google.visualization.AreaChart(document.getElementById('#{html_dom_id}'));
-              chart.draw(data, #{chart_options.to_json});
-            }
+            var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
+            var chart = new google.visualization.AreaChart(document.getElementById('#{html_dom_id}'));
+            chart.draw(data, #{chart_options.to_json});
           JS
-          js.html_safe
+          wrap_in_function(js).html_safe
         end
       end
     end

data/lib/chartify/web_chart/google_chart/bar_chart.rb

@@ -9,14 +9,11 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
-            function drawChart#{timestamp}() {
-              var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
-              var chart = new google.visualization.BarChart(document.getElementById('#{html_dom_id}'));
-              chart.draw(data, #{chart_options.to_json});
-            }
+            var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
+            var chart = new google.visualization.BarChart(document.getElementById('#{html_dom_id}'));
+            chart.draw(data, #{chart_options.to_json});
           JS
-          js.html_safe
+          wrap_in_function(js).html_safe
         end
       end
     end

data/lib/chartify/web_chart/google_chart/column_chart.rb

@@ -9,14 +9,11 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
-            function drawChart#{timestamp}() {
-              var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
-              var chart = new google.visualization.ColumnChart(document.getElementById('#{html_dom_id}'));
-              chart.draw(data, #{chart_options.to_json});
-            }
+            var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
+            var chart = new google.visualization.ColumnChart(document.getElementById('#{html_dom_id}'));
+            chart.draw(data, #{chart_options.to_json});
           JS
-          js.html_safe
+          wrap_in_function(js).html_safe
         end
       end
     end

data/lib/chartify/web_chart/google_chart/google_chart_module.rb

@@ -35,6 +35,16 @@ module Chartify
         def include_js
           %q{<script type="text/javascript" src="https://www.google.com/jsapi"></script>}
         end
+
+        def wrap_in_function(code)
+          js = <<-JS
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
+              #{code}
+            }
+          JS
+          js.html_safe
+        end
       end
     end
   end

data/lib/chartify/web_chart/google_chart/line_chart.rb

@@ -9,14 +9,11 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
-            function drawChart#{timestamp}() {
-              var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
-              var chart = new google.visualization.LineChart(document.getElementById('#{html_dom_id}'));
-              chart.draw(data, #{chart_options.to_json});
-            }
+            var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
+            var chart = new google.visualization.LineChart(document.getElementById('#{html_dom_id}'));
+            chart.draw(data, #{chart_options.to_json});
           JS
-          js.html_safe
+          wrap_in_function(js).html_safe
         end
       end
     end

data/lib/chartify/web_chart/google_chart/pie_chart.rb

@@ -6,16 +6,6 @@ module Chartify
     module GoogleChart
       class PieChart < Chartify::PieChart
         include Chartify::WebChart::GoogleChart::GoogleChartModule
-
-        # Js data
-        # var data = google.visualization.arrayToDataTable([
-        #                                                      ['Task', 'Hours per Day'],
-        #                                                      ['Work',     11],
-        #                                                      ['Eat',      2],
-        #                                                      ['Commute',  2],
-        #                                                      ['Watch TV', 2],
-        #                                                      ['Sleep',    7]
-        #                                                  ]);
         def render(html_dom_id)
           datasets = data.collect do |column|
             if column.kind_of?(Array)
@@ -25,17 +15,19 @@ module Chartify
             end
             [title, val]
           end
-          datasets.insert 0, column_names
+          insert_title_row(datasets)
 
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
-            function drawChart#{timestamp}() {
-              var data = google.visualization.arrayToDataTable(#{datasets.to_json});
-              var chart = new google.visualization.PieChart(document.getElementById('#{html_dom_id}'));
-              chart.draw(data, #{chart_options.to_json});
-            }
+            var data = google.visualization.arrayToDataTable(#{datasets.to_json});
+            var chart = new google.visualization.PieChart(document.getElementById('#{html_dom_id}'));
+            chart.draw(data, #{chart_options.to_json});
           JS
-          js.html_safe
+          wrap_in_function(js).html_safe
+        end
+
+        private
+        def insert_title_row(datasets)
+          datasets.insert 0, column_names
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartify
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gruff
@@ -142,8 +142,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: A gem to manage online chart so that it can be exportable in image from
-  ruby code.
+description: |-
+  This gem wraps the data to render chart and then it draws those charts in the web
+                        and use the same data to render charts as images, which is often useful when you want to render the chart
+                        in pdf or attach it to emails
 email:
 - ashrafuzzaman.g2@gmail.com
 executables: []
@@ -172,7 +174,8 @@ files:
 - lib/chartify/web_chart/google_chart/pie_chart.rb
 - lib/tasks/chartify_tasks.rake
 homepage: https://github.com/ashrafuzzaman/chartify
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -193,6 +196,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A gem to manage online chart so that it can be exportable in image from ruby
-  code.
+summary: A gem to manage charts in the web and to make it exportable in image from
+  ruby code.
 test_files: []