query_report 0.1.0 → 0.1.1

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in query_report.gemspec
 gemspec
+
+group :development do
+  gem 'jquery-rails'
+  gem 'bullet'
+  gem 'rack-mini-profiler'
+end

data/lib/query_report.rb

@@ -1,13 +1,19 @@
-require "query_report/version"
-require "query_report/report"
+require 'query_report/version'
+require 'query_report/report'
 require 'query_report/chart/pie_chart'
 require 'query_report/chart/custom_chart'
 
 module QueryReport
-  autoload :VERSION,                  'query_report/version'
-  autoload :Helper,                   'query_report/helper'
-  autoload :Views,                    'query_report/views'
-  autoload :Report, 'query_report/report'
-  autoload :Filter,                   'query_report/filter'
-  autoload :Column,                   'query_report/column'
+  #autoload :VERSION, 'query_report/version'
+  #autoload :Helper, 'query_report/helper'
+  #autoload :Views, 'query_report/views'
+  #autoload :Report, 'query_report/report'
+  #autoload :Filter, 'query_report/filter'
+  #autoload :Column, 'query_report/column'
+
+  #mattr_accessor :chart_on_pdf
+  #self.chart_on_pdf = true
+  #
+  #mattr_accessor :paginate
+  #self.paginate = true
 end

data/lib/query_report/column.rb

@@ -1,17 +1,32 @@
 module QueryReport
-  class Column
-    attr_reader :name, :options, :type, :data
+  module ColumnModule
+    def column(name, options={}, &block)
+      options.merge!(model_name: model_name)
+      @columns << Column.new(name, options, block)
+    end
 
-    def initialize(name, options={}, block = nil)
-      @name = name
-      @options = options
-      @type = (options.kind_of?(Hash) ? options[:type] : options) || 'string'
-      @data = block || name.to_sym
+    def columns
+      @columns
     end
 
-    def humanize
-      options[:as] || name.to_s.humanize
+    def column_names
+      @column_names ||= (@columns||[]).collect(&:humanize)
     end
-  end
 
+    class Column
+      attr_reader :name, :options, :type, :data
+
+      def initialize(name, options={}, block = nil)
+        @name = name
+        @options = options
+        @type = (options.kind_of?(Hash) ? options[:type] : options) || 'string'
+        @data = block || name.to_sym
+      end
+
+      def humanize
+        options[:as] || I18n.t("activerecord.models.#{options[:model_name]}.#{name}", :default => name.to_s.humanize)
+      end
+    end
+
+  end
 end

data/lib/query_report/filter.rb

@@ -1,52 +1,66 @@
 module QueryReport
-  class Filter
-    attr_reader :params, :column, :type, :comparators, :block, :custom
-
-    def initialize(params, column, options, &block)
-      @params = params
-      @column = column
-      @type = options if options.kind_of? String
-      if options.kind_of? Hash
-        @type = options[:type]
-        @comparators = options[:comp] || detect_comparators(@type)
-      end
-      @block = block
-      @custom = @block ? true : false
+  module FilterModule
+    def filter(column, options, &block)
+      @filters << Filter.new(@params, column, options, &block)
     end
 
-    def self.supported_types
-      [:date, :text]
+    def filter_with_values
+      hash = {}
+      @filters.each do |filter|
+        hash.merge!(filter.filter_with_values)
+      end
+      hash
     end
 
-    def keys
-      @keys ||= (@comparators || {}).keys.map { |comp| "#{column.to_s}_#{comp}" }
-    end
+    class Filter
+      attr_reader :params, :column, :type, :comparators, :block, :custom
 
-    supported_types.each do |supported_type|
-      define_method("#{supported_type.to_s}?") do
-        @type == supported_type
+      def initialize(params, column, options, &block)
+        @params = params
+        @column = column
+        @type = options if options.kind_of? String
+        if options.kind_of? Hash
+          @type = options[:type]
+          @comparators = options[:comp] || detect_comparators(@type)
+        end
+        @block = block
+        @custom = @block ? true : false
       end
-    end
 
-    def filter_with_values
-      hash = {}
-      @comparators.each do |key, filter_name|
-        [key, filter_name]
-        param_key = "#{column.to_s}_#{key.to_s}"
-        hash[filter_name] = @params['q'][param_key] || @params['custom_search'][param_key] rescue ''
+      def self.supported_types
+        [:date, :text]
+      end
+
+      def keys
+        @keys ||= (@comparators || {}).keys.map { |comp| "#{column.to_s}_#{comp}" }
+      end
+
+      supported_types.each do |supported_type|
+        define_method("#{supported_type.to_s}?") do
+          @type == supported_type
+        end
+      end
+
+      def filter_with_values
+        hash = {}
+        @comparators.each do |key, filter_name|
+          [key, filter_name]
+          param_key = "#{column.to_s}_#{key.to_s}"
+          hash[filter_name] = @params['q'][param_key] || @params['custom_search'][param_key] rescue ''
+        end
+        hash
       end
-      hash
-    end
 
-    private
-    def detect_comparators(type)
-      case type
-        when :date
-          return {gteq: I18n.t('query_report.filters.from'), lteq: I18n.t('query_report.filters.to')}
-        when :text
-          return {cont: @column.to_s.humanize}
+      private
+      def detect_comparators(type)
+        case type
+          when :date
+            return {gteq: I18n.t('query_report.filters.from'), lteq: I18n.t('query_report.filters.to')}
+          when :text
+            return {cont: @column.to_s.humanize}
+        end
+        {eq: I18n.t('query_report.filters.equal')}
       end
-      {eq: I18n.t('query_report.filters.equal')}
     end
   end
 end

data/lib/query_report/report.rb

@@ -1,24 +1,20 @@
 require 'query_report/filter'
 require 'query_report/column'
-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
-    include ActionView::Helpers
+    include QueryReport::ColumnModule
+    include QueryReport::FilterModule
 
     attr_accessor :params, :template, :chart, :charts, :filters, :scopes, :current_scope, :options
 
     def initialize(params, template, options={}, &block)
-      @params = params
-      @template = template
-      @columns = []
-      @filters = []
-      @scopes = []
-      @charts = []
+      @params, @template = params, template
+      @columns, @filters, @scopes, @charts = [], [], [], []
       @current_scope = @params[:scope] || 'all'
       @options = QueryReport::DEFAULT_OPTIONS.merge options
       instance_eval &block if block_given?
@@ -34,35 +30,15 @@ module QueryReport
 
     # to support the helper methods
     def method_missing(meth, *args, &block)
-      #if Rails.application.routes.url_helpers.respond_to?(meth)
-      #  Rails.application.routes.url_helpers.send(meth, *args)
-      #elsif ActionController::Base.helpers.respond_to?(meth)
-      #  ActionController::Base.helpers.send(meth, *args)
-      #else
-      #  super # You *must* call super if you don't handle the
-      #        # method, otherwise you'll mess up Ruby's method
-      #        # lookup.
-      #end
-
       if @template.respond_to?(meth)
         @template.send(meth, *args)
       else
-        super # You *must* call super if you don't handle the
-              # method, otherwise you'll mess up Ruby's method
-              # lookup.
+        super
       end
     end
 
-    def column(name, options={}, &block)
-      @columns << Column.new(name, options, block)
-    end
-
-    def columns
-      @columns
-    end
-
-    def column_names
-      @column_names ||= (@columns||[]).collect(&:humanize)
+    def model_name
+      query.table.name.singularize
     end
 
     def query=(query)
@@ -95,21 +71,14 @@ module QueryReport
       end
     end
 
-    def filter(column, options, &block)
-      @filters << Filter.new(@params, column, options, &block)
-    end
-
-    def filter_with_values
-      hash = {}
-      @filters.each do |filter|
-        hash.merge!(filter.filter_with_values)
-      end
-      hash
+    def scope(scope)
+      @scopes << scope
+      @scopes = @scopes.uniq
     end
 
-    def column_chart(title, columns)
-      @chart = QueryReport::Chart::BasicChart.new(:column, title, columns, all_records)
-      @charts << @chart
+    def search
+      apply_filters_and_pagination
+      @search
     end
 
     def compare_with_column_chart(title, x_axis='', &block)
@@ -125,20 +94,6 @@ module QueryReport
       @charts << @chart
     end
 
-    def pie_chart_on_total(title, columns)
-      @chart = QueryReport::Chart::ChartWithTotal.new(:pie, title, columns, all_records, {:is3D => true})
-    end
-
-    def scope(scope)
-      @scopes << scope
-      @scopes = @scopes.uniq
-    end
-
-    def search
-      apply_filters_and_pagination
-      @search
-    end
-
     private
     def apply_filters_and_pagination
       return if @applied_filters_and_pagination

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/query_report.gemspec

@@ -17,8 +17,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib", "app"]
 
+  gem.add_dependency "rails", "~> 3.2.13"
   gem.add_dependency 'ransack'
   gem.add_dependency 'google_visualr', '>= 2.1'
   gem.add_dependency 'rmagick'
   gem.add_dependency 'gruff'
+  gem.add_dependency 'kaminari'
+
+  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "jquery-rails"
+  gem.add_development_dependency "bullet"
+  gem.add_development_dependency "rack-mini-profiler"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +91,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bullet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-mini-profiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a gem to help you to structure common reports of you application
   just by writing in the controller
 email:
@@ -93,7 +189,6 @@ files:
 - app/views/query_report/list.html.erb
 - lib/query_report.rb
 - lib/query_report/chart/basic_chart.rb
-- lib/query_report/chart/chart_with_total.rb
 - lib/query_report/chart/custom_chart.rb
 - lib/query_report/chart/pie_chart.rb
 - lib/query_report/chart/themes.rb

data/lib/query_report/chart/chart_with_total.rb

@@ -1,82 +0,0 @@
-module QueryReport
-  module Chart
-    class ChartWithTotal
-      attr_reader :title, :columns, :type, :data, :options
-
-      def initialize(type, name, columns, data, options={})
-        @type = type
-        @name = name
-        @columns = []
-        columns.each do |column|
-          @columns << QueryReport::Column.new(column, 'number')
-        end
-        @data = data
-        @options = options
-      end
-
-      def prepare
-        data_table = GoogleVisualr::DataTable.new
-        columns.each do |column|
-          data_table.new_column(column.type, column.name)
-        end
-
-        row = []
-        columns.each do |column|
-          total = 0
-          @data.each do |r|
-            total += r[column].to_f
-          end
-          row << total
-        end
-
-        data_table.add_row(row)
-
-        opts = {:width => 400, :height => 240, :title => title}.merge(options)
-
-        chart_type = "#{type}_chart".classify
-        chart_type = "GoogleVisualr::Interactive::#{chart_type}".constantize
-        chart_type.new(data_table, opts)
-      end
-    end
-  end
-
-  #class ColumnChartWithTotal
-  #  attr_reader :title, :columns, :type, :data, :options
-  #
-  #  def initialize(type, name, columns, data, options={})
-  #    @type = type
-  #    @name = name
-  #    @columns = []
-  #    columns.each do |column|
-  #      @columns << Report::Column.new(column, 'number')
-  #    end
-  #    @data = data
-  #    @options = options
-  #  end
-  #
-  #  def prepare
-  #    data_table = GoogleVisualr::DataTable.new
-  #    columns.each do |column|
-  #      data_table.new_column(column.type, column.name)
-  #    end
-  #
-  #    row = []
-  #    columns.each do |column|
-  #      total = 0
-  #      @data.each do |r|
-  #        total += r[column].to_f
-  #      end
-  #      row << total
-  #    end
-  #
-  #    data_table.add_row(row)
-  #
-  #    opts = {:width => 400, :height => 240, :title => title}.merge(options)
-  #
-  #    chart_type = "#{type}_chart".classify
-  #    chart_type = "GoogleVisualr::Interactive::#{chart_type}".constantize
-  #    chart_type.new(data_table, opts)
-  #  end
-  #end
-
-end