compendium 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4bf2931ee1fe86a8844273e9219577c865fa9e7
-  data.tar.gz: 5f75cd47f1a38914d32850ce28b37341a536c36e
+  metadata.gz: ec146d9508f108284dd9e6c0ebc8f6923b8ef28f
+  data.tar.gz: cd65c29f25480eb032eed1ddabed3beb7b042cdf
 SHA512:
-  metadata.gz: '09afd485514be265abc5af4600fad2ef3054650160ea351658ea27aa325e3b90e9b81b88d138394568bb5abf652d79cb90e40907662f739503d3a4cf4a31be7a'
-  data.tar.gz: 8eb6644a34e973139131469c3c069fbd518f62ed7bd3ba0afebebeb8ea27a09f1d6f8a9da433ec62987d7c814ddb08d588b433ef888adfad98e5b3e2b86c1d8d
+  metadata.gz: 89688133b46136042dee8ae70d41c1b04627dcf61440ea8d198063a3d94e93422bc5d7271a756034296e318a4ca733e7bd26fcb1629ba3fa2f5e3417466d56a0
+  data.tar.gz: e45b2225269ced9fc313b52a3952f2d639b9603f60ae42dce6f159306014598e9e0eccd4522b48ef409566ed43e671fe800d6f7fcf980ff335832d6102b20ec6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.1
+* Fix crash when converting a ResultSet to JSON when the results is a flat array
+* Remove haml implicit dependency
+
 ## 1.2.0
 * Added the ability to render a query to CSV, and a controller action for downloading the CSV
 * Added `exports` report setting

data/app/views/compendium/reports/_metric.erb

@@ -0,0 +1,5 @@
+<div class="metric" id="<%= metric.label.parameterize %>">
+  <div class="metric-label"><%= metric.label %></div>
+  <div class="metric-data"><%= metric.result %></div>
+  <div class="metric-label-small"><%= metric.description %></div>
+</div>

data/app/views/compendium/reports/run.erb

@@ -0,0 +1 @@
+<%= t(:results, report_name: @prefix) %>

data/app/views/compendium/reports/setup.erb

@@ -0,0 +1,39 @@
+<% content_for :stylesheets do %>
+  <%= stylesheet_link_tag 'compendium/options' %>
+<% end %>
+
+<%= render_if_exists partial: 'report_header', path: 'compendium/reports' %>
+
+<div class="options">
+  <%= form_for report, as: :report, url: compendium_reports_run_path, html: { id: 'setup_report_form' } do |f| %>
+    <%= hidden_field_tag :format, :html %>
+
+    <% report.options.each do |option| %>
+      <% expose option, Compendium::Presenters::Option do |opt| %>
+        <div class="option">
+          <%= opt.label(f) %>
+          <div class="option-element-group">
+            <%= opt.input(self, f) %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="option">
+      <%= f.submit t(:generate_report, scope: 'compendium.reports'), onclick: "set_format('html')" %>
+      <% if report.exports?(:csv) %>
+        <%= f.submit t(:export_csv, scope: 'compendium.reports'), name: :export, onclick: "set_format('csv')" %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
+<script type="text/javascript">
+  function set_format(format)
+  {
+    var form = document.getElementById('setup_report_form'),
+        input = form.querySelector('input#format[type=hidden]');
+
+    input.value = format;
+  }
+</script>

data/lib/compendium/result_set.rb

@@ -25,7 +25,8 @@ module Compendium
     end
 
     def as_json(options = {})
+      return records unless records.first.respond_to?(:except)
       records.map{ |r| r.except(*options[:except]) }
     end
   end
-end
+end

data/lib/compendium/version.rb

@@ -1,3 +1,3 @@
 module Compendium
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compendium
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,9 +154,9 @@ files:
 - app/classes/compendium/presenters/table.rb
 - app/controllers/compendium/reports_controller.rb
 - app/helpers/compendium/reports_helper.rb
-- app/views/compendium/reports/_metric.haml
-- app/views/compendium/reports/run.haml
-- app/views/compendium/reports/setup.haml
+- app/views/compendium/reports/_metric.erb
+- app/views/compendium/reports/run.erb
+- app/views/compendium/reports/setup.erb
 - compendium.gemspec
 - config/initializers/rails/active_record/connection_adapters/quoting.rb
 - config/initializers/ruby/numeric.rb

data/app/views/compendium/reports/_metric.haml

@@ -1,5 +0,0 @@
-.metric{ id: metric.label.parameterize }
-  .metric-label
-    = metric.label
-  .metric-data= metric.result
-  .metric-label-small= metric.description

data/app/views/compendium/reports/run.haml

@@ -1 +0,0 @@
-= t(:results, report_name: @prefix)

data/app/views/compendium/reports/setup.haml

@@ -1,28 +0,0 @@
-- content_for :stylesheets do
-  = stylesheet_link_tag 'compendium/options'
-
-= render_if_exists partial: 'report_header', path: 'compendium/reports'
-
-.options
-  = form_for report, as: :report, url: compendium_reports_run_path, html: { id: 'setup_report_form' } do |f|
-    = hidden_field_tag :format, :html
-
-    - report.options.each do |option|
-      - expose option, Compendium::Presenters::Option do |opt|
-        .option
-          = opt.label(f)
-          .option-element-group= opt.input(self, f)
-
-    .option
-      = f.submit t(:generate_report, scope: 'compendium.reports'), onclick: "set_format('html')"
-      - if report.exports?(:csv)
-        = f.submit t(:export_csv, scope: 'compendium.reports'), name: :export, onclick: "set_format('csv')"
-
-:javascript
-  function set_format(format)
-  {
-    var form = document.getElementById('setup_report_form'),
-        input = form.querySelector('input#format[type=hidden]');
-
-    input.value = format;
-  }