query_report 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c4f93c3d1db2c3020ccb05da0a7df39bbaa51b
-  data.tar.gz: 158c20b9597d04794338c6e1a08ddef00b18cb88
+  metadata.gz: 5ce02cd7debc185a658c3dbfb5e94dbdfc2e9d4c
+  data.tar.gz: 517bdde0743ffa34f3c5d72301f5e4b002c677d7
 SHA512:
-  metadata.gz: 1f1ce0811decdced72db58b0350a0000c3a0e824faab110637da3914fe740ddd1e5a72838c6445ee21c68676873075dd6a6c14d76b16eb14c49d6835a13e40a7
-  data.tar.gz: b64fa7daecfdee2dd08844cde10fc0795b45adcf801b70d11de5411172da41039013aa5c7ac06ce6523f46c2f2828eb55abc0de3a556f566902fb6b2016ee174
+  metadata.gz: e0980f847f2aed410c2e2224f1de2429c95fcacb3eb57ac6b32f75c0651e0bf45a5efe2841d2a4b2dc4631fde9988f3a551dc2403f67925e1301b9a29806a996
+  data.tar.gz: 3f22e626b4e4f3ae13f2c6d6b9be0b44c06f39093790d7170fb71c8195677c1b738ce1d3ce69073d2890448afb1d7bdb3022f1b3e031480b3b379d236b6c5c17

data/app/helpers/query_report_engine_helper.rb

@@ -46,4 +46,12 @@ module QueryReportEngineHelper
 
     tags.join("\n").html_safe
   end
+
+  def query_report_search_form(report, &block)
+    if report.array_record?
+      form_tag(url_for({}), (QueryReport.config.search_form_options || {}).merge({method: :get, remote: @remote}), &block)
+    else
+      search_form_for(report.search, url: url_for({}), remote: @remote, html: (QueryReport.config.search_form_options || {}).merge(method: :get), &block)
+    end
+  end
 end

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

@@ -2,8 +2,7 @@
    params_for_url.delete(:q)
    params_for_url.delete(:custom_search) %>
 
-<%= search_form_for report.search, url: url_for({}), remote: @remote,
-                    html: (QueryReport.config.search_form_options || {}).merge(method: :get) do |f| %>
+<%= query_report_search_form(report) do |f| %>
     <%= hash_to_hidden_fields params_for_url %>
     <% report.filters.each do |filter| %>
         <% filter.comparators.each do |comparator| %>
@@ -15,5 +14,5 @@
     <%= hidden_field_tag :subject %>
     <%= hidden_field_tag :message %>
     <%= hidden_field_tag :target_dom_id, @target_dom_id %>
-    <%= f.submit t('query_report.labels.search'), :class => QueryReport.config.search_button_class, :onclick => "$('#{@target_dom_id} #send_as_email').val(0);" %>
+    <%= submit_tag t('query_report.labels.search'), :class => QueryReport.config.search_button_class, :onclick => "$('#{@target_dom_id} #send_as_email').val(0);" %>
 <% end %>

data/lib/query_report/column.rb

@@ -134,7 +134,7 @@ module QueryReport
       end
 
       def humanize
-        @humanize ||= options[:as] || @report.model_class.human_attribute_name(name)
+        @humanize ||= options[:as] || (@report.model_class.human_attribute_name(name) unless @report.array_record?)
       end
 
       def value(record)

data/lib/query_report/record.rb

@@ -6,6 +6,10 @@ module QueryReport
       query.klass
     end
 
+    def array_record?
+      query.kind_of?(Array)
+    end
+
     def filtered_query
       apply
       @filtered_query
@@ -22,16 +26,18 @@ module QueryReport
     end
 
     def apply
-      @filtered_query ||= apply_filters(query.clone, @params)
-      @paginated_query ||= apply_pagination(@filtered_query, @params)
+      @filtered_query ||= array_record? ? query : apply_filters(query.clone, @params)
+      @paginated_query ||= array_record? ? query : apply_pagination(@filtered_query, @params)
     end
 
     def records
-      @records ||= map_record(paginated_query, true)
+      record_to_map = array_record? ? query : paginated_query
+      @records ||= map_record(record_to_map, true)
     end
 
     def all_records
-      @all_records ||= map_record(filtered_query, false)
+      record_to_map = array_record? ? query : filtered_query
+      @all_records ||= map_record(record_to_map, false)
     end
 
     def map_record(query, render_from_view)

data/lib/query_report/report.rb

@@ -41,6 +41,7 @@ module QueryReport
     end
 
     def paginate?
+      return false if array_record? #do not paginate on the array records
       return true if @options[:paginate].nil?
       @options[:paginate]
     end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google_visualr
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement