chicagowarehouse 0.6.5 → 0.6.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTNlNjg1NDBiNTQwOTY3ZGQyNjczNmFlMDQ0NDNjOGM4OTZmMzY5Mw==
-  data.tar.gz: !binary |-
-    ZDBhMTYxYWYzMGIxMmUwOWFmYWUxOGI3MDdjYWRiZGZhM2JkZTZlZA==
+SHA1:
+  metadata.gz: 5a54a10415694e7c293cf98d338f1ec7e29343cc
+  data.tar.gz: 65d485e97187351d7dc90cada98956f43a424eb9
 SHA512:
-  metadata.gz: !binary |-
-    OTVjOTEwMTNkOWY4N2Y5NmU5OWY1NGNlYjMwMDBjMjdlOTI4NDI3M2NiNjcy
-    MDVjNTc0ZTJjZjAxNzI5NmQ1YTkwMDI3MDAzMTMwNzk0MjUzYjlmZDAxNWRj
-    OTJkZjBlNzRjN2I1YmQ3Y2NlNjUyMGUwOGRlOTk4MTk5MzFiOTg=
-  data.tar.gz: !binary |-
-    ZWY3YTQ0NTNjYTNkMmI2ZGQzZTg3MzI3Mzg3ODU3ZGZjZTdjODcwZWUxODFi
-    YzU1ZDlhZTQxZDFiNDY5YTg1MzU5YjQ2ODQyYzc0MzBjMGI2ZTBkNzc3Y2Ex
-    ZjY1NTQxODhmNTQzZTgwY2Q5OGNlMzExZmE0MjgyMzI5ZmY1MjE=
+  metadata.gz: f3412a1bf3b456d3e1c47e36990366144390ea6a85d78f753f35e6fb76ab441ecd3bc6ccf024e205231405a25b01a80aae36f2144a807a9f7dadab8488d0926a
+  data.tar.gz: ca7b1e11af675ce66af8c81511f34768c00072cc277f2925548916165ca15736cf43fa49e68467111da6b767c925cd527cc98544cbaa2fc3f296603b864e6c19

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.6.5"
+  gem.version           = "0.6.6"
   gem.summary           = "Ruby Data Warehousing"
   gem.description       = "Simple Data Warehouse toolkit for ruby"
   gem.author            = "Roland Swingler"

data/chicagowarehouse.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: chicagowarehouse 0.6.5 ruby lib
+# stub: chicagowarehouse 0.6.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roland Swingler"]
-  s.date = "2014-09-08"
+  s.date = "2014-09-18"
   s.description = "Simple Data Warehouse toolkit for ruby"
   s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/notonthehighstreet/chicago"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby Data Warehousing"
 
   if s.respond_to? :specification_version then

data/lib/chicago/schema/query_column.rb

@@ -95,6 +95,10 @@ module Chicago
 
     # Allows querying a column that doesn't exist in the database, but
     # is defined as a calculation in the column definition.
+    #
+    # Virtual columns are currently assumed to be calculated measures
+    # - filters will appear in the HAVING clause, not the WHERE clause
+    # of the SQL statement.
     class VirtualColumn < QualifiedColumn
       def initialize(owner, column, column_alias)
         super(owner, column, column_alias)
@@ -104,6 +108,10 @@ module Chicago
       def group_name
         nil
       end
+
+      def filter_dataset(ds, filter)
+        ds.having(filter)
+      end
     end
 
     # @abstract

data/spec/query_spec.rb

@@ -471,6 +471,11 @@ describe Chicago::Query do
         sql.should =~ /HAVING \(sum\(`sales`\.`total`\) = 2\)/
     end
 
+    it "filters in the having clause when a virtual calculated column is filtered" do
+      @q.filter({:column => "sales.vat", :value => 2, :op => :gte}).dataset.
+        sql.should =~ /HAVING \(\(sum\(`total`\) \* `vat_rate`\) >= 2\)/
+    end
+
     describe "#columns" do
       it "returns an empty array if no columns are selected" do
         @q.columns.should be_empty

metadata

@@ -1,173 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: chicagowarehouse
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Roland Swingler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC43
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC43
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: sequel_migration_builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC40LjM=
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC40LjM=
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   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: yard
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: jeweler
   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: simplecov
   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: flog
   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: timecop
   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'
 description: Simple Data Warehouse toolkit for ruby
@@ -178,8 +172,8 @@ extra_rdoc_files:
 - LICENSE
 - README
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README
@@ -249,17 +243,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.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Data Warehousing