compendium 1.1.3.4 → 1.2.0

data/spec/query_spec.rb

@@ -27,11 +27,19 @@ describe Compendium::Query do
   end
 
   describe "#run" do
-    let(:query) { described_class.new(:test, {}, -> * { [1, 2, 3] }) }
-    before { query.stub(:fetch_results) { |c| c } }
+    let(:command) { -> * { [{ value: 1 }, { value: 2 }] } }
+    let(:query) do
+      described_class.new(:test, {}, command)
+    end
+
+    before do
+      query.stub(:fetch_results) { |c| c }
+    end
 
     it "should return the result of the query" do
-      query.run(nil).should == [1, 2, 3]
+      results = query.run(nil)
+      results.should be_a Compendium::ResultSet
+      results.to_a.should == [{ 'value' => 1 }, { 'value' => 2 }]
     end
 
     it "should mark the query as having ran" do
@@ -51,14 +59,53 @@ describe Compendium::Query do
     end
 
     it "should filter the result set if a filter is provided" do
-      query.add_filter(-> data { data.reject(&:odd?) })
-      query.run(nil).should == [2]
+      query.add_filter(-> data { data.reject{ |d| d[:value].odd? } })
+      query.run(nil).to_a.should == [{ 'value' => 2 }]
     end
 
     it "should run multiple filters if given" do
-      query.add_filter(-> data { data.reject(&:odd?) })
-      query.add_filter(-> data { data.reject(&:even?) })
-      query.run(nil).should == []
+      query.add_filter(-> data { data.reject{ |d| d[:value].odd? } })
+      query.add_filter(-> data { data.reject{ |d| d[:value].even? } })
+      query.run(nil).should be_empty
+    end
+
+    it 'should allow the result set to be a single hash when filters are present' do
+      query = described_class.new(:test, {}, -> * { { value1: 1, value2: 2, value3: 3 } })
+      query.stub(:fetch_results) { |c| c }
+
+      query.add_filter(-> d { d })
+      query.run(nil)
+      query.results.records.should == { value1: 1, value2: 2, value3: 3 }.with_indifferent_access
+    end
+
+    context 'ordering' do
+      let(:cmd) do
+        cmd = double('Command')
+        cmd.stub(order: cmd, reverse_order: cmd)
+        cmd
+      end
+
+      let(:command) do
+        -> c { -> * { c } }.(cmd)
+      end
+
+      before { query.options[:order] = 'col1' }
+
+      it 'should order the query' do
+        cmd.should_receive(:order)
+        query.run(nil)
+      end
+
+      it 'should not reverse the order by default' do
+        cmd.should_not_receive(:reverse_order)
+        query.run(nil)
+      end
+
+      it 'should reverse order if the query is given reverse: true' do
+        query.options[:reverse] = true
+        cmd.should_receive(:reverse_order)
+        query.run(nil)
+      end
     end
 
     context "when the query belongs to a report class" do

data/spec/report_spec.rb

@@ -288,7 +288,7 @@ describe Compendium::Report do
     end
 
     it 'should add filters by inheritence' do
-      subclass3.main_query.filters.should include filter_proc
+      subclass3.main_query.filters.should_not be_empty
     end
 
     it 'should not bleed filters from a subclass into other subclasses' do
@@ -296,4 +296,27 @@ describe Compendium::Report do
       subclass2.main_query.filters.should be_empty
     end
   end
+
+  describe '#exports?' do
+    let(:report_class) do
+      Class.new(described_class) do
+        exports :csv, :main_query
+        exports :pdf, false
+      end
+    end
+
+    subject { report_class.new }
+
+    it 'should return true if there is an export for the given type' do
+      subject.exports?(:csv).should be_true
+    end
+
+    it 'should return false if there is no export for the given type explicitly' do
+      subject.exports?(:pdf).should be_false
+    end
+
+    it 'should return false if there is no export for the given type implicitly' do
+      subject.exports?(:xls).should be_false
+    end
+  end
 end

data/spec/sum_query_spec.rb

@@ -9,14 +9,37 @@ class SingleSummer
 end
 
 class MultipleSummer
+  def order(*)
+    @order = true
+    self
+  end
+
+  def reverse_order
+    @reverse = true
+    self
+  end
+
   def sum(col)
-    { 1 => 123, 2 => 456, 3 => 789 }
+    results = { 1 => 340, 2 => 204, 3 => 983 }
+
+    if @order
+      results = results.sort_by{ |r| r[1] }
+      results.reverse! if @reverse
+      results = Hash[results]
+    end
+
+    results
   end
 end
 
 describe Compendium::SumQuery do
   subject { described_class.new(:counted_query, :col, { sum: :col }, -> * { @counter }) }
 
+  it 'should have a default order' do
+    subject.options[:order].should == 'SUM(col)'
+    subject.options[:reverse].should == true
+  end
+
   describe "#run" do
     it "should call sum on the proc result" do
       @counter = SingleSummer.new
@@ -29,14 +52,26 @@ describe Compendium::SumQuery do
       subject.run(nil, self).should == [1792]
     end
 
-    it "should return a hash if given" do
-      @counter = MultipleSummer.new
-      subject.run(nil, self).should == { 1 => 123, 2 => 456, 3 => 789 }
+    context 'when given a hash' do
+      before { @counter = MultipleSummer.new }
+
+      it "should return a hash if given" do
+        subject.run(nil, self).should == { 3 => 983, 1 => 340, 2 => 204 }
+      end
+
+      it 'should be ordered in descending order' do
+        subject.run(nil, self).keys.should == [3, 1, 2]
+      end
+
+      it 'should use the given options' do
+        subject.options[:reverse] = false
+        subject.run(nil, self).keys.should == [2, 1, 3]
+      end
     end
 
     it "should raise an error if the proc does not respond to sum" do
       @counter = Class.new
-      expect { subject.run(nil, self) }.to raise_error Compendium::SumQuery::InvalidCommand
+      expect { subject.run(nil, self) }.to raise_error Compendium::InvalidCommand
     end
   end
 end

metadata

@@ -1,99 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: compendium
 version: !ruby/object:Gem::Version
-  version: 1.1.3.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: collection_of
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: inheritable_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
 description: Ruby on Rails reporting framework
 email:
 - dvandersluis@selfmgmt.com
@@ -101,7 +133,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -112,6 +145,7 @@ files:
 - app/assets/stylesheets/compendium/report.css.scss
 - app/classes/compendium/presenters/base.rb
 - app/classes/compendium/presenters/chart.rb
+- app/classes/compendium/presenters/csv.rb
 - app/classes/compendium/presenters/metric.rb
 - app/classes/compendium/presenters/option.rb
 - app/classes/compendium/presenters/query.rb
@@ -125,9 +159,10 @@ files:
 - app/views/compendium/reports/setup.haml
 - compendium.gemspec
 - config/initializers/rails/active_record/connection_adapters/quoting.rb
-- config/initializers/ruby/hash.rb
 - config/initializers/ruby/numeric.rb
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
 - lib/compendium.rb
 - lib/compendium/abstract_chart_provider.rb
 - lib/compendium/collection_query.rb
@@ -136,6 +171,7 @@ files:
 - lib/compendium/dsl.rb
 - lib/compendium/engine.rb
 - lib/compendium/engine/mount.rb
+- lib/compendium/errors.rb
 - lib/compendium/metric.rb
 - lib/compendium/open_hash.rb
 - lib/compendium/option.rb
@@ -157,7 +193,11 @@ files:
 - spec/params_spec.rb
 - spec/presenters/base_spec.rb
 - spec/presenters/chart_spec.rb
+- spec/presenters/csv_spec.rb
 - spec/presenters/option_spec.rb
+- spec/presenters/settings/query_spec.rb
+- spec/presenters/settings/table_spec.rb
+- spec/presenters/table_spec.rb
 - spec/query_spec.rb
 - spec/report_spec.rb
 - spec/result_set_spec.rb
@@ -174,17 +214,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails reporting framework
@@ -199,11 +239,14 @@ test_files:
 - spec/params_spec.rb
 - spec/presenters/base_spec.rb
 - spec/presenters/chart_spec.rb
+- spec/presenters/csv_spec.rb
 - spec/presenters/option_spec.rb
+- spec/presenters/settings/query_spec.rb
+- spec/presenters/settings/table_spec.rb
+- spec/presenters/table_spec.rb
 - spec/query_spec.rb
 - spec/report_spec.rb
 - spec/result_set_spec.rb
 - spec/spec_helper.rb
 - spec/sum_query_spec.rb
 - spec/through_query_spec.rb
-has_rdoc: 

data/config/initializers/ruby/hash.rb

@@ -1,6 +0,0 @@
-class Hash
-  # Remove nil values
-  def compact
-    delete_if{ |_, v| v.blank? }
-  end unless method_defined?(:compact)
-end