query_report 1.0.26 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aab32c48ba2e1a322be2d4317fc261ac2f6a982
-  data.tar.gz: c8731f5146650c1097bf520da2cc528d28fe36cb
+  metadata.gz: 7f8d3573e1023f1f75ccfc342c5b499c2190ea2f
+  data.tar.gz: 2395c213bb91c1fce5e11b1e30e7713234515d2f
 SHA512:
-  metadata.gz: 67a77ce7c7fef004f6876aead43e8afdbadda4a01d6f290af81f809cd6b550e45eb57c2312d074a723775ae2a496b092b6eba4bf951541bd08c0e5bd116cbce1
-  data.tar.gz: 5aff95192dcbb156b1096dafab039cd18efa2dafd29e4762778707844bfd3f5491bdf378dfd4a005fcd54303d51cf884e57a87a447a740952cacb9089781aa76
+  metadata.gz: a9cd49d9a017a27117ee609c3b284a046450cdfff5e30e215828c22c7a7d8845ed61915e04a06eea6a5d08f69fcf9cf510f86f4890c8252c5f4706a1e53b908b
+  data.tar.gz: 078ec9cf9dbe6a1bd14dd7ab8515bee7c7e08b6a9900d050272997aafae431b7acdaf58ea0916e78da6bbd6803bfec83a7d5318a2c448ccc7e19f0ffbec3ac70

data/README.md

@@ -4,6 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/query_report.png)](http://badge.fury.io/rb/query_report)
 [![Code Climate](https://codeclimate.com/github/ashrafuzzaman/query_report.png)](https://codeclimate.com/github/ashrafuzzaman/query_report)
 [![Code coverage](https://codeclimate.com/github/ashrafuzzaman/query_report/coverage.png)](https://codeclimate.com/github/ashrafuzzaman/query_report)
+[![Dependencies](https://gemnasium.com/ashrafuzzaman/query_report.png)](https://gemnasium.com/ashrafuzzaman/query_report)
 
 ###Write the action with a simple DSL and get a report with PDF and CSV export, gorgeous charts, out of box filters, with I18n support, etc...  
 

data/app/views/query_report/_chart.html.erb

@@ -4,7 +4,7 @@
       <div class="span6">
         <div id="<%= chart_id %>" style="text-align: center;"></div>
       </div>
-      <%= render_chart(chart.prepare_visualr, chart_id) %>
+      <%= chart.render_chart(chart_id) %>
   <% end %>
   <div class="clearfix"></div>
 </div>

data/lib/query_report/chart_adapter.rb

@@ -0,0 +1,38 @@
+# Author::    A.K.M. Ashrafuzzaman  (mailto:ashrafuzzaman.g2@gmail.com)
+# License::   MIT-LICENSE
+
+# The purpose of the filter module is adapt the chart features form chartify
+require 'chartify/factory'
+
+module QueryReport
+  module ChartAdapterModule
+    def chart(chart_type, chart_title, &block)
+      chart_adapter = ChartAdapter.new(filtered_query, chart_type, chart_title)
+      block.call(chart_adapter)
+      @charts << chart_adapter.chart
+
+      ap chart_adapter.chart.data
+      ap chart_adapter.chart
+    end
+
+    class ChartAdapter
+      attr_accessor :query, :chart_type, :chart
+      delegate :data, :data=, :columns, :columns=, :label_column, :label_column=, to: :chart
+
+      def initialize(query, chart_type, chart_title)
+        @query = query
+        @chart_type = chart_type
+        @chart = "Chartify::#{chart_type.to_s.camelize}Chart".constantize.new
+        @chart.title = chart_title
+        # 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
+      end
+
+    end
+  end
+end

data/lib/query_report/report.rb

@@ -3,8 +3,7 @@ module QueryReport
   autoload :FilterModule, 'query_report/filter'
   autoload :PaginateModule, 'query_report/paginate'
   autoload :Record, 'query_report/record'
-  autoload :ColumnChartModule, 'query_report/chart/column_chart'
-  autoload :PieChartModule, 'query_report/chart/pie_chart'
+  autoload :ChartAdapterModule, 'query_report/chart_adapter'
 
   DEFAULT_OPTIONS = {enable_chart: true, chart_on_web: true, chart_on_pdf: true, paginate: true}
 
@@ -15,8 +14,7 @@ module QueryReport
     include QueryReport::FilterModule
     include QueryReport::PaginateModule
     include QueryReport::Record
-    include QueryReport::ColumnChartModule
-    include QueryReport::PieChartModule
+    include QueryReport::ChartAdapterModule
 
     def initialize(params, template, options={}, &block)
       @params, @template = params, template

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.26"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.1.0
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chartify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,11 +229,7 @@ files:
 - config/routes.rb
 - db/schema.rb
 - lib/query_report.rb
-- lib/query_report/chart/chart_base.rb
-- lib/query_report/chart/chart_column.rb
-- lib/query_report/chart/column_chart.rb
-- lib/query_report/chart/pie_chart.rb
-- lib/query_report/chart/themes.rb
+- lib/query_report/chart_adapter.rb
 - lib/query_report/column.rb
 - lib/query_report/comparator.rb
 - lib/query_report/config.rb

data/lib/query_report/chart/chart_base.rb

@@ -1,59 +0,0 @@
-require 'query_report/chart/chart_column'
-require 'query_report/chart/themes'
-
-module QueryReport
-  module Chart
-    class ChartBase
-      attr_reader :title, :options, :columns, :data
-
-      def initialize(title, query, options={})
-        @title = title
-        @query = query
-        @options = {:width => 500, :height => 240}.merge(options)
-      end
-
-      def add(column_title, &block)
-        val = block.call(@query)
-        @columns ||= []
-        @columns << QueryReport::Chart::Column.new(column_title, val.kind_of?(String) ? :string : :number)
-        @data ||= []
-        @data << val
-      end
-
-      def prepare_visualr(type)
-        @data_table = GoogleVisualr::DataTable.new
-
-        ##### Adding column header #####
-        @data_table.new_column('string', '') if type == :column
-        @columns.each do |col|
-          @data_table.new_column(col.type.to_s, col.title)
-        end
-        ##### Adding column header #####
-
-        ##### Adding value #####
-        chart_row_data = type == :column ? [''] + @data : @data
-        @data_table.add_row(chart_row_data)
-        ##### Adding value #####
-
-        options = {:title => title, backgroundColor: 'transparent'}.merge(@options)
-        chart_type = "#{type}_chart".classify
-        chart_type = "GoogleVisualr::Interactive::#{chart_type}".constantize
-        chart_type.new(@data_table, options)
-      end
-
-      def to_blob(type)
-        chart_type = type.to_s.classify
-        chart_type = "Gruff::#{chart_type}".constantize
-
-        @gruff = chart_type.new(@options[:width])
-        @gruff.title = title
-        @gruff.theme = QueryReport::Chart::Themes::GOOGLE_CHART
-        @data.each_with_index do |value, i|
-          @gruff.data(@columns[i].title, value)
-        end
-
-        @gruff.to_blob
-      end
-    end
-  end
-end

data/lib/query_report/chart/chart_column.rb

@@ -1,12 +0,0 @@
-module QueryReport
-  module Chart
-    class Column
-      attr_reader :title, :type
-
-      def initialize(title, type)
-        @title = title
-        @type = type
-      end
-    end
-  end
-end

data/lib/query_report/chart/column_chart.rb

@@ -1,40 +0,0 @@
-require 'query_report/chart/themes'
-require 'query_report/chart/chart_base'
-
-module QueryReport
-  module ColumnChartModule
-    def column_chart(title, &block)
-      chart = QueryReport::Chart::ColumnChart.new(title, self.filtered_query)
-      chart.instance_eval &block if block_given?
-      @charts ||= []
-      @charts << chart
-    end
-  end
-
-  module Chart
-    class ColumnChart < QueryReport::Chart::ChartBase
-      def initialize(title, query, options={})
-        super(title, query, options)
-      end
-
-      def prepare_visualr
-        @data_table = GoogleVisualr::DataTable.new
-
-        ##### Adding column header #####
-        @data_table.new_column('string', '')
-        @columns.each do |col|
-          @data_table.new_column(col.type.to_s, col.title)
-        end
-        ##### Adding column header #####
-
-        @data_table.add_row([''] + @data)
-        options = {:title => title, backgroundColor: 'transparent'}.merge(@options)
-        GoogleVisualr::Interactive::ColumnChart.new(@data_table, options)
-      end
-
-      def to_blob
-        super(:bar)
-      end
-    end
-  end
-end

data/lib/query_report/chart/pie_chart.rb

@@ -1,41 +0,0 @@
-require 'query_report/chart/themes'
-require 'query_report/chart/chart_base'
-
-module QueryReport
-  module PieChartModule
-    def pie_chart(title, &block)
-      chart = QueryReport::Chart::PieChart.new(title, self.filtered_query)
-      chart.instance_eval &block if block_given?
-      @charts ||= []
-      @charts << chart
-    end
-  end
-
-  module Chart
-    class PieChart < QueryReport::Chart::ChartBase
-      def initialize(title, query, options={})
-        super(title, query, options)
-      end
-
-      def prepare_visualr
-        @data_table = GoogleVisualr::DataTable.new
-
-        ##### Adding column header #####
-        @data_table.new_column('string', 'Item')
-        @data_table.new_column('number', 'Value')
-        ##### Adding column header #####
-
-        @columns.each_with_index do |column, i|
-          @data_table.add_row([column.title, @data[i]])
-        end
-
-        options = {:title => title, backgroundColor: 'transparent'}.merge(@options)
-        GoogleVisualr::Interactive::PieChart.new(@data_table, options)
-      end
-
-      def to_blob
-        super(:pie)
-      end
-    end
-  end
-end

data/lib/query_report/chart/themes.rb

@@ -1,20 +0,0 @@
-module QueryReport
-  module Chart
-    module Themes
-      GOOGLE_CHART = {
-          :colors => [
-              '#3366CC', # blue
-              '#DC3912', # red
-              '#FF9900', # yellow
-              '#109618', # green
-              '#990099', # dk purple
-              '#0099C6', # sky
-              '#DD4477' # grey
-          ],
-          :marker_color => '#aea9a9', # Grey
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-    end
-  end
-end