legacy_data 0.1.8 → 0.1.9

data/spec/legacy_data/schema_spec.rb

@@ -98,13 +98,17 @@ describe LegacyData::Schema do
       end
   
       it 'should give no "belongs_to" when the adapter does not support foreign keys' do
-        @connection.should_receive(:respond_to?).with(:foreign_keys_for).and_return(false)
+        @connection.should_receive(:respond_to?).with(:foreign_keys).and_return(false)
         @schema.belongs_to_relations.should == {}
       end
   
       it 'should get all "belongs_to" relationships when a foreign key is in my table' do
-        @connection.should_receive(:respond_to?).with(:foreign_keys_for).and_return(true)
-        @connection.should_receive(:foreign_keys_for).and_return([['OTHER_TABLE', 'FK_1'], ['THE_TABLE', 'the_table_id']])
+        @connection.should_receive(:respond_to?).with(:foreign_keys).and_return(true)
+        @connection.should_receive(:foreign_keys).and_return([
+          Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('some_table', 'OTHER_TABLE', {:column=>'fk_1'}),
+          Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('some_table', 'THE_TABLE',   {:column=>'the_table_id'})
+          ])
+
         @schema.belongs_to_relations.should == {'other_table' => {:foreign_key=>:fk_1        }, 
                                                 'the_table'   => {:foreign_key=>:the_table_id} }
       end

data/spec/legacy_data/table_definition_spec.rb

@@ -6,23 +6,114 @@ describe LegacyData::TableDefinition do
       LegacyData::TableDefinition.new({option=>'some value'})[option].should == 'some value'
     end
     
-    it 'should allow you to set class_name' do
-      table_definition = LegacyData::TableDefinition.new({})
-      table_definition.class_name = 'NewClassName'
-      table_definition[:class_name].should == 'NewClassName'
+  end
+  
+  describe 'formatting for model' do
+    describe 'relationships' do
+      before :each do
+        @table_definition = LegacyData::TableDefinition.new({})
+      end
+      
+      it 'should format a hash for a has_many or belongs_to list' do
+        @table_definition.options_to_s({:foreign_key=>:posts_id, :class_name=>'SomeClass'}).should == ':class_name => "SomeClass", :foreign_key => :posts_id'
+      end
     end
     
-    it 'should reveal itself as a hash' do
-      params = {}
-      [:class_name, :table_name, :columns, :primary_key, :relations, :constraints].each { |field| params[field] = "#{field}_value" } 
-      table_definition = LegacyData::TableDefinition.new(params)
-      table_definition.to_hash.should == params
+    describe 'constraints' do
+      it 'should generate  commented lines for multi column unique constraints' do
+        table_definition = LegacyData::TableDefinition.new(:constraints => {:multi_column_unique => [[:author, :title], 
+                                                                                                     [:address, :phone]]
+                                                                      })
+        table_definition.multi_column_unique_constraints_to_s.should == ["#validates_uniqueness_of_multiple_column_constraint [:author, :title]",
+                                                                         "#validates_uniqueness_of_multiple_column_constraint [:address, :phone]"]
+      end
+
+      it 'should generate inclusion of constraints with a method returning possible values' do
+        table_definition = LegacyData::TableDefinition.new(:constraints => {:inclusion_of => {:flag  => ['Y', 'N'],
+                                                                                              :state => ['MA', 'NY']}
+                                                                      })
+        table_definition.inclusion_of_constraints_to_s.first.should == <<-RB
+  def self.possible_values_for_state
+    ["MA", "NY"]
+  end
+  validates_inclusion_of :state,
+                         :in      => possible_values_for_state, 
+                         :message => "is not one of (\#{possible_values_for_state.join(', ')})"
+        RB
+        table_definition.inclusion_of_constraints_to_s.second.should == <<-RB
+  def self.possible_values_for_flag
+    ["Y", "N"]
+  end
+  validates_inclusion_of :flag,
+                         :in      => possible_values_for_flag, 
+                         :message => "is not one of (\#{possible_values_for_flag.join(', ')})"
+        RB
+      end
+
+      it 'should generate inclusion of constraints with a method returning possible values' do
+        table_definition = LegacyData::TableDefinition.new(:constraints => {:custom => {:my_constraint => "some plsql logic",
+                                                                                        :another_one   => "multi\nline\n  plsql logic"}
+                                                                      })
+        table_definition.custom_constraints_to_s.should include <<-RB
+  validate :validate_my_constraint
+  def validate_my_constraint
+    # TODO: validate this SQL constraint
+    <<-SQL
+      some plsql logic
+    SQL
+  end
+        RB
+        table_definition.custom_constraints_to_s.should include <<-RB
+  validate :validate_another_one
+  def validate_another_one
+    # TODO: validate this SQL constraint
+    <<-SQL
+      multi
+line
+  plsql logic
+    SQL
+  end
+        RB
+      end
+
+      describe 'numericality constraints' do
+        before :each do
+          @table_definition = LegacyData::TableDefinition.new(:constraints => {:numericality_of => {:allow_nil        => ['col1', 'col2'],
+                                                                                                   :do_not_allow_nil => ['col3', 'col4']}
+                                                                               }
+                                                              )
+        end
+        it 'should generate numericality constraints for those that allow nil and those that do not' do
+          @table_definition.numericality_of_constraints_to_s.should == ["validates_numericality_of :col1, :col2, {:allow_nil=>true}", 
+                                                                        "validates_numericality_of :col3, :col4"]
+        end
+
+        it 'should not fail when there are no nullable constraints' do
+          @table_definition.constraints[:numericality_of][:allow_nil] = nil
+          @table_definition.numericality_of_constraints_to_s.should == [[], 
+                                                                        "validates_numericality_of :col3, :col4"]
+        end
+
+        it 'should not fail when there are no non-nullable constraints' do
+          @table_definition.constraints[:numericality_of][:do_not_allow_nil] = nil
+          @table_definition.numericality_of_constraints_to_s.should == ["validates_numericality_of :col1, :col2, {:allow_nil=>true}", 
+                                                                        []]
+        end
+
+        it 'should not fail when there are no nullable or non-nullable constraints' do
+          @table_definition.constraints[:numericality_of][:allow_nil]        = nil
+          @table_definition.constraints[:numericality_of][:do_not_allow_nil] = nil
+          @table_definition.numericality_of_constraints_to_s.should == [[], 
+                                                                        []]
+        end
+      end
     end
+
   end
   
   describe 'join table' do
     before :each do
-      @foreign_key_columns = ['one_table_id',               'another_table_id']
+      @foreign_key_columns = [mock(:name=>'one_table_id'),  mock(:name=>'another_table_id') ]
       @belongs_to_relation = {'one_table'     => {:foreign_key=>:one_table_id    }, 
                               'another_table' => {:foreign_key=>:another_table_id} }
     end

data/spec/models_from_tables_generator_spec.rb

@@ -11,16 +11,16 @@ describe 'Models From Tables generator' do
   end
   
   before :each do
-    FileUtils.rm(RAILS_ROOT + '/spec/factories.rb')
+    FileUtils.rm(RAILS_ROOT + '/spec/factories.rb', :force => true)
     
     @posts = LegacyData::TableDefinition.new( :class_name   => 'Posts',
                                               :table_name   => 'posts',
                                               :columns      => [stub(:name=>'title', :null=>false, :type=>:string), 
                                                                 stub(:name=>'body',  :null=>false, :type=>:string)],
                                               :primary_key  => 'id',
-                                              :relations    => { :has_many               =>{'comments'=>{:foreign_key=>'comment_id'}}, 
+                                              :relations    => { :has_many               =>{'comments'=>{:foreign_key=>:comment_id}}, 
                                                                  :belongs_to             =>{}, 
-                                                                 :has_and_belongs_to_many=>[]
+                                                                 :has_and_belongs_to_many=>{}
                                                                },
                                               :constraints  => { :unique             =>['title'],
                                                                  :multi_column_unique=>[],
@@ -36,16 +36,28 @@ describe 'Models From Tables generator' do
     LegacyData::TableClassNameMapper.should_receive(:let_user_validate_dictionary)
     LegacyData::TableClassNameMapper.stub!(:class_name_for).with('posts'   ).and_return('Post')
     LegacyData::TableClassNameMapper.stub!(:class_name_for).with('comments').and_return('Comment')
-
-    cmd = command_for_generator('models_from_tables', ["--table-name", "posts"], :create)
-    cmd.invoke!
   end
   
   it 'should generate a posts model' do
+    invoke_generator('models_from_tables', ["--table-name", "posts"], :create)
+
     File.read(RAILS_ROOT + '/app/models/post.rb').should == File.read(File.expand_path(File.dirname(__FILE__) + '/expected/post.rb'))
   end
   
-  it 'should generate a :posts factory' do
+  it 'should not generate factories by default' do
+    generator = load_generator('models_from_tables', ["--table-name", "posts"])
+    generator.should_not_receive(:add_factory_girl_factory)
+
+    cmd = generator.command(:create)
+    cmd.stub!(:logger).and_return(stub('stub').as_null_object)
+    cmd.invoke!
+  end
+
+  it 'should generate factories when asked' do
+    generator = load_generator('models_from_tables', ["--table-name", "posts", "--with-factories"])
+    cmd = generator.command(:create)
+    cmd.stub!(:logger).and_return(stub('stub').as_null_object)
+    cmd.invoke!
     
     File.read(RAILS_ROOT + '/spec/factories.rb').should == File.read(File.expand_path(File.dirname(__FILE__) + '/expected/factories.rb'))
   end

data/spec/spec_helper.rb

@@ -3,31 +3,17 @@ require 'activerecord'
 # require 'active_record/connection_adapters/oracle_enhanced_adapter'
 
 
-
-## TODO parameterize this ....
+# Since Legacy Data depends on Foreigner we need to have an ActiveRecord connection established
 ActiveRecord::Base.establish_connection({:adapter=>'sqlite3', :database=> ":memory:"})
 
-ActiveRecord::Base.connection.create_table :posts do |t|
-  t.string :title
-  t.text   :body
-end
-ActiveRecord::Base.connection.create_table :comments do |t|
-  t.integer :post_id
-  t.text    :body
-end
 
-
-# $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'legacy_data'
 
+
 require 'spec'
 require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
-end
-
 ### Load the rails generator code
 require 'rails_generator'
 require 'rails_generator/scripts'
@@ -37,13 +23,15 @@ Rails::Generator::Base.reset_sources
 def add_source(path)
   Rails::Generator::Base.append_sources(Rails::Generator::PathSource.new(:builtin, path))
 end
-
 add_source(File.dirname(__FILE__) + '/../generators')
 
+
+
 def load_generator(generator_name="models_from_tables", args=[])
   Rails::Generator::Base.instance(generator_name,
                                   (args.dup << '--quiet'), 
-                                  {:generator=>generator_name, :command=>:create, :destination=>RAILS_ROOT})    
+                                  {:generator=>generator_name, :command=>:create, :destination=>RAILS_ROOT}
+                                 )    
 end
 
 def command_for_generator(generator_name, args, the_command= :create)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: legacy_data
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Alex Rothenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -04:00
+date: 2009-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: matthuhiggins-foreigner
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.1
+    version: 
 description: Create ActiveRecord models from an existing database
 email: alex@alexrothenberg.com
 executables: []
@@ -48,22 +58,110 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- examples/j2ee_petstore.sql
+- examples/blog_migration.rb
+- examples/create_j2ee_petstore.sql
+- examples/delete_j2ee_petstore.sql
+- examples/drupal_6_14.sql
+- examples/generated/blog_mysql/comment.rb
+- examples/generated/blog_mysql/factories.rb
+- examples/generated/blog_mysql/post.rb
+- examples/generated/blog_mysql/tag.rb
+- examples/generated/blog_sqlite3/comment.rb
+- examples/generated/blog_sqlite3/factories.rb
+- examples/generated/blog_sqlite3/post.rb
+- examples/generated/blog_sqlite3/tag.rb
+- examples/generated/drupal_mysql/access.rb
+- examples/generated/drupal_mysql/action.rb
+- examples/generated/drupal_mysql/actions_aid.rb
+- examples/generated/drupal_mysql/authmap.rb
+- examples/generated/drupal_mysql/batch.rb
+- examples/generated/drupal_mysql/block.rb
+- examples/generated/drupal_mysql/blocks_role.rb
+- examples/generated/drupal_mysql/box.rb
+- examples/generated/drupal_mysql/cache.rb
+- examples/generated/drupal_mysql/cache_block.rb
+- examples/generated/drupal_mysql/cache_filter.rb
+- examples/generated/drupal_mysql/cache_form.rb
+- examples/generated/drupal_mysql/cache_menu.rb
+- examples/generated/drupal_mysql/cache_page.rb
+- examples/generated/drupal_mysql/cache_update.rb
+- examples/generated/drupal_mysql/comment.rb
+- examples/generated/drupal_mysql/factories.rb
+- examples/generated/drupal_mysql/filter.rb
+- examples/generated/drupal_mysql/filter_format.rb
+- examples/generated/drupal_mysql/flood.rb
+- examples/generated/drupal_mysql/history.rb
+- examples/generated/drupal_mysql/menu_custom.rb
+- examples/generated/drupal_mysql/menu_link.rb
+- examples/generated/drupal_mysql/menu_router.rb
+- examples/generated/drupal_mysql/node.rb
+- examples/generated/drupal_mysql/node_access.rb
+- examples/generated/drupal_mysql/node_comment_statistic.rb
+- examples/generated/drupal_mysql/node_counter.rb
+- examples/generated/drupal_mysql/node_revision.rb
+- examples/generated/drupal_mysql/node_type.rb
+- examples/generated/drupal_mysql/permission.rb
+- examples/generated/drupal_mysql/role.rb
+- examples/generated/drupal_mysql/session.rb
+- examples/generated/drupal_mysql/system.rb
+- examples/generated/drupal_mysql/term_data.rb
+- examples/generated/drupal_mysql/term_hierarchy.rb
+- examples/generated/drupal_mysql/term_node.rb
+- examples/generated/drupal_mysql/term_relation.rb
+- examples/generated/drupal_mysql/term_synonym.rb
+- examples/generated/drupal_mysql/uploaded_files.rb
+- examples/generated/drupal_mysql/url_alias.rb
+- examples/generated/drupal_mysql/user.rb
+- examples/generated/drupal_mysql/users_role.rb
+- examples/generated/drupal_mysql/variable.rb
+- examples/generated/drupal_mysql/vocabulary.rb
+- examples/generated/drupal_mysql/vocabulary_node_type.rb
+- examples/generated/drupal_mysql/watchdog.rb
+- examples/generated/j2ee_petstore_mysql/address.rb
+- examples/generated/j2ee_petstore_mysql/category.rb
+- examples/generated/j2ee_petstore_mysql/factories.rb
+- examples/generated/j2ee_petstore_mysql/id_gen.rb
+- examples/generated/j2ee_petstore_mysql/item.rb
+- examples/generated/j2ee_petstore_mysql/product.rb
+- examples/generated/j2ee_petstore_mysql/seller_contact_info.rb
+- examples/generated/j2ee_petstore_mysql/tag.rb
+- examples/generated/j2ee_petstore_mysql/tag_item.rb
+- examples/generated/j2ee_petstore_mysql/ziplocation.rb
+- examples/generated/j2ee_petstore_oracle/address.rb
+- examples/generated/j2ee_petstore_oracle/category.rb
+- examples/generated/j2ee_petstore_oracle/factories.rb
+- examples/generated/j2ee_petstore_oracle/id_gen.rb
+- examples/generated/j2ee_petstore_oracle/item.rb
+- examples/generated/j2ee_petstore_oracle/product.rb
+- examples/generated/j2ee_petstore_oracle/sellercontactinfo.rb
+- examples/generated/j2ee_petstore_oracle/tag.rb
+- examples/generated/j2ee_petstore_oracle/ziplocation.rb
+- examples/generated/j2ee_petstore_sqlite3/address.rb
+- examples/generated/j2ee_petstore_sqlite3/category.rb
+- examples/generated/j2ee_petstore_sqlite3/factories.rb
+- examples/generated/j2ee_petstore_sqlite3/id_gen.rb
+- examples/generated/j2ee_petstore_sqlite3/item.rb
+- examples/generated/j2ee_petstore_sqlite3/product.rb
+- examples/generated/j2ee_petstore_sqlite3/seller_contact_info.rb
+- examples/generated/j2ee_petstore_sqlite3/tag.rb
+- examples/generated/j2ee_petstore_sqlite3/tag_item.rb
+- examples/generated/j2ee_petstore_sqlite3/ziplocation.rb
 - generators/models_from_tables/USAGE
 - generators/models_from_tables/models_from_tables_generator.rb
 - generators/models_from_tables/templates/model.rb
 - legacy_data.gemspec
-- lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+- lib/active_record/connection_adapters/oracleenhanced_adapter.rb
 - lib/legacy_data.rb
 - lib/legacy_data/schema.rb
 - lib/legacy_data/table_class_name_mapper.rb
 - lib/legacy_data/table_definition.rb
 - spec/expected/factories.rb
 - spec/expected/post.rb
-- spec/functional/expected/comment.rb
-- spec/functional/expected/post.rb
+- spec/functional/blog_adapterspec.rb
+- spec/functional/database.yml
+- spec/functional/drupal_adapterspec.rb
 - spec/functional/functional_spec_helper.rb
-- spec/functional/models_from_tables_spec.rb
+- spec/functional/j2ee_petstore_adapterspec.rb
 - spec/legacy_data/schema_spec.rb
 - spec/legacy_data/table_class_name_mapper_spec.rb
 - spec/legacy_data/table_definition_spec.rb
@@ -100,12 +198,97 @@ summary: Create ActiveRecord models from an existing database
 test_files: 
 - spec/expected/factories.rb
 - spec/expected/post.rb
-- spec/functional/expected/comment.rb
-- spec/functional/expected/post.rb
+- spec/functional/blog_adapterspec.rb
+- spec/functional/drupal_adapterspec.rb
 - spec/functional/functional_spec_helper.rb
-- spec/functional/models_from_tables_spec.rb
+- spec/functional/j2ee_petstore_adapterspec.rb
 - spec/legacy_data/schema_spec.rb
 - spec/legacy_data/table_class_name_mapper_spec.rb
 - spec/legacy_data/table_definition_spec.rb
 - spec/models_from_tables_generator_spec.rb
 - spec/spec_helper.rb
+- examples/blog_migration.rb
+- examples/generated/blog_mysql/comment.rb
+- examples/generated/blog_mysql/factories.rb
+- examples/generated/blog_mysql/post.rb
+- examples/generated/blog_mysql/tag.rb
+- examples/generated/blog_sqlite3/comment.rb
+- examples/generated/blog_sqlite3/factories.rb
+- examples/generated/blog_sqlite3/post.rb
+- examples/generated/blog_sqlite3/tag.rb
+- examples/generated/drupal_mysql/access.rb
+- examples/generated/drupal_mysql/action.rb
+- examples/generated/drupal_mysql/actions_aid.rb
+- examples/generated/drupal_mysql/authmap.rb
+- examples/generated/drupal_mysql/batch.rb
+- examples/generated/drupal_mysql/block.rb
+- examples/generated/drupal_mysql/blocks_role.rb
+- examples/generated/drupal_mysql/box.rb
+- examples/generated/drupal_mysql/cache.rb
+- examples/generated/drupal_mysql/cache_block.rb
+- examples/generated/drupal_mysql/cache_filter.rb
+- examples/generated/drupal_mysql/cache_form.rb
+- examples/generated/drupal_mysql/cache_menu.rb
+- examples/generated/drupal_mysql/cache_page.rb
+- examples/generated/drupal_mysql/cache_update.rb
+- examples/generated/drupal_mysql/comment.rb
+- examples/generated/drupal_mysql/factories.rb
+- examples/generated/drupal_mysql/filter.rb
+- examples/generated/drupal_mysql/filter_format.rb
+- examples/generated/drupal_mysql/flood.rb
+- examples/generated/drupal_mysql/history.rb
+- examples/generated/drupal_mysql/menu_custom.rb
+- examples/generated/drupal_mysql/menu_link.rb
+- examples/generated/drupal_mysql/menu_router.rb
+- examples/generated/drupal_mysql/node.rb
+- examples/generated/drupal_mysql/node_access.rb
+- examples/generated/drupal_mysql/node_comment_statistic.rb
+- examples/generated/drupal_mysql/node_counter.rb
+- examples/generated/drupal_mysql/node_revision.rb
+- examples/generated/drupal_mysql/node_type.rb
+- examples/generated/drupal_mysql/permission.rb
+- examples/generated/drupal_mysql/role.rb
+- examples/generated/drupal_mysql/session.rb
+- examples/generated/drupal_mysql/system.rb
+- examples/generated/drupal_mysql/term_data.rb
+- examples/generated/drupal_mysql/term_hierarchy.rb
+- examples/generated/drupal_mysql/term_node.rb
+- examples/generated/drupal_mysql/term_relation.rb
+- examples/generated/drupal_mysql/term_synonym.rb
+- examples/generated/drupal_mysql/uploaded_files.rb
+- examples/generated/drupal_mysql/url_alias.rb
+- examples/generated/drupal_mysql/user.rb
+- examples/generated/drupal_mysql/users_role.rb
+- examples/generated/drupal_mysql/variable.rb
+- examples/generated/drupal_mysql/vocabulary.rb
+- examples/generated/drupal_mysql/vocabulary_node_type.rb
+- examples/generated/drupal_mysql/watchdog.rb
+- examples/generated/j2ee_petstore_mysql/address.rb
+- examples/generated/j2ee_petstore_mysql/category.rb
+- examples/generated/j2ee_petstore_mysql/factories.rb
+- examples/generated/j2ee_petstore_mysql/id_gen.rb
+- examples/generated/j2ee_petstore_mysql/item.rb
+- examples/generated/j2ee_petstore_mysql/product.rb
+- examples/generated/j2ee_petstore_mysql/seller_contact_info.rb
+- examples/generated/j2ee_petstore_mysql/tag.rb
+- examples/generated/j2ee_petstore_mysql/tag_item.rb
+- examples/generated/j2ee_petstore_mysql/ziplocation.rb
+- examples/generated/j2ee_petstore_oracle/address.rb
+- examples/generated/j2ee_petstore_oracle/category.rb
+- examples/generated/j2ee_petstore_oracle/factories.rb
+- examples/generated/j2ee_petstore_oracle/id_gen.rb
+- examples/generated/j2ee_petstore_oracle/item.rb
+- examples/generated/j2ee_petstore_oracle/product.rb
+- examples/generated/j2ee_petstore_oracle/sellercontactinfo.rb
+- examples/generated/j2ee_petstore_oracle/tag.rb
+- examples/generated/j2ee_petstore_oracle/ziplocation.rb
+- examples/generated/j2ee_petstore_sqlite3/address.rb
+- examples/generated/j2ee_petstore_sqlite3/category.rb
+- examples/generated/j2ee_petstore_sqlite3/factories.rb
+- examples/generated/j2ee_petstore_sqlite3/id_gen.rb
+- examples/generated/j2ee_petstore_sqlite3/item.rb
+- examples/generated/j2ee_petstore_sqlite3/product.rb
+- examples/generated/j2ee_petstore_sqlite3/seller_contact_info.rb
+- examples/generated/j2ee_petstore_sqlite3/tag.rb
+- examples/generated/j2ee_petstore_sqlite3/tag_item.rb
+- examples/generated/j2ee_petstore_sqlite3/ziplocation.rb