compendium 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec146d9508f108284dd9e6c0ebc8f6923b8ef28f
-  data.tar.gz: cd65c29f25480eb032eed1ddabed3beb7b042cdf
+  metadata.gz: 70ea06fc11dfdf1ec6b5ff0c8f3c3cbcdb047e3f
+  data.tar.gz: 9689e65a9366fa884b6f25ac25e595cd648c4e9d
 SHA512:
-  metadata.gz: 89688133b46136042dee8ae70d41c1b04627dcf61440ea8d198063a3d94e93422bc5d7271a756034296e318a4ca733e7bd26fcb1629ba3fa2f5e3417466d56a0
-  data.tar.gz: e45b2225269ced9fc313b52a3952f2d639b9603f60ae42dce6f159306014598e9e0eccd4522b48ef409566ed43e671fe800d6f7fcf980ff335832d6102b20ec6
+  metadata.gz: b8a0938d0199d1003aa34ae4e98983edc470616028b190c15346c3d1c9175483358b329c13f8cb9957ec00bba4198cc41aa5753b4a79810bc8037c40b58de368
+  data.tar.gz: 9d56fb0a805b5ad449727657e1a186cc75cf3102e1501095b5dcad7f1c737504c502cc7ce5077a1885541e151f9a74d7d3461afc520e909259005f711c821d63

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.2
+* Allow report options to be hidden
+* Allow the collection in a CollectionQuery to be generated at report runtime using a proc
+
 ## 1.2.1
 * Fix crash when converting a ResultSet to JSON when the results is a flat array
 * Remove haml implicit dependency

data/app/assets/stylesheets/compendium/report.css.scss

@@ -19,4 +19,10 @@
     font-weight: bold;
     color: #575757;
   }
-}
+
+  .option.hidden
+  {
+    display: none;
+    visibility: hidden;
+  }
+}

data/app/classes/compendium/presenters/option.rb

@@ -3,6 +3,7 @@ module Compendium::Presenters
     MISSING_CHOICES_ERROR = "choices must be specified"
 
     presents :option
+    delegate :hidden?, to: :option
 
     def name
       t("options.#{option.name}", cascade: { offset: 2 })
@@ -72,6 +73,10 @@ module Compendium::Presenters
       out
     end
 
+    def hidden_field(form)
+      form.hidden_field option.name
+    end
+
   private
 
     def date_field(form, include_time = false)
@@ -104,4 +109,4 @@ module Compendium::Presenters
       end
     end
   end
-end
+end

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

@@ -10,12 +10,18 @@
 
     <% 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) %>
+        <% if opt.hidden? %>
+          <div class="option hidden">
+            <%= opt.hidden_field(f) %>
           </div>
-        </div>
+        <% else %>
+          <div class="option">
+            <%= opt.label(f) %>
+            <div class="option-element-group">
+              <%= opt.input(self, f) %>
+            </div>
+          </div>
+        <% end %>
       <% end %>
     <% end %>
 

data/lib/compendium/collection_query.rb

@@ -31,13 +31,15 @@ module Compendium
       if collection.is_a?(Query)
         collection.run(params, context) unless collection.ran?
         collection.results
+      elsif collection.is_a?(Proc)
+        prepare_collection(collection.call(params))
       else
         collection
       end
     end
 
     def prepare_collection(collection)
-      return collection if collection.is_a?(Query) || collection.is_a?(Symbol)
+      return collection if collection.is_a?(Query) || collection.is_a?(Symbol) || collection.is_a?(Proc)
       collection.is_a?(Hash) ? collection : Hash[collection.zip(collection)]
     end
   end

data/lib/compendium/version.rb

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

data/spec/collection_query_spec.rb

@@ -42,5 +42,22 @@ describe Compendium::CollectionQuery do
         subject.run(nil)
       end
     end
+
+    context 'when given a proc' do
+      let(:proc) { -> * { [1, 2, 3] } }
+      subject { described_class.new(:collection, { collection: proc }, -> _, key, item { [ item * 2 ] }) }
+
+      it 'should use the collection from the proc' do
+        subject.run(nil)
+        subject.results.should == { 1 => [2], 2 => [4], 3 => [6] }
+      end
+
+      context do
+        let(:proc) { -> * { raise ArgumentError } }
+        it 'should not run the proc until runtime' do
+          expect { subject }.to_not raise_error
+        end
+      end
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compendium
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails