legacy_data 0.1.12 → 0.2.0

data/lib/legacy_data/table_definition.rb

@@ -15,7 +15,6 @@ module LegacyData
     end
 
     def unconventional_primary_key?
-      puts self.inspect if primary_key.nil?
       primary_key != 'id'
     end
 
@@ -31,7 +30,7 @@ module LegacyData
             class_for_table = TableDefinition.class_name_for(table_name)
             association_name = class_for_table.underscore
             association_name = association_name.pluralize unless is_singular_association
-            needs_class_name = (ActiveRecord::Base.class_name(association_name.pluralize) != class_for_table)
+            needs_class_name = (LegacyData.conventional_class_name(association_name) != class_for_table)
             options[:class_name] = class_for_table if needs_class_name
 
             spaces = association_with_longest_name.size - association_name.size

data/spec/functional/blog_adapterspec.rb

@@ -1,7 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/functional_spec_helper')
 
 
-describe "Generating models from a blog #{ENV['ADAPTER']} database" do
+describe ModelsFromTablesGenerator, "Generating models from a blog #{ENV['ADAPTER']} database" do
+  include GeneratorSpecHelper
+
   before :all do
     @adapter = ENV['ADAPTER']
     @example = :blog
@@ -13,32 +15,30 @@ describe "Generating models from a blog #{ENV['ADAPTER']} database" do
     require File.expand_path(File.dirname(__FILE__) + '/../../examples/blog_migration')
     create_blog_tables
         
-    silence_warnings { RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}") } 
-    FileUtils.mkdir_p(RAILS_ROOT + '/app/models')
-    FileUtils.mkdir_p(RAILS_ROOT + '/spec')
+    self.destination_root = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}")
+    FileUtils.mkdir_p(destination_root + '/app/models')
+    FileUtils.mkdir_p(destination_root + '/spec')
     
-    LegacyData::Schema.stub!(:log)    
-
     @expected_directory = File.expand_path("#{File.dirname(__FILE__)}/../../examples/generated/#{@example}_#{@adapter}") 
   end
-  after :all do
-    Object.send(:remove_const, :RAILS_ROOT)
-  end
   
   before :each do #
     pending("oracle does not yet work with t.foreign_key table creation") if @adapter == 'oracle'
-    FileUtils.rm(RAILS_ROOT + '/spec/factories.rb', :force => true)
-    invoke_generator('models_from_tables', ["--with-factories"], :create)
+
+    Rails.stub!(:root).and_return(destination_root)
+
+    FileUtils.rm(destination_root + '/spec/factories.rb', :force => true)
+    run_generator []
   end
 
   %w( post comment tag ).each do |model|
     it "should generate the expected #{model} model" do
-      File.read(RAILS_ROOT + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
+      File.read(destination_root + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
     end
   end
 
   it "should  generated the expected factories" do
-    File.read(RAILS_ROOT + '/spec/factories.rb').should == File.read("#{@expected_directory}/factories.rb")
+    File.read(destination_root + '/spec/factories.rb'       ).should == File.read("#{@expected_directory}/factories.rb")
   end
   
 end

data/spec/functional/drupal_adapterspec.rb

@@ -6,7 +6,9 @@ if ENV['ADAPTER'] == 'mysql'
     execute_sql_script(File.expand_path(File.dirname(__FILE__) + '/../../examples/drupal_6_14.sql'))
   end
 
-  describe "Generating models from a drupal 6.14 #{ENV['ADAPTER']} database" do
+  describe ModelsFromTablesGenerator, "Generating models from a drupal 6.14 #{ENV['ADAPTER']} database"  do
+    include GeneratorSpecHelper
+
     before :all do
       @adapter = ENV['ADAPTER']
       @example = :drupal
@@ -16,9 +18,9 @@ if ENV['ADAPTER'] == 'mysql'
       initialize_connection connection_info
       create_drupal_schema
         
-      silence_warnings { RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}") } 
-      FileUtils.mkdir_p(RAILS_ROOT + '/app/models')
-      FileUtils.mkdir_p(RAILS_ROOT + '/spec')
+      self.destination_root = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}")
+      FileUtils.mkdir_p(destination_root + '/app/models')
+      FileUtils.mkdir_p(destination_root + '/spec')
       
       LegacyData::Schema.stub!(:log)    
 
@@ -26,13 +28,13 @@ if ENV['ADAPTER'] == 'mysql'
       
       LegacyData::TableClassNameMapper.dictionary['files'] = 'UploadedFiles'  #to avoid collision with Ruby File class
       LegacyData::TableClassNameMapper.dictionary['cache'] = 'Cache'          #don't strip the e to make it cach
-
-      FileUtils.rm(RAILS_ROOT + '/spec/factories.rb', :force => true)
-      invoke_generator('models_from_tables', ["--with-factories"], :create)
-    
     end
-    after :all do
-      Object.send(:remove_const, :RAILS_ROOT)
+    
+    before :each do
+      Rails.stub!(:root).and_return(destination_root)
+
+      FileUtils.rm(destination_root + '/spec/factories.rb', :force => true)
+      run_generator []
     end
       
     %w( access       action        actions_aid  authmap        batch                  block        blocks_role 
@@ -43,12 +45,12 @@ if ENV['ADAPTER'] == 'mysql'
         term_node    term_relation term_synonym uploaded_files url_alias              user         users_role 
         variable     vocabulary    vocabulary_node_type        watchdog ).each do |model|
       it "should generate the expected #{model} model" do
-        File.read(RAILS_ROOT + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
+        File.read(destination_root + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
       end
     end
     
     it "should  generated the expected factories" do
-      File.read(RAILS_ROOT + '/spec/factories.rb').should == File.read("#{@expected_directory}/factories.rb")
+      File.read(destination_root + '/spec/factories.rb').should == File.read("#{@expected_directory}/factories.rb")
     end
   end
 end

data/spec/functional/functional_spec_helper.rb

@@ -2,15 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 ADAPTER = ENV['ADAPTER']
 
+require 'generators/models_from_tables/models_from_tables_generator'
 
 def initialize_connection connection_info
   ActiveRecord::Base.establish_connection(connection_info)
 
-  begin
-    require "foreigner/connection_adapters/#{ActiveRecord::Base.connection.adapter_name.downcase}_adapter"
-  rescue LoadError
-    #foreigner does not support all adapters (i.e. sqlite3)
-  end
+  # tell foreigner to reload the adapter
+  Foreigner.load_adapter!
 end
   
 

data/spec/functional/j2ee_petstore_adapterspec.rb

@@ -5,7 +5,9 @@ def create_j2ee_petstore_schema
   execute_sql_script(File.expand_path(File.dirname(__FILE__) + '/../../examples/create_j2ee_petstore.sql') )
 end
 
-describe "Generating models from j2ee petstore #{ENV['ADAPTER']} database" do
+describe ModelsFromTablesGenerator, "Generating models from j2ee petstore #{ENV['ADAPTER']} database" do
+  include GeneratorSpecHelper
+
   before :all do
     @adapter = ENV['ADAPTER']
     @example = :j2ee_petstore
@@ -15,25 +17,23 @@ describe "Generating models from j2ee petstore #{ENV['ADAPTER']} database" do
     initialize_connection connection_info
     create_j2ee_petstore_schema
       
-    silence_warnings { RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}") } 
-    FileUtils.mkdir_p(RAILS_ROOT + '/app/models')
-    FileUtils.mkdir_p(RAILS_ROOT + '/spec')
+    self.destination_root = File.expand_path("#{File.dirname(__FILE__)}/../../output/functional/#{@example}_#{@adapter}")
+    FileUtils.mkdir_p(destination_root + '/app/models')
+    FileUtils.mkdir_p(destination_root + '/spec')
   
     LegacyData::Schema.stub!(:log)    
 
     @expected_directory = File.expand_path("#{File.dirname(__FILE__)}/../../examples/generated/#{@example}_#{@adapter}") 
     
+  end
+  
+  before :each do
+    Rails.stub!(:root).and_return(destination_root)
     LegacyData::TableClassNameMapper.dictionary['files'] = 'UploadedFiles'  #to avoid collision with Ruby File class
     LegacyData::TableClassNameMapper.dictionary['cache'] = 'Cache'          #don't strip the e to make it cach
 
-    FileUtils.rm(RAILS_ROOT + '/spec/factories.rb', :force => true)
-    invoke_generator('models_from_tables', ["--with-factories"], :create)
-
-  end
-  
-  
-  after :all do
-    Object.send(:remove_const, :RAILS_ROOT)
+    FileUtils.rm(destination_root + '/spec/factories.rb', :force => true)
+    run_generator []
   end
 
   models =  %w( address   category     id_gen       item           
@@ -47,11 +47,11 @@ describe "Generating models from j2ee petstore #{ENV['ADAPTER']} database" do
                 
   models.each do |model|
     it "should generate the expected #{model} model" do
-      File.read(RAILS_ROOT + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
+      File.read(destination_root + "/app/models/#{model}.rb").should == File.read("#{@expected_directory}/#{model}.rb")
     end
   end
   
   it "should  generated the expected factories" do
-    File.read(RAILS_ROOT + '/spec/factories.rb').should == File.read("#{@expected_directory}/factories.rb")
+    File.read(destination_root + '/spec/factories.rb').should == File.read("#{@expected_directory}/factories.rb")
   end
 end

data/spec/generators/models_from_tables/expected/factories.rb

@@ -0,0 +1,5 @@
+Factory.define :post do |post|
+  post.title 'some string'
+  post.body  'some string'
+end
+

data/spec/{models_from_tables_generator_spec.rb → generators/models_from_tables/models_from_tables_generator_spec.rb}

@@ -1,17 +1,19 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+require 'generators/models_from_tables/models_from_tables_generator'
+
+describe ModelsFromTablesGenerator do
+  include GeneratorSpecHelper
 
-describe 'Models From Tables generator' do
   before :all do
-    silence_warnings { RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../output') } 
-    FileUtils.mkdir_p(RAILS_ROOT + '/app/models')
-    FileUtils.mkdir_p(RAILS_ROOT + '/spec')
-  end
-  after :all do
-    Object.send(:remove_const, :RAILS_ROOT)
+    self.destination_root = File.expand_path(File.dirname(__FILE__) + '/../output')
+    FileUtils.mkdir_p(destination_root + '/app/models')
+    FileUtils.mkdir_p(destination_root + '/spec')
   end
   
   before :each do
-    FileUtils.rm(RAILS_ROOT + '/spec/factories.rb', :force => true)
+    Rails.stub!(:root).and_return(destination_root)
+    FileUtils.rm(destination_root + '/spec/factories.rb', :force => true)
     
     @posts = LegacyData::TableDefinition.new( :class_name   => 'Posts',
                                               :table_name   => 'posts',
@@ -32,33 +34,31 @@ describe 'Models From Tables generator' do
                                               )
                     
 
-    LegacyData::Schema.should_receive(:analyze).with(hash_including(:table_name=>'posts')).and_return([@posts])
     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')
   end
   
-  it 'should generate a posts model' do
-    invoke_generator('models_from_tables', ["--table-name", "posts"], :create)
+  describe 'with factories' do
+    before :each do
+      LegacyData::Schema.should_receive(:analyze).with(hash_including(:table_name=>'posts')).and_return([@posts])
+      run_generator %w(posts)
+    end
 
-    File.read(RAILS_ROOT + '/app/models/post.rb').should == File.read(File.expand_path(File.dirname(__FILE__) + '/expected/post.rb'))
+    it 'should generate a posts model' do
+      File.read(destination_root + '/app/models/post.rb').should == File.read(File.expand_path(File.dirname(__FILE__) + '/expected/post.rb'))
+    end
+    it 'should generate factories' do
+      File.read(destination_root + '/spec/factories.rb' ).should == File.read(File.expand_path(File.dirname(__FILE__) + '/expected/factories.rb'))
+    end
   end
   
-  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!
+  it 'should not generate factories when asked not to' do
+    LegacyData::Schema.should_receive(:analyze).with(hash_including(:table_name=>'posts')).and_return([@posts])
+    gen = generator %w(posts), %w(--with-factories false)
+    gen.should_not_receive(:add_factory_girl_factory)
+    capture(:stdout) { gen.invoke_all }
   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
 end
+

data/spec/legacy_data/schema_spec.rb

@@ -22,7 +22,6 @@ describe LegacyData::Schema do
       LegacyData::Schema.should_receive(:puts).with("Warning: Table 'specific_table' does not exist")
       LegacyData::Schema.stub!(:connection=>connection=mock)
       connection.should_receive(:table_exists?).with('specific_table').and_return(false)
-
       LegacyData::Schema.initialize_tables('specific_table')
       
       LegacyData::Schema.table_definitions.keys.should == []

data/spec/legacy_data/table_class_name_mapper_spec.rb

@@ -59,12 +59,9 @@ describe LegacyData::TableClassNameMapper do
   
   describe 'persisting the dictionary' do
     before :each do
-      silence_warnings { RAILS_ROOT = 'test_rails_root' }
+      Rails.stub!(:root).and_return('test/rails/root')
       @dictionary_file_name = LegacyData::TableClassNameMapper.dictionary_file_name
     end
-    after :each do
-      Object.send(:remove_const, :RAILS_ROOT) if RAILS_ROOT=='test_rails_root'
-    end
 
     it 'should load the dictionary from a file' do
       File.should_receive(:exists?  ).with(@dictionary_file_name).and_return(true)

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
 require 'rubygems'
-require 'active_record'
-# require 'active_record/connection_adapters/oracle_enhanced_adapter'
+# gem 'rspec'
+# require 'spec'
+# require 'spec/autorun'
 
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'active_record'
 # Since Legacy Data depends on Foreigner we need to have an ActiveRecord connection established
 ActiveRecord::Base.establish_connection({:adapter=>'sqlite3', :database=> ":memory:"})
 
@@ -11,38 +14,53 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'legacy_data'
 
 
-require 'spec'
-require 'spec/autorun'
+# require 'spec'
+# require 'spec/autorun'
 
 ### Load the rails generator code
-require 'rails_generator'
-require 'rails_generator/scripts'
-require 'rails_generator/scripts/generate'
+# require 'rails_generator'
+# require 'rails_generator/scripts'
+# require 'rails_generator/scripts/generate'
 
-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')
+require 'active_support'
+require 'rails/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}
-                                 )    
-end
+## Can we turn this into an rspec-rails GeneratorExampleGroup ??????
+module GeneratorSpecHelper
+  attr_accessor :destination_root
+  def generator_class
+    self.class.describes
+  end
 
-def command_for_generator(generator_name, args, the_command= :create)
-  generator = load_generator(generator_name, args)
-  LegacyData::TableClassNameMapper.stub!(:log)    
-  cmd = generator.command(the_command)
-  cmd.stub!(:logger).and_return(stub('stub').as_null_object)
-  cmd
-end
+  # You can provide a configuration hash as second argument. This method returns the output
+  # printed by the generator.
+  def generator(args=generator.default_arguments, options={}, config={})  
+    generator_class.new(args, options, config.reverse_merge(:destination_root => destination_root))
+  end
+  
+  def run_generator(args=generator.default_arguments, options={}, config={})  
+    capture(:stdout) {
+      generator(args, options, config).invoke_all
+    }
+  end
+
+  # Captures the given stream and returns it:
+  #
+  #   stream = capture(:stdout){ puts "Cool" }
+  #   stream # => "Cool\n"
+  #
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
 
-def invoke_generator(generator_name, args, the_command= :create)
-  cmd = command_for_generator(generator_name, args, the_command)
-  cmd.invoke!
+    result
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: legacy_data
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 12
-  version: 0.1.12
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Rothenberg
@@ -15,27 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -05:00
+date: 2010-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 5
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
-  requirement: *id001
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  name: railties
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
   type: :runtime
   name: activerecord
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  name: activesupport
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +78,12 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  requirement: *id002
   type: :runtime
   name: foreigner
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,28 +94,28 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id003
   type: :development
   name: rake
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 11
         segments: 
+        - 2
         - 1
-        - 3
-        - 1
-        version: 1.3.1
-  requirement: *id004
+        - 0
+        version: 2.1.0
   type: :development
   name: rspec
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,26 +126,10 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id005
   type: :development
   name: sqlite3-ruby
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  requirement: *id006
-  type: :development
-  name: rails
-  prerelease: false
+  version_requirements: *id007
 description: Create ActiveRecord models from an existing database
 email: alex@alexrothenberg.com
 executables: []
@@ -127,6 +143,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rvmrc
 - Gemfile
 - History.txt
 - LICENSE
@@ -222,26 +239,26 @@ files:
 - 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/oracleenhanced_adapter.rb
+- lib/foreigner/connection_adapters/oracle_enhanced_adapter.rb
+- lib/generators/models_from_tables/USAGE
+- lib/generators/models_from_tables/models_from_tables_generator.rb
+- lib/generators/models_from_tables/templates/model.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/blog_adapterspec.rb
 - spec/functional/database.yml
 - spec/functional/drupal_adapterspec.rb
 - spec/functional/functional_spec_helper.rb
 - spec/functional/j2ee_petstore_adapterspec.rb
+- spec/generators/models_from_tables/expected/factories.rb
+- spec/generators/models_from_tables/expected/post.rb
+- spec/generators/models_from_tables/models_from_tables_generator_spec.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
 has_rdoc: true
 homepage: http://github.com/alexrothenberg/legacy_data
@@ -362,15 +379,15 @@ test_files:
 - examples/generated/j2ee_petstore_sqlite3/tag.rb
 - examples/generated/j2ee_petstore_sqlite3/tag_item.rb
 - examples/generated/j2ee_petstore_sqlite3/ziplocation.rb
-- spec/expected/factories.rb
-- spec/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/j2ee_petstore_adapterspec.rb
+- spec/generators/models_from_tables/expected/factories.rb
+- spec/generators/models_from_tables/expected/post.rb
+- spec/generators/models_from_tables/models_from_tables_generator_spec.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