dbd4 1.0.2 → 1.0.3

data/lib/dbd4/rails_migration_file.rb

@@ -96,11 +96,8 @@ module DBD4
     
     def update(table)
       raise "MigrationFile : migration file name not given" if ! @migrationfile 
-  
-      puts "Updating migration file for table #{@tablename} (file : #{@migrationfile})..."
-      newFile = File.open(@migrationfile, "w")
       c = Inflector.camelize(@tablename)
-      newFile.puts <<"MIGRATIONFILE"
+      new_migration_file_content = <<"MIGRATIONFILE"
 class Create#{c} < ActiveRecord::Migration
   def self.up
     create_table :#{table.name} do |t|
@@ -113,6 +110,13 @@ class Create#{c} < ActiveRecord::Migration
   end
 end 
 MIGRATIONFILE
+
+      old_migration_file_content = IO.readlines(@migrationfile).join("")
+      if (old_migration_file_content != new_migration_file_content)
+        puts "Updating migration file for table #{@tablename} (file : #{@migrationfile})..."
+        newFile = File.open(@migrationfile, "w")
+        newFile.puts new_migration_file_content
+      end
     end
       
     def to_str

data/lib/dbd4/rails_model_file.rb

@@ -22,6 +22,8 @@
 #--
 
 require 'slurp'
+require 'deep_clone'
+include DeepClone
 
 module DBD4
   class RailsModelFile
@@ -77,6 +79,7 @@ module DBD4
   
       @content = IO.read(@modelfile) if ! @content
       @lines = IO.readlines(@modelfile) if @lines.empty?
+      @original_lines = Array.new(@lines)
           
       raise "ModelFile : Cannot load, no content was given" if ! @content
       
@@ -176,6 +179,8 @@ module DBD4
       raise "ModelFile : model file name not given" if ! @modelfile 
       raise "ModelFile : no content given" if @content == nil 
        
+      left_over = @elements.deep_clone
+      
       table.relation_starts.each_value do |r|
         dname = ""
         if r.type == :one2one
@@ -204,7 +209,7 @@ module DBD4
           else
             @lines[element[:start]].sub!(/(#{etype}[^,]+)/, "\\1, :as => '#{r.destination_column.polymorphic}'")
           end
-          @elements[etype].delete(dname)  
+          left_over[etype].delete(dname)  
         else
           @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
           if r.destination_column.polymorphic
@@ -245,17 +250,18 @@ module DBD4
               # do nothing
             end
           end
-          @elements[etype].delete(dname)  
+          left_over[etype].delete(dname)  
         else
           @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
           if r.destination_column.polymorphic
+            @elements[etype] = { dname => { :polymorphic => true, :added => true } }
             @lines[@elements['class'][:start]] += ", :polymorphic => true"
           end
-          @lines[@elements['class'][:start]] += "\n"
+          @lines[@elements['class'][:start]] += "\n"        
         end
       end
       
-      @elements.each do |k1, v1|
+      left_over.each do |k1, v1|
         next if k1 == 'class' or v1.empty?
         v1.each do |k2, v2|
           @warnings << "Warning in file #{@modelfile} at line #{v2[:start]}"
@@ -267,9 +273,14 @@ module DBD4
         end
       end
       
-      puts "Updating model #{@modelname} (file : #{@modelfile})..."
-      newFile = File.open(@modelfile, "w")
-      newFile.puts @lines
+      # If we made a change to the document, generate it
+      original_document_modified = @lines <=> @original_lines
+      
+      if (original_document_modified != 0)
+        puts "Updating model #{@modelname} (file : #{@modelfile})..."
+        newFile = File.open(@modelfile, "w")
+        newFile.puts @lines
+      end
     end
       
     def to_str

data/tests/unit/test_dbd4.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 require 'dbd4/dbd4_model_file'
 require 'test/unit'
 require 'deep_clone'
+require 'pp'
 
 include DeepClone
 
@@ -20,7 +21,23 @@ $files = {
   'app/models/jobs_person.rb' => "class JobsPerson < ActiveRecord::Base\nend\n",
   'app/models/dog.rb' => "class Dog < ActiveRecord::Base\nend\n",
   'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
-  'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n"
+  'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+  'db/migrate/001_create_cats.rb' => "",
+  'db/migrate/001_create_cats.rb' => "",
+  'db/migrate/001_create_cats.rb' => "",
+  'db/migrate/002_create_computers_users.rb' => "",
+  'db/migrate/003_create_computers.rb' => "",
+  'db/migrate/004_create_people.rb' => "",
+  'db/migrate/005_create_users.rb' => "",
+  'db/migrate/006_create_security_numbers.rb' => "",
+  'db/migrate/007_create_jobs.rb' => "",
+  'db/migrate/008_create_jobs_people.rb' => "",
+  'db/migrate/009_create_generic_animals.rb' => "",
+  'db/migrate/010_create_shoes.rb' => "",
+  'db/migrate/011_create_wives.rb' => "",
+  'db/migrate/012_create_dogs.rb' => "",
+  'db/migrate/013_create_kids.rb' => "",
+  'db/migrate/014_create_houses.rb' => ""
 }
 
 $files_written_to = Array.new
@@ -189,7 +206,21 @@ INPUT
       'app/models/jobs_person.rb' => "class JobsPerson < ActiveRecord::Base\nend\n",
       'app/models/dog.rb' => "class Dog < ActiveRecord::Base\nend\n",
       'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
-      'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n"
+      'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+      'db/migrate/001_create_cats.rb' => "",
+      'db/migrate/002_create_computers_users.rb' => "",
+      'db/migrate/003_create_computers.rb' => "",
+      'db/migrate/004_create_people.rb' => "",
+      'db/migrate/005_create_users.rb' => "",
+      'db/migrate/006_create_security_numbers.rb' => "",
+      'db/migrate/007_create_jobs.rb' => "",
+      'db/migrate/008_create_jobs_people.rb' => "",
+      'db/migrate/009_create_generic_animals.rb' => "",
+      'db/migrate/010_create_shoes.rb' => "",
+      'db/migrate/011_create_wives.rb' => "",
+      'db/migrate/012_create_dogs.rb' => "",
+      'db/migrate/013_create_kids.rb' => "",
+      'db/migrate/014_create_houses.rb' => ""    
     }
     @b.generateModelFiles
     #puts $files_written_to
@@ -226,7 +257,22 @@ INPUT
       'app/models/jobs_person.rb' => "class JobsPerson < ActiveRecord::Base\nend\n",
       'app/models/dog.rb' => "class Dog < ActiveRecord::Base\n  has_many :generic_animals, :as => gogole\nend\n",
       'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
-      'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n"
+      'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+      'db/migrate/001_create_cats.rb' => "",
+      'db/migrate/001_create_cats.rb' => "",
+      'db/migrate/002_create_computers_users.rb' => "",
+      'db/migrate/003_create_computers.rb' => "",
+      'db/migrate/004_create_people.rb' => "",
+      'db/migrate/005_create_users.rb' => "",
+      'db/migrate/006_create_security_numbers.rb' => "",
+      'db/migrate/007_create_jobs.rb' => "",
+      'db/migrate/008_create_jobs_people.rb' => "",
+      'db/migrate/009_create_generic_animals.rb' => "",
+      'db/migrate/010_create_shoes.rb' => "",
+      'db/migrate/011_create_wives.rb' => "",
+      'db/migrate/012_create_dogs.rb' => "",
+      'db/migrate/013_create_kids.rb' => "",
+      'db/migrate/014_create_houses.rb' => ""
     }
 
     $files_written_to = Array.new

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: dbd4
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 date: 2006-08-23 00:00:00 -04:00
 summary: A package for importing DB Designer 4 xml models in rails.
 require_paths: 
@@ -30,10 +30,10 @@ authors:
 - Daniel Shane
 files: 
 - lib/slurp.rb
-- lib/dbd4/dbd4_model_file.rb
-- lib/dbd4/ordered_hash.rb
 - lib/dbd4/rails_migration_file.rb
 - lib/dbd4/rails_model_file.rb
+- lib/dbd4/dbd4_model_file.rb
+- lib/dbd4/ordered_hash.rb
 - bin/dbd4
 - README
 test_files: