query_report 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e6dd09227f6ad51d81593b879ded5928ab3c27
-  data.tar.gz: 72ef9413da84d9e5d0f5f802c5b7dd8e4cd4aba0
+  metadata.gz: f68b878d9f9684f1177070150ff83b775f92be8f
+  data.tar.gz: bbf996f42c71bdb634d5b6e7d1dff8aa0b7987df
 SHA512:
-  metadata.gz: aad743d74172a389cc058f6354d819b7e1263fcea268bffcecd1c4d3a2928e38c1b02563cc8f75ff2571472300ee7a2709669cd42cc02d7a8963534599a611d3
-  data.tar.gz: 8d5c76e9381b2df6a078f133a82d02ac459f483e93c7afa9281011a58eceb4e50fe800e33ce5add15a104a01c7f2e3da909188ae2fe5e55431c22044f1ecb209
+  metadata.gz: 36ede71bbff6683aafef0af8044363445736a9e115064e0009062b6c032549a4d53a94fff86c015a75a15066b2bcb32c33dffe023228aed51d38d6c29dd1d6cd
+  data.tar.gz: 9732143800a552f9e5a83fbeb4d2c14fef50c55e99002908b7f5903d7a95d9af0fcec747e9943ced46275ef189a0b59247d1f77d7fdd06241240aca0b074bd80

data/Rakefile

@@ -11,43 +11,10 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-# task :default => "spec:all"
-#
-# 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'
-#
-#   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)
+gemfiles = %w(active_record_32 active_record_4 active_record_4_1_1)
 
 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
-
   desc "Run Tests against all ORMs"
   task :all do
     gemfiles.each do |gemfile|

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

@@ -7,8 +7,7 @@
       </thead>
 
       <tbody>
-      <% records = report.has_any_rowspan? ? report.records_with_rowspan : report.records %>
-      <% records.each do |record| %>
+      <% report.records_to_render.each do |record| %>
           <tr>
             <% report.columns.each do |column| %>
                 <% value = record[column.humanize]
@@ -27,5 +26,5 @@
       </tbody>
     </table>
 <% else %>
-    <p>No record found</p>
+    <p><%= t('query_report.no_record_found') %></p>
 <% end %>

data/config/locales/query_report.yml

@@ -6,4 +6,5 @@ en:
     total:
       Total
     labels:
-      search: Search
+      search: Search
+    no_record_found: No record found

data/lib/query_report/column.rb

@@ -15,6 +15,7 @@ module QueryReport
     # @option options [Boolean] :only_on_web the column will appear on the web and not appear in PDF, CSV or JSON if set to true
     # @option options [Boolean] :sortable if set to true then sorts on that column, but if the sorting has to be on a joint table then you have to specify the column on which the sorting will happen
     # @option options :rowspan the rows with same values in the same column will span if set to true
+    # @option options :pdf[:width] pass width of the column in the pdf
     #
     # @example Row span
     #   column :invoiced_to_name, rowspan: true
@@ -45,6 +46,7 @@ module QueryReport
     #   ├───────────┴────────────┼─────────────────┤
     #   │                  Total │      300        │
     #   └────────────────────────┴─────────────────┘
+    # The translation key used for total is 'query_report.total'
     #
     # @example Sorting
     #  column :invoice_date, sortable: true
@@ -54,10 +56,16 @@ module QueryReport
     # then just set true to make the column sortable.
     # If the column is from another table then you have to specify the column name.
     #
+    # @example Pdf options
+    #  column :invoice_date, pdf: {width: 20}
+    # This is how you can control the width of the column in the pdf
     def column(name, options={}, &block)
       @columns << Column.new(self, name, options, block)
     end
 
+    # @return [Array<Hash>] the footer for the table with total with appropriate colspan and content
+    # Sample output
+    #  [{content: "Total", colspan: '2'}, 200, 300]
     def column_total_with_colspan
       total_with_colspan = []
       colspan = 0
@@ -108,6 +116,10 @@ module QueryReport
         @options[:rowspan] == true || @options[:rowspan].kind_of?(Symbol)
       end
 
+      def pdf_options
+        @options[:pdf] || {}
+      end
+
       def rowspan_column_humanized
         return @rowspan_column_humanized if @rowspan_column_humanized
         rowspan_column_name = @options[:rowspan].kind_of?(Symbol) ? @options[:rowspan] : self.name
@@ -140,7 +152,7 @@ module QueryReport
       def total
         @total ||= begin
           if has_total?
-            report.records_with_rowspan.inject(0) do |sum, r|
+            report.records_to_render.inject(0) do |sum, r|
               r = report.content_from_element(r[humanize])
               r = strip_tags(r) if r.kind_of? String
               sum + r.to_f

data/lib/query_report/filter.rb

@@ -55,8 +55,10 @@ module QueryReport
       attr_reader :params, :column, :type, :comparators, :block, :options
 
       # Initializes filter with the proper parameters
-      # Params:
-      # +params+:: The params from the http request
+      # @param params [Hash] The params from the http request
+      # @param column [Symbol] the name of the filter or the column name for the filter to be applied on
+      # @param block The block is passed for a manual query, The first param the block will receive is the query chain, and the rest is the values for that particular filter.
+      # @see FilterModule#filter options
       def initialize(params, column, options, &block)
         @params, @column, @options, @comparators, @block = params, column, options, [], block
         @type = options.kind_of?(String) ? options : options[:type]

data/lib/query_report/record.rb

@@ -48,15 +48,17 @@ module QueryReport
       @has_any_rowspan
     end
 
-    def records_with_rowspan
-      @records_with_rowspan ||= map_rowspan(records)
+    def records_to_render
+      @records_to_render ||= map_rowspan(records)
     end
 
-    def all_records_with_rowspan
-      @all_records_with_rowspan ||= map_rowspan(all_records)
+    def all_records_to_render
+      @all_records_to_render ||= map_rowspan(all_records)
     end
 
     def map_rowspan(recs)
+      return recs unless has_any_rowspan?
+
       last_reset_index = @columns.select(&:rowspan?).inject({}) { |hash, column| hash[column.humanize] = 0; hash }
       rowspan_column_hash = @columns.select(&:rowspan?).inject({}) { |hash, column| hash[column.humanize] = column.rowspan_column_humanized; hash }
 

data/lib/query_report/report_pdf.rb

@@ -60,7 +60,7 @@ module QueryReport
     end
 
     def table_content_for(report)
-      table_items = report.all_records_with_rowspan
+      table_items = report.all_records_to_render
 
       items = table_items.map do |item|
         item_values = []
@@ -104,7 +104,18 @@ module QueryReport
       font_size = options[:font_size]
       header_font_size = options[:table][:header][:font_size]
       pdf.move_down 10
-      pdf.table(items, :row_colors => alternate_row_bg_color, :header => true, :cell_style => {:inline_format => true, :size => font_size}) do
+
+      table_options = {:row_colors => alternate_row_bg_color, :header => true, :cell_style => {:inline_format => true, :size => font_size}}
+
+      report.columns.each_with_index do |report_column, index|
+        width = report_column.pdf_options[:width]
+        if width
+          table_options[:column_widths] ||= {}
+          table_options[:column_widths].merge! index => width
+        end
+      end
+
+      pdf.table(items, table_options) do
         row(0).style(:font_style => :bold, :background_color => header_bg_color, :size => header_font_size)
       end
     end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.24"
+  VERSION = "1.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,160 +27,163 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: google_visualr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: gruff
   requirement: !ruby/object:Gem::Requirement
     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: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: temping
+  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
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 description: This is a gem to help you to structure common reports of you application
   just by writing in the controller
 email:
@@ -252,4 +258,3 @@ signing_key:
 specification_version: 4
 summary: Structure you reports
 test_files: []
-has_rdoc: