chicagowarehouse 0.4.4 → 0.4.5

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.4.4"
+  gem.version           = "0.4.5"
   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.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = "2013-07-24"
+  s.date = "2013-09-16"
   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.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.15"
   s.summary = "Ruby Data Warehousing"
 
   if s.respond_to? :specification_version then

data/lib/chicago/schema/builders/dimension_builder.rb

@@ -65,5 +65,15 @@ module Chicago::Schema::Builders
     def has_predetermined_values
       @options[:predetermined_values] = true
     end
+
+    # Defines this dimension as uncountable.
+    #
+    # By default, dimensions are considered countable entities if they
+    # have an original_id column. In some cases, a dimension may be
+    # identifiable by this column, but still not semantically be a
+    # countable entity.
+    def uncountable
+      @options[:uncountable] = true
+    end
   end
 end

data/lib/chicago/schema/dimension.rb

@@ -61,6 +61,7 @@ module Chicago
         @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]
+        @countable = !opts[:uncountable]
         check_null_records
       end
 
@@ -96,6 +97,11 @@ module Chicago
         !! original_key
       end
 
+      # Returns true if these dimension entries can be counted.
+      def countable?
+        @countable && identifiable?
+      end
+
       # Returns true if the set of values for this dimension is
       # pretermined.
       #

data/lib/chicago/schema/dimension_reference.rb

@@ -8,7 +8,7 @@ module Chicago
     class DimensionReference < Column
       extend Forwardable
 
-      def_delegators :@dimension, :columns, :column_definitions, :identifiers, :main_identifier, :identifiable?, :original_key, :natural_key, :table_name, :[], :key_table_name
+      def_delegators :@dimension, :columns, :column_definitions, :identifiers, :main_identifier, :identifiable?, :original_key, :natural_key, :table_name, :[], :key_table_name, :countable?
       
       def initialize(name, dimension, opts={})
         super name, :integer, opts.merge(:min => 0)
@@ -17,6 +17,10 @@ module Chicago
         @key_name   = opts[:key_name] || "#{@name}_dimension_id".to_sym
       end
 
+      def countable_label
+        "No. of #{label.pluralize}"
+      end
+      
       # Returns the key name of this dimension.
       def database_name
         @key_name

data/spec/schema/dimension_reference_spec.rb

@@ -36,6 +36,16 @@ describe Chicago::Schema::DimensionReference do
     described_class.new(:foo, @dimension).original_key.should == :result
   end
 
+  it "returns countable from the dimension" do
+    @dimension.should_receive(:countable?).and_return(true)
+    described_class.new(:foo, @dimension).should be_countable
+  end
+
+  it "has a countable label" do
+    described_class.new(:foo, @dimension).countable_label.
+      should == "No. of Foos"
+  end
+
   it "returns natural_key from the dimension" do
     @dimension.should_receive(:natural_key).and_return(:result)
     described_class.new(:foo, @dimension).natural_key.should == :result

data/spec/schema/dimension_spec.rb

@@ -103,6 +103,18 @@ describe Chicago::Schema::Dimension do
     described_class.new(:user, :columns => [column]).should be_identifiable
   end
 
+  it "is considered countable if it has an original key [DEPRECATED]" do
+    column = stub(:c, :name => :original_id)
+    described_class.new(:user, :columns => [column]).should be_countable
+    described_class.new(:user, :columns => []).should_not be_countable
+  end
+
+  it "can be marked as uncountable" do
+    column = stub(:c, :name => :original_id)
+    described_class.new(:user, :columns => [column],
+                        :uncountable => true).should_not be_countable
+  end
+
   it "can have predetermined values" do
     described_class.new(:countries, :predetermined_values => true).should have_predetermined_values
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chicagowarehouse
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Roland Swingler
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-24 00:00:00 Z
+date: 2013-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,11 +31,11 @@ dependencies:
         - 0
         version: "3.0"
   name: sequel
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,11 +47,11 @@ dependencies:
         - 2
         version: 0.3.2
   name: sequel_migration_builder
-  prerelease: false
-  type: :runtime
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -61,11 +63,11 @@ dependencies:
         - 1
         version: 2.8.1
   name: mysql
-  prerelease: false
-  type: :runtime
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,11 +77,11 @@ dependencies:
         - 0
         version: "0"
   name: chronic
-  prerelease: false
-  type: :runtime
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +91,11 @@ dependencies:
         - 0
         version: "0"
   name: yard
-  prerelease: false
-  type: :development
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,11 +106,11 @@ dependencies:
         - 0
         version: "2.0"
   name: rspec
-  prerelease: false
-  type: :development
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,11 +120,11 @@ dependencies:
         - 0
         version: "0"
   name: bundler
-  prerelease: false
-  type: :development
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,11 +134,11 @@ dependencies:
         - 0
         version: "0"
   name: jeweler
-  prerelease: false
-  type: :development
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -146,11 +148,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  prerelease: false
-  type: :development
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,11 +162,11 @@ dependencies:
         - 0
         version: "0"
   name: flog
-  prerelease: false
-  type: :development
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,11 +176,11 @@ dependencies:
         - 0
         version: "0"
   name: ZenTest
-  prerelease: false
-  type: :development
-  requirement: *id011
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -188,9 +190,7 @@ dependencies:
         - 0
         version: "0"
   name: timecop
-  prerelease: false
-  type: :development
-  requirement: *id012
+  version_requirements: *id012
 description: Simple Data Warehouse toolkit for ruby
 email: roland.swingler@gmail.com
 executables: []
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby Data Warehousing