query_report 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8c81573f3c058802d4e0f5c79b1ac71e86df64
-  data.tar.gz: 703e69202bc42844c1a87445cdb61e832936c309
+  metadata.gz: 8aa6a5e9dbe15e1632dbb248e0340f5f2f71ec04
+  data.tar.gz: b23adc6f5cdf706aacde613736e66fd129e6d9e2
 SHA512:
-  metadata.gz: 0e1aa0d0d9609ec2d46087ddadea6be908da1b6c11847286e8cb02b500c308381f08172fd09bc268f47acefa423f6ea593981785dcfb368e482f2336be64dc76
-  data.tar.gz: f05c03a9b18a4ce9554ddfa30cdd3eb2d7a9f1a605acaa048798d3955ab3a1b22b9684d28de72f5aa3a36099681de39e8329d488437acc1520dc43b78a23b6e2
+  metadata.gz: fffad0b223b647ba449c4d8c6300f8b1937fdd9d2a0579281fea0fe8acf2e2174c375ffb20abacd03c07d3f9d2d349635b332c7827b90da802a3430d7bfb6b82
+  data.tar.gz: c46a56e3081e5e29b854161c2bd84c3248e4eb4cf3aa5a9d17f5af8df3b4f2ef15709fbaddc28f52265fd0baca0c7c80c9b6a33bacc20e15932d44a842c374a3

data/README.md

@@ -54,7 +54,7 @@ end
 ```
 
 ## License
-MIT License. Copyright © 2013 [Ashrafuzzaman](http://ashrafuzzaman.github.io). See MIT-LICENSE for further details.
+MIT License. Copyright © 2014 [Ashrafuzzaman](http://ashrafuzzaman.github.io). See MIT-LICENSE for further details.
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ashrafuzzaman/query_report/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 

data/Rakefile

@@ -1,51 +1,73 @@
 #!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'QueryReport'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+# encoding: utf-8
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
 
-#require 'rake/testtask'
+# task :default => "spec:all"
 #
-#Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib'
-#  t.libs << 'test'
-#  t.pattern = 'test/**/*_test.rb'
-#  t.verbose = false
-#end
+# namespace :spec do
+#   desc "Run Tests against all ORMs"
+#   task :all do
+#     sh "bundle --quiet"
+#     sh "bundle exec rake spec"
+#   end
+# end
 #
+# begin
+#   require 'rdoc/task'
 #
-#task :default => :test
+#   Rake::RDocTask.new do |rdoc|
+#     require 'query_report/version'
+#
+#     rdoc.rdoc_dir = 'rdoc'
+#     rdoc.title = "query report #{QueryReport::VERSION}"
+#     rdoc.rdoc_files.include('README*')
+#     rdoc.rdoc_files.include('lib/**/*.rb')
+#   end
+# rescue LoadError
+#   puts 'RDocTask is not supported on this VM and platform combination.'
+# end
 
+task :default => "spec:all"
+gemfiles = %w(active_record_32 active_record_4)
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+namespace :spec do
+  gemfiles.each do |gemfile|
+    desc "Run Tests against #{gemfile}"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+    end
+  end
 
-RSpec::Core::RakeTask.new
+  desc "Run Tests against all ORMs"
+  task :all do
+    gemfiles.each do |gemfile|
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
+    end
+  end
+end
 
-task :default => :spec
-task :test => :spec
+begin
+  require 'rdoc/task'
 
-task :default => :test
+  Rake::RDocTask.new do |rdoc|
+    require 'query_report/version'
+
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "Query report #{QueryReport::VERSION}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts 'RDocTask is not supported on this VM and platform combination.'
+end

data/app/assets/javascripts/query_report.js.coffee

@@ -0,0 +1,9 @@
+class @QueryReport
+  @sendEmail: (email_to, subject, message) =>
+    searchForm = $("div.query_report:visible form")
+    searchForm.find("#send_as_email").val(1)
+    searchForm.find("#email_to").val(email_to)
+    searchForm.find("#subject").val(subject)
+    searchForm.find("#message").val(message)
+    searchForm.submit()
+    searchForm.find("#send_as_email").val(0) #reseting the email back to false

data/app/helpers/{query_report_filter_helper.rb → query_report_engine_filter_helper.rb}

@@ -1,4 +1,4 @@
-module QueryReportFilterHelper
+module QueryReportEngineFilterHelper
   def query_report_text_filter(name, value, options={})
     text_field_tag name, value, options
   end

data/app/helpers/{query_report_helper.rb → query_report_engine_helper.rb}

@@ -1,6 +1,6 @@
 require 'query_report/errors'
 
-module QueryReportHelper
+module QueryReportEngineHelper
   def query_report_render_filter(filter, comparator)
     hint = comparator.name
     search_tag_name = comparator.search_tag_name
@@ -16,6 +16,11 @@ module QueryReportHelper
     end
   end
 
+  def render_query_report(report = nil)
+    report ||= @report
+    render :partial => "query_report/list", locals: {report: report}
+  end
+
   def export_report_url_with_format(format)
     url_for(params.merge(format: format))
   end

data/app/helpers/{query_report_link_helper.rb → query_report_engine_link_helper.rb}

@@ -1,4 +1,4 @@
-module QueryReportLinkHelper
+module QueryReportEngineLinkHelper
   def link_to_download_report_pdf
     link_to t('views.links.pdf'), export_report_url_with_format('pdf'), :target => "_blank"
   end

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

@@ -1,4 +1,4 @@
-<%= search_form_for report.search, url: url_for, remote: @remote, html: {:method => :get, :class => 'form-inline'} do |f| %>
+<%= search_form_for report.search, url: url_for({}), remote: @remote, html: {:method => :get, :class => 'form-inline'} do |f| %>
     <% report.filters.each do |filter| %>
         <% filter.comparators.each do |comparator| %>
             <%= query_report_render_filter(filter, comparator) %>

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

@@ -1 +1 @@
-<%= render :partial => "query_report/list", locals: {report: @report} %>
+<%= render_query_report(@report) %>

data/lib/query_report/filter.rb

@@ -30,7 +30,7 @@ module QueryReport
     def apply_filters(query, http_params)
       # apply default filter
       params = load_default_values_in_param(http_params) #need for ransack filter
-      @search = query.search(params[:q])
+      @search = query.ransack(params[:q])
       query = @search.result
 
       #apply custom filter

data/lib/query_report/helper.rb

@@ -9,11 +9,19 @@ require 'query_report/report_pdf'
 
 module QueryReport
   module Helper
+
+    # Generates the reports
+    # Params:
+    # query - The base query that the reporter with start with [filters will be applied on it]
+    # options - Options for the reports
+    #           :custom_view - by default false, if set to true then the reporter will look for the file to render
+    #           :skip_rendering - by default false, if set to true then the reporter will not render any thing, you will have to implement the rendering
     def reporter(query, options={}, &block)
       @report ||= QueryReport::Report.new(params, view_context, options)
       @report.query = query
       @report.instance_eval &block
-      render_report(options)
+      render_report(options) unless options[:skip_rendering]
+      @report
     end
 
     def render_report(options)
@@ -23,11 +31,18 @@ module QueryReport
 
       @remote = false
       respond_to do |format|
-        format.js do
-          @remote = true
-          render 'query_report/list'
+        if options[:custom_view]
+          format.js do
+            @remote = true
+          end
+          format.html
+        else
+          format.js do
+            @remote = true
+            render 'query_report/list'
+          end
+          format.html { render('query_report/list') }
         end
-        format.html { render 'query_report/list' }
         format.json { render json: @report.all_records }
         format.csv { send_data generate_csv_for_report(@report.all_records), :disposition => "attachment;" }
         format.pdf { send_data pdf_for_report(options), :type => 'application/pdf', :disposition => 'inline' }

data/lib/query_report/record.rb

@@ -43,11 +43,6 @@ module QueryReport
       end
     end
 
-    def sanitize_value(data, render_from_view)
-      data = strip_tags(data) if !render_from_view && data.present? && data.is_a?(String)
-      data
-    end
-
     def has_any_rowspan?
       @has_any_rowspan = @columns.any?(&:rowspan?) if @has_any_rowspan.nil?
       @has_any_rowspan
@@ -99,5 +94,11 @@ module QueryReport
     def content_from_element(content)
       content.kind_of?(Hash) ? content[:content] : content
     end
+
+    private
+    def sanitize_value(data, render_from_view)
+      data = strip_tags(data) if !render_from_view && data.present? && data.is_a?(String)
+      data
+    end
   end
 end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.21"
+  VERSION = "1.0.22"
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: google_visualr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.2
 - !ruby/object:Gem::Dependency
   name: gruff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -122,34 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  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
-  name: bullet
-  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
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: This is a gem to help you to structure common reports of you application
   just by writing in the controller
 email:
@@ -231,9 +189,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/helpers/query_report_filter_helper.rb
-- app/helpers/query_report_helper.rb
-- app/helpers/query_report_link_helper.rb
+- app/assets/javascripts/query_report.js.coffee
+- app/helpers/query_report_engine_filter_helper.rb
+- app/helpers/query_report_engine_helper.rb
+- app/helpers/query_report_engine_link_helper.rb
 - app/mailers/report_mailer.rb
 - app/views/query_report/_chart.html.erb
 - app/views/query_report/_charts.html.erb