chicagowarehouse 0.4.6 → 0.4.7

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # The distinct extension won't work in Sequel 3.30 onwards at present.
-gem "sequel", ">= 3.34"
+gem "sequel", ">= 3.34", "< 4.7"
 gem "sequel_migration_builder", ">= 0.3.2"
 gem "chronic"
 

data/Rakefile

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

data/chicagowarehouse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = "2014-01-06"
+  s.date = "2014-03-13"
   s.description = "Simple Data Warehouse toolkit for ruby"
   s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [
@@ -83,14 +83,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/notonthehighstreet/chicago"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.28"
   s.summary = "Ruby Data Warehousing"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 3.34"])
+      s.add_runtime_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
       s.add_runtime_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
@@ -104,7 +104,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ZenTest>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
-      s.add_dependency(%q<sequel>, [">= 3.34"])
+      s.add_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
       s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
@@ -119,7 +119,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sequel>, [">= 3.34"])
+    s.add_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
     s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])

data/lib/chicago/schema/dimension.rb

@@ -58,6 +58,10 @@ module Chicago
         @columns = opts[:columns] || []
         @identifiers = opts[:identifiers] || []
         @null_records = opts[:null_records] || []
+        @null_records.product(columns).each do |record, column|
+          record[column.name] = column.default_value unless record.has_key?(column.name)
+        end
+
         @table_name = sprintf(DIMENSION_TABLE_FORMAT, name).to_sym
         @key_table_name = sprintf(KEY_TABLE_FORMAT, @table_name).to_sym
         @predetermined_values = !! opts[:predetermined_values]
@@ -74,12 +78,22 @@ module Chicago
       # create null records for a temporary version of the table.
       def create_null_records(db, overridden_table_name=nil)
         table_to_populate = overridden_table_name || table_name
+        
         unless @null_records.empty?
-          db[table_to_populate].insert_replace.
-            insert_multiple(@null_records)
-          if db.table_exists?(key_table_name)
-            ids = @null_records.map {|r| {:dimension_id => r[:id]} }
-            db[key_table_name].insert_replace.insert_multiple(ids)
+          begin
+            db[table_to_populate].insert_replace.
+              insert_multiple(@null_records)
+          rescue Exception => e
+            raise "Cannot populate null records for dimension #{name} (table #{table_to_populate})\n #{e.message}"
+          end
+
+          begin
+            if db.table_exists?(key_table_name)
+              ids = @null_records.map {|r| {:dimension_id => r[:id], :original_id => r[:original_id] || 0} }
+              db[key_table_name].insert_replace.insert_multiple(ids)
+            end
+          rescue Exception => e
+            raise "Cannot populate key table records for dimension #{name} (table #{table_to_populate})\n #{e.message}"
           end
         end
       end

data/spec/schema/dimension_spec.rb

@@ -14,7 +14,7 @@ describe Chicago::Schema::Dimension do
   it "can have a description" do
     described_class.new(:foo, :description => "bar").description.should == "bar"
   end
-  
+
   it "has columns" do
     column = stub(:column)
     described_class.new(:foo, :columns => [column]).
@@ -41,20 +41,32 @@ describe Chicago::Schema::Dimension do
     described_class.new(:user, :identifiers => identifiers).
       identifiers.should == identifiers
   end
-  
+
   it "can have a main identifier" do
     identifiers = [stub(:i), stub(:j)]
     described_class.new(:user, :identifiers => identifiers).
       main_identifier.should == identifiers.first
   end
 
+  it "has null records" do
+    column = stub(:column, :name => :bar, :default_value => '')
+
+    options = {
+      :columns => [column], 
+      :null_records => [{:id => 1}, {:id => 2, :bar => nil}]
+    }
+    
+    described_class.new(:user, options).
+      null_records.should == [{:id => 1, :bar => ''}, {:id => 2, :bar => nil}]
+  end
+
   it "can create null records in the database, replacing existing records" do
-    db = mock(:db)
+    db = mock(:db) 
     db.stub(:[]).and_return(db)
     db.stub(:table_exists?).with(:keys_dimension_user).and_return(true)
     db.should_receive(:insert_replace).twice.and_return(db)
     db.should_receive(:insert_multiple).with([{:id => 1, :foo => :bar}])
-    db.should_receive(:insert_multiple).with([{:dimension_id => 1}])
+    db.should_receive(:insert_multiple).with([{:dimension_id => 1, :original_id => 0}])
     described_class.new(:user,
                            :null_records => [{ :id => 1,
                                                :foo => :bar}]).create_null_records(db)
@@ -118,7 +130,7 @@ describe Chicago::Schema::Dimension do
   it "can have predetermined values" do
     described_class.new(:countries, :predetermined_values => true).should have_predetermined_values
   end
-  
+
   it "is visitable" do
     visitor = mock(:visitor)
     dimension = described_class.new(:foo)

data/spec/star_schema_spec.rb

@@ -24,15 +24,15 @@ describe Chicago::StarSchema do
     specify "can be defined with columns" do
       dimension = @schema.define_dimension(:user) do
         columns { string :email }
-      end      
+      end
       dimension.should have_column_named(:email)
     end
 
     specify "can define columns in multiple blocks" do
       dimension = @schema.define_dimension(:user) do
         columns { string :email }
-        columns { string :name }        
-      end      
+        columns { string :name }
+      end
       dimension.should have_column_named(:name)
     end
 
@@ -41,7 +41,7 @@ describe Chicago::StarSchema do
         columns { string :email }
 
         natural_key :email
-      end      
+      end
 
       dimension.natural_key.should == [:email]
     end
@@ -52,21 +52,21 @@ describe Chicago::StarSchema do
       end
       dimension.description.should == "Hello"
     end
-    
+
     specify "can have null records defined" do
       dimension = @schema.define_dimension(:user) do
         columns { string :email }
 
         null_record :id => 1, :email => "Missing"
-        null_record :id => 2, :email => "Not Applicable"
-      end      
+        null_record :id => 2, :email => "Not Applicable", :original_id => -1
+      end
 
       db = stub(:db, :table_exists? => true)
       db.stub_chain(:[], :insert_replace).and_return(db)
       db.should_receive(:insert_multiple).with([{:id => 1, :email => "Missing"},
-                                                {:id => 2, :email => "Not Applicable"}])
-      db.should_receive(:insert_multiple).with([{:dimension_id => 1},
-                                                {:dimension_id => 2}])
+                                                {:id => 2, :email => "Not Applicable", :original_id => -1}])
+      db.should_receive(:insert_multiple).with([{:dimension_id => 1, :original_id => 0},
+                                                {:dimension_id => 2, :original_id => -1}])
       dimension.create_null_records(db)
     end
 
@@ -110,7 +110,7 @@ describe Chicago::StarSchema do
       }.to raise_error(Chicago::MissingDefinitionError)
     end
   end
-  
+
   describe "facts" do
     specify "are not defined initially" do
       @schema.facts.should be_empty
@@ -192,7 +192,7 @@ describe Chicago::StarSchema do
       end
       fact.description.should == "Hello"
     end
-    
+
     specify "can have a natural key defined" do
       dim  = @schema.define_dimension(:date)
       fact = @schema.define_fact(:foo) do
@@ -200,11 +200,11 @@ describe Chicago::StarSchema do
 
         natural_key :date
       end
-      
+
       fact.natural_key.should == [:date]
     end
   end
-  
+
   it "allows definition of a fact and a dimension with the same name" do
     @schema.define_fact(:user)
     expect { @schema.define_dimension(:user) }.

metadata

@@ -1,218 +1,238 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chicagowarehouse
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.4.7
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 6
-  version: 0.4.6
 platform: ruby
-authors: 
+authors:
 - Roland Swingler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 67
-        segments: 
-        - 3
-        - 34
-        version: "3.34"
-  requirement: *id001
-  type: :runtime
-  prerelease: false
+date: 2014-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
-  requirement: *id002
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.34'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.34'
+- !ruby/object:Gem::Dependency
   name: sequel_migration_builder
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: chronic
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mysql2
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rcov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: flog
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ZenTest
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id013
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Data Warehouse toolkit for ruby
 email: roland.swingler@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -276,37 +296,31 @@ files:
 - spec/support/shared_examples/schema_visitor.rb
 - tasks/stats.rake
 homepage: http://github.com/notonthehighstreet/chicago
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2482122801910444787
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: Ruby Data Warehousing
 test_files: []
-