chicagowarehouse 0.4.1 → 0.4.2

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.4.1"
+  gem.version           = "0.4.2"
   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.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = "2013-04-03"
+  s.date = "2013-04-16"
   s.description = "Simple Data Warehouse toolkit for ruby"
   s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [

data/lib/chicago/database/type_converters.rb

@@ -28,6 +28,7 @@ module Chicago
           when :string  then string_type(column.min, column.max)
           when :money   then :decimal
           when :percent then :decimal
+          when :hash    then :binary
           else
             column.column_type
           end
@@ -71,7 +72,7 @@ module Chicago
       class MysqlTypeConverter < DbTypeConverter
         def db_type(column)
           return :enum if column.elements && column.elements.size < 65_536
-          super
+          super(column)
         end
 
         # Returns table options for a dimension or fact table.

data/lib/chicago/schema/column.rb

@@ -52,8 +52,11 @@ module Chicago
         @elements    = @opts[:elements]
         @default     = @opts[:default]
         @descriptive = !! @opts[:descriptive]
-        @internal    = !! @opts[:internal]
-        @optional    = !! (@opts.has_key?(:optional) ? @opts[:optional] : @opts[:null])
+        @internal    = @opts.has_key?(:internal) ? !! @opts[:internal] : 
+          column_type == :hash
+        @unique      = !! @opts[:unique]
+        @optional    = !! (@opts.has_key?(:optional) ? @opts[:optional] : 
+                           @opts[:null])
       end
 
       # Returns the type of this column. This is an abstract type,
@@ -134,6 +137,10 @@ module Chicago
         @descriptive
       end
 
+      def unique?
+        @unique
+      end
+
       # Returns true if both definition's attributes are equal.
       def ==(other)
         other.kind_of?(self.class) && 
@@ -152,6 +159,11 @@ module Chicago
         @textual ||= [:string, :text].include?(column_type)
       end
 
+      # Returns true if the column stores a binary value.
+      def binary?
+        @binary ||= [:binary, :hash].include?(column_type)
+      end
+
       def hash #:nodoc:
         name.hash
       end
@@ -196,6 +208,8 @@ module Chicago
                     [12,2]
                   elsif column_type == :percent
                     [6,3]
+                  elsif column_type == :hash
+                    16
                   end
       end
       
@@ -210,7 +224,7 @@ module Chicago
       end
 
       def default_null(type)
-        [:date, :timestamp, :datetime].include?(type)
+        [:date, :timestamp, :datetime, :hash, :binary].include?(type)
       end
 
       def default_min(type)

data/spec/database/db_type_converter_spec.rb

@@ -31,6 +31,11 @@ shared_examples_for "All DB type converters" do
       @tc.db_type(column).should == :decimal
     end
 
+    it "should return :binary for a hash column type" do
+      column = Schema::Column.new(:id, :hash)
+      @tc.db_type(column).should == :binary
+    end
+
     it "should assume any other type is a database type and return it" do
       column = Schema::Column.new(:id, :foo)
       @tc.db_type(column).should == :foo

data/spec/schema/column_spec.rb

@@ -148,7 +148,27 @@ describe Chicago::Schema::Column do
     described_class.new(:foo, :string, :null => true, :optional => false).
       should_not be_optional
   end
+
+  it "can be unique" do
+    described_class.new(:foo, :string, :unique => true).
+      should be_unique
+
+    described_class.new(:foo, :string).
+      should_not be_unique
+  end
   
+  it "is binary if a hash" do
+    described_class.new(:foo, :hash).should be_binary
+  end
+
+  it "is nullable by default if a hash" do
+    described_class.new(:foo, :hash).should be_null
+  end
+
+  it "is internal by default if a hash" do
+    described_class.new(:foo, :hash).should be_internal
+  end
+
   it "is visitable" do
     visitor = mock(:visitor)
     column = described_class.new(:foo, :integer)
@@ -157,7 +177,7 @@ describe Chicago::Schema::Column do
   end
 end
 
-describe "Chicago::Schema::Column#hash" do
+describe "Chicago::Schema::Column#to_hash" do
   it "should have a :name entry" do
     Chicago::Schema::Column.new(:username, :string, :max => 8).to_hash[:name].should == :username
   end
@@ -194,6 +214,10 @@ describe "Chicago::Schema::Column#hash" do
     Chicago::Schema::Column.new(:some_value, :money).to_hash[:size].should == [12,2]
   end
 
+  it "should have a default :size of 16 for hash types" do
+    Chicago::Schema::Column.new(:some_value, :hash).to_hash[:size].should == 16
+  end
+
   it "should be unsigned by default if a percentage" do
     Chicago::Schema::Column.new(:some_value, :percent).to_hash[:unsigned].should be_true
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chicagowarehouse
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Roland Swingler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-03 00:00:00 Z
+date: 2013-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement