legacy_data 0.1.2 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/generators/models_from_tables/templates/model.rb

@@ -24,13 +24,17 @@ class <%= class_name -%> < ActiveRecord::Base
   <%- constraints[:boolean_presence].each do |col| 
       -%>  validates_inclusion_of    <%= col %>,       :in => %w(true false)
   <%- end -%>
-  <%= "validates_numericality_of #{constraints[:numericality_of].map {|cols| cols.downcase.to_sym.inspect}.join(', ')}" unless constraints[:numericality_of].blank? %>
+  <%- [:allow_nil, :do_not_allow_nil].each do |nullable| 
+        unless constraints[:numericality_of][nullable].blank?
+    -%>  <%= "validates_numericality_of #{constraints[:numericality_of][nullable].map {|cols| cols.downcase.to_sym.inspect}.join(', ')}" %><%= ", {:allow_nil=>true}" if nullable == :allow_nil %>
+  <%-   end
+      end unless constraints[:numericality_of].blank? -%>
   <%- constraints[:custom].each do |name, sql_rule| 
   -%>  validate <%= "validate_#{name}".to_sym.inspect %>
   def <%= "validate_#{name}" %>
     # TODO: validate this SQL constraint 
     "<%= sql_rule %>"
   end
-  <%- end %>
+  <%- end -%>
 end
 

data/legacy_data.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{legacy_data}
-  s.version = "0.1.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Rothenberg"]

data/lib/legacy_data/schema.rb

@@ -122,7 +122,7 @@ module LegacyData
       
         @constraints[:unique],           @constraints[:multi_column_unique] = uniqueness_constraints
         @constraints[:boolean_presence], @constraints[:presence_of]         = presence_constraints
-        @constraints[:numericality_of]                                      = integer_column_names
+        @constraints[:numericality_of]                                      = numericality_constraints
         @constraints[:custom]                                               = custom_constraints
       end
       @constraints
@@ -134,6 +134,13 @@ module LegacyData
       # 
     end
     
+    def numericality_constraints
+      allow_nil, do_not_allow_nil = integer_columns.partition do |column| 
+        column.null
+      end
+      {:allow_nil=>allow_nil.map(&:name), :do_not_allow_nil=>do_not_allow_nil.map(&:name)}
+    end
+
     def uniqueness_constraints
       unique, multi_column_unique = unique_constraints.partition do |columns| 
         columns.size == 1
@@ -151,8 +158,8 @@ module LegacyData
       columns.detect {|column| column.name == name }
     end
     
-    def integer_column_names
-      columns.select {|column| column.type == :integer }.map &:name
+    def integer_columns
+      columns.select {|column| column.type == :integer }
     end
 
     def columns

data/spec/expected/post.rb

@@ -8,7 +8,5 @@ class Post < ActiveRecord::Base
   # Constraints
   validates_uniqueness_of :title
   validates_presence_of :body
-  
-
 end
 

data/spec/functional/expected/comment.rb

@@ -7,7 +7,7 @@ class Comment < ActiveRecord::Base
   # Constraints
   
   
-  validates_numericality_of :id, :post_id
-
+  validates_numericality_of :post_id, {:allow_nil=>true}
+  validates_numericality_of :id
 end
 

data/spec/functional/expected/post.rb

@@ -8,6 +8,5 @@ class Post < ActiveRecord::Base
   
   
   validates_numericality_of :id
-
 end
 

data/spec/legacy_data/schema_spec.rb

@@ -112,16 +112,16 @@ describe LegacyData::Schema do
 
     describe 'constraints' do
       it 'should have the different types of constraints' do
-        @schema.stub!(:uniqueness_constraints).and_return([unique          =[mock], multi_column_unique=[mock]])
-        @schema.stub!(:presence_constraints  ).and_return([boolean_presence=[mock], presence_of        =[mock]])
-        @schema.stub!(:integer_column_names  ).and_return(int_col_names   =[mock])
-        @schema.stub!(:custom_constraints    ).and_return(custom          =[mock])
+        @schema.stub!(:uniqueness_constraints  ).and_return([unique          =[mock], multi_column_unique=[mock]])
+        @schema.stub!(:presence_constraints    ).and_return([boolean_presence=[mock], presence_of        =[mock]])
+        @schema.stub!(:numericality_constraints).and_return(numericality={}                                      )
+        @schema.stub!(:custom_constraints      ).and_return(custom          =[mock])
 
         @schema.constraints.should == {:unique             =>unique,
                                        :multi_column_unique=>multi_column_unique,
                                        :boolean_presence   =>boolean_presence,
                                        :presence_of        =>presence_of,
-                                       :numericality_of    =>int_col_names,
+                                       :numericality_of    =>numericality,
                                        :custom             =>custom }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: legacy_data
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alex Rothenberg