chartify 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43f72a8d875e3c910d4cd10326ef74c24005324
-  data.tar.gz: b671a8ad3a32d9e81a1905b6ce4f21c1f0b7c232
+  metadata.gz: 2f3138a3aaabede918897180074d61740e25d180
+  data.tar.gz: ce208f1f14a6282a0d3294729395b03722279479
 SHA512:
-  metadata.gz: 570d6be7cfa5b7263bae328533095e3ed987fa7da7c7f51506a7c5433bb8f16d5b129d80d8d22e203afee17e19191778907a7c4a6765559b5a7a522ae92dce35
-  data.tar.gz: 48a44e598cc148a5639f8c21071cfc2dec09cb070eb2a2533164fa705113d2a99a94a4b58281266a45fae174292eef1455c3c176e1cf29cb6ccaa5684575ec7b
+  metadata.gz: b1e524cad2309a25152e16a6832204c444eb04018d93a0a14381cd710e0e5edd1665808db6c9063b66f03bbcd087cf507d32665feaf79c0b6eb8430dff09642d
+  data.tar.gz: f45202af7bd870ade18aaed0df653aec6c2d40f815f7ca98dffb1f509a657c0ef22455b7baa64a125b2864e088fb1aa82b8db4f479a940324bb0a9a411fc3e32

data/lib/chartify/area_chart.rb

@@ -0,0 +1,29 @@
+require 'chartify/chart_base'
+require 'gruff'
+
+# Example
+# -------
+# Chartify::Factory.build(:area) do |chart|
+#   chart.data = [{hours_remain: 100, estimated_hours_remain: 100, day: 3.days.ago.to_date},
+#              {hours_remain: 50, estimated_hours_remain: 45, day: 2.days.ago.to_date},
+#              {hours_remain: 5, estimated_hours_remain: 10, day: 1.days.ago.to_date}]
+#   chart.columns = {hours_remain: 'Hours remaining', estimated_hours_remain: 'Estimated hours remaining'}
+#   chart.label_column = :day
+# end
+module Chartify
+  class AreaChart < ChartBase
+    def to_blob
+      g = prepare_gruff(:area)
+
+      data.each do |row|
+        if row.kind_of?(Array)
+          key, val = row[0], row[1]
+        else
+          key, val = row.key, row.val
+        end
+        g.data(key, val)
+      end
+      g.to_blob
+    end
+  end
+end

data/lib/chartify/bar_chart.rb

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

data/lib/chartify/chart_base.rb

@@ -18,7 +18,7 @@ module Chartify
     end
 
     def render_chart(html_dom_id, options = {})
-      api_name = options[:web_api_name] || Chartify.config.web_api_name.to_s
+      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

data/lib/chartify/column_chart.rb

@@ -0,0 +1,29 @@
+require 'chartify/chart_base'
+require 'gruff'
+
+module Chartify
+  class ColumnChart < ChartBase
+    def to_blob
+      raise 'Need to specify label_column' unless label_column.present?
+      g = prepare_gruff(:bar)
+
+      columns.each do |column|
+        if column.kind_of?(Array)
+          key, text = column[0], column[1]
+        else
+          key, text = column, column.to_s.humanize
+        end
+
+        g.data(text, data_for_column(key))
+      end
+
+      labels = {}
+      data_for_column(label_column).each_with_index do |label, index|
+        labels[index] = label.to_s
+      end
+
+      g.labels = labels
+      g.to_blob
+    end
+  end
+end

data/lib/chartify/factory.rb

@@ -2,6 +2,8 @@ require 'chartify/gruff_themes'
 require 'chartify/line_chart'
 require 'chartify/pie_chart'
 require 'chartify/bar_chart'
+require 'chartify/column_chart'
+require 'chartify/area_chart'
 
 module Chartify
   class Factory

data/lib/chartify/line_chart.rb

@@ -14,6 +14,7 @@ require 'gruff'
 module Chartify
   class LineChart < ChartBase
     def to_blob
+      raise 'Need to specify label_column' unless label_column.present?
       g = prepare_gruff(:line)
 
       columns.each do |column|

data/lib/chartify/version.rb

@@ -1,3 +1,3 @@
 module Chartify
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

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

@@ -0,0 +1,24 @@
+require 'chartify/area_chart'
+require 'chartify/web_chart/google_chart/google_chart_module'
+
+module Chartify
+  module WebChart
+    module GoogleChart
+      class AreaChart < Chartify::AreaChart
+        include Chartify::WebChart::GoogleChart::GoogleChartModule
+
+        def render(html_dom_id)
+          js = <<-JS
+            google.load("visualization", "1", {packages:["corechart"]});
+            google.setOnLoadCallback(function () {
+              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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'chartify/bar_chart'
+require 'chartify/web_chart/google_chart/google_chart_module'
+
+module Chartify
+  module WebChart
+    module GoogleChart
+      class ColumnChart < Chartify::ColumnChart
+        include Chartify::WebChart::GoogleChart::GoogleChartModule
+
+        def render(html_dom_id)
+          js = <<-JS
+            google.load("visualization", "1", {packages:["corechart"]});
+            google.setOnLoadCallback(function () {
+              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
+        end
+      end
+    end
+  end
+end

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

@@ -21,9 +21,10 @@ module Chartify
         end
 
         def array_data_table
-          array_data = [[label_column] + column_names]
+          array_data = label_column.present? ? [[label_column] + column_names] : [column_names]
           array_data + data.collect do |row|
-            [row[label_column]] + column_keys.collect { |col| row[col] }
+            row_val = column_keys.collect { |col| row[col] }
+            label_column.present? ? [row[label_column]] + row_val : row_val
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gruff
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -48,14 +48,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -154,15 +154,19 @@ files:
 - README.md
 - Rakefile
 - lib/chartify.rb
+- lib/chartify/area_chart.rb
 - lib/chartify/bar_chart.rb
 - lib/chartify/chart_base.rb
+- lib/chartify/column_chart.rb
 - lib/chartify/config.rb
 - lib/chartify/factory.rb
 - lib/chartify/gruff_themes.rb
 - lib/chartify/line_chart.rb
 - lib/chartify/pie_chart.rb
 - lib/chartify/version.rb
+- lib/chartify/web_chart/google_chart/area_chart.rb
 - lib/chartify/web_chart/google_chart/bar_chart.rb
+- lib/chartify/web_chart/google_chart/column_chart.rb
 - lib/chartify/web_chart/google_chart/google_chart_module.rb
 - lib/chartify/web_chart/google_chart/line_chart.rb
 - lib/chartify/web_chart/google_chart/pie_chart.rb