chicagowarehouse 0.3.2 → 0.3.3

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.3.2"
+  gem.version           = "0.3.3"
   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 = %q{chicagowarehouse}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roland Swingler}]
-  s.date = %q{2012-10-29}
+  s.date = %q{2012-10-30}
   s.description = %q{Simple Data Warehouse toolkit for ruby}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [

data/lib/chicago/database/dataset_builder.rb

@@ -66,7 +66,7 @@ module Chicago
         
         unless to_join.empty?
           @dataset = to_join.inject(@dataset) do |dataset, t|
-            dataset.join(t.table_name.as(t.name), :id => t.key_name.qualify(@base_table.name))
+            dataset.join(t.table_name.as(t.name), :id => t.database_name.qualify(@base_table.name))
           end
         end
       end

data/lib/chicago/database/schema_generator.rb

@@ -91,7 +91,7 @@ module Chicago
       def indexes
         indexes = @table.columns.select(&:indexed?).inject({}) do |hsh, d|
           hsh.merge("#{d.name}_idx".to_sym => {
-                      :columns => d.key_name,
+                      :columns => d.database_name,
                       :unique => false})
         end
         indexes.merge!(natural_key_index) if @table.natural_key
@@ -109,7 +109,7 @@ module Chicago
 
       def natural_key_index_columns
         @table.natural_key.map do |name|
-          @table[name].key_name rescue raise MissingDefinitionError.new("Column #{name} is not defined in #{@table.name}")
+          @table[name].database_name rescue raise MissingDefinitionError.new("Column #{name} is not defined in #{@table.name}")
         end
       end
     end

data/lib/chicago/schema/column.rb

@@ -97,7 +97,7 @@ module Chicago
 
       attr_reader :countable_label
 
-      alias :key_name :name
+      alias :database_name :name
       
       # Returns true if this column can be counted.
       def countable?

data/lib/chicago/schema/dimension_reference.rb

@@ -9,8 +9,6 @@ module Chicago
       extend Forwardable
 
       def_delegators :@dimension, :columns, :column_definitions, :identifiers, :main_identifier, :identifiable?, :original_key, :natural_key, :table_name, :[], :key_table_name
-
-      attr_reader :key_name
       
       def initialize(name, dimension, opts={})
         super name, :integer, opts.merge(:min => 0)
@@ -19,9 +17,14 @@ module Chicago
         @key_name   = opts[:key_name] || "#{@name}_dimension_id".to_sym
       end
 
+      # Returns the key name of this dimension.
+      def database_name
+        @key_name
+      end
+
       def to_hash
         hsh = super
-        hsh[:name] = @key_name
+        hsh[:name] = database_name
         hsh
       end
       
@@ -30,7 +33,7 @@ module Chicago
       end
 
       def qualify_by(table)
-        @key_name.qualify(table)
+        database_name.qualify(table)
       end
 
       # Returns the first null record id for this dimension, or 0 if

data/spec/schema/dimension_reference_spec.rb

@@ -59,8 +59,9 @@ describe Chicago::Schema::DimensionReference do
     described_class.new(:foo, @dimension).column_type.should == :integer
   end
 
-  it "should have a key name" do
-    described_class.new(:foo, @dimension).key_name.should == :foo_dimension_id
+  it "has the key column as the database name" do
+    described_class.new(:foo, @dimension).database_name.
+      should == :foo_dimension_id
   end
 
   it "qualfies a column based on the column name" do
@@ -70,7 +71,8 @@ describe Chicago::Schema::DimensionReference do
   end
 
   it "can be qualified, and qualifies the key name" do
-    described_class.new(:foo, @dimension).qualify_by(:facts_bar).should == :foo_dimension_id.qualify(:facts_bar)
+    described_class.new(:foo, @dimension).qualify_by(:facts_bar).
+      should == :foo_dimension_id.qualify(:facts_bar)
   end
 
   it "should be considered a kind of dimension" do
@@ -78,7 +80,8 @@ describe Chicago::Schema::DimensionReference do
   end
 
   it "can override the key selected as the reference" do
-    described_class.new(:foo, @dimension, :key_name => :baz_dimension_id).key_name.should ==:baz_dimension_id
+    described_class.new(:foo, @dimension, :key_name => :baz_dimension_id).
+      database_name.should ==:baz_dimension_id
   end
 
   it "uses the first null record id as the default value" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chicagowarehouse
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Roland Swingler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 Z
+date: 2012-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement