query_report 0.0.3 → 0.0.4

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

@@ -59,4 +59,4 @@
     <p>No record found</p>
 <% end %>
 
-<%= paginate @record.query %>
+<%= paginate @report.query if @report.paginate? %>

data/lib/query_report/helper.rb

@@ -2,8 +2,8 @@ require 'query_report/report'
 
 module QueryReport
   module Helper
-    def reporter(query, &block)
-      @report ||= QueryReport::Report.new(params)
+    def reporter(query, options={}, &block)
+      @report ||= QueryReport::Report.new(params, options)
       @report.query = query
       @report.instance_eval &block
       render_report
@@ -11,6 +11,7 @@ module QueryReport
 
     def render_report
       respond_to do |format|
+        format.js { render 'query_report/list' }
         format.html { render 'query_report/list' }
         format.json { render json: @report.records }
         format.csv { send_data generate_csv_for_report(@report.all_records), :disposition => "attachment;" }

data/lib/query_report/report.rb

@@ -4,8 +4,11 @@ require 'query_report/chart/basic_chart'
 require 'query_report/chart/chart_with_total'
 
 module QueryReport
+  DEFAULT_OPTIONS = {
+      chart_on_pdf: true, paginate: true
+  }
   class Report
-    attr_accessor :params, :chart, :charts, :filters, :search, :scopes, :current_scope
+    attr_accessor :params, :chart, :charts, :filters, :search, :scopes, :current_scope, :options
 
     def initialize(params, options={}, &block)
       @params = params
@@ -13,12 +16,19 @@ module QueryReport
       @filters = []
       @scopes = []
       @charts = []
-      @column_separator = options.delete(:separator)
       @current_scope = @params[:scope] || 'all'
-      @options = options.delete(:options)
+      @options = QueryReport::DEFAULT_OPTIONS.merge options
       instance_eval &block if block_given?
     end
 
+    QueryReport::DEFAULT_OPTIONS.each do |option_name, value|
+      if value.class == TrueClass or value.class == FalseClass
+        define_method "#{option_name.to_s}?" do
+          @options[option_name]
+        end
+      end
+    end
+
     def column(name, options={}, &block)
       @columns << Column.new(name, options, block)
     end
@@ -70,7 +80,7 @@ module QueryReport
       @charts << @chart
     end
 
-    def compare_with_column_chart(title, x_axis, &block)
+    def compare_with_column_chart(title, x_axis='', &block)
       @chart = QueryReport::Chart::CustomChart.new(:column, title, query_without_pagination)
       @chart.add_column x_axis
       @chart.instance_eval &block if block_given?

data/lib/query_report/report_pdf.rb

@@ -31,19 +31,25 @@ class ReportPdf
 
   def standard
     pdf_content do
-      @report.charts.each do |chart|
-        if chart.respond_to?(:to_blob)
-          blob = chart.to_blob
-          data = StringIO.new(blob)
-          pdf.image(data)
-        end
-      end
-      
+      render_charts_with @report
       render_table_with(@report.all_records, {font_size: 8, header_font_size: 10})
     end
   end
 
   private
+  def render_charts_with(report)
+    return if report.charts.nil? or !report.chart_on_pdf?
+    report.charts.each do |chart|
+      if chart.respond_to?(:to_blob)
+        blob = chart.to_blob
+        data = StringIO.new(blob)
+        pdf.pad_top(10) do
+          pdf.image(data, :width => 200)
+        end
+      end
+    end
+  end
+
   def table_header_for(table_items, options={})
     table_items.first.keys
   end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack