active_record_schema 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/active_record_schema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "active_record_schema"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-17"
+  s.date = "2012-08-19"
   s.description = "ActiveRecordSchema is an ActiveRecord extension that allows you to write the database schema for a model within the model itself and to generate migrations directly from models."
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [

data/lib/generators/migration/from_generator.rb

@@ -40,6 +40,10 @@ module Migration
     def model
       @current_model
     end
+    
+    def inherits?
+      model.superclass < ActiveRecord::Base
+    end
        
     def models
       @models ||= model_names.map {|name|

data/lib/generators/migration/templates/migration_from_model.rb.erb

@@ -1,26 +1,28 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
 <%- if !model.schema.table_exists? -%>
-    create_table :<%= model.schema.prefixed_table_name %>
+    create_table :<%= model.schema.prefixed_table_name %> unless table_exists?(:<%= model.schema.prefixed_table_name %>)
 
 <%- end -%>
 <%- model.schema.diff(:fields, :add).each do |field| -%>
-    add_column :<%= model.schema.prefixed_table_name %>, <%= field.name.inspect %>, <%= field.type.inspect %><%= ", #{field.options.inspect}" if !field.options.blank? %>
+    add_column :<%= model.schema.prefixed_table_name %>, <%= field.name.inspect %>, <%= field.type.inspect %><%= ", #{field.options.inspect}" if !field.options.blank? %> unless column_exists?(:<%= model.schema.prefixed_table_name %>, <%= field.name.inspect %>)
 <%- end -%>
 
 <%- model.schema.diff(:indexes, :add).each do |index| -%>
-    add_index :<%= model.schema.prefixed_table_name %>, <%= index.name.inspect %><%= ", #{index.options.inspect}" if !index.options.blank? %>
+    add_index :<%= model.schema.prefixed_table_name %>, <%= index.name.inspect %><%= ", #{index.options.inspect}" if !index.options.blank? %> unless index_exists?(:<%= model.schema.prefixed_table_name %>, <%= index.name.inspect %>)
 <%- end -%>
 
 <%- model.schema.diff(:joins, :add).each do |join| -%>
-    create_table :<%= join.table %>, :id => false do |t|
-      t.integer  <%=  join.key1.inspect %>
-      t.integer  <%=  join.key2.inspect %>
+    unless table_exists?(:<%= join.table %>)   
+      create_table :<%= join.table %>, :id => false do |t|
+        t.integer  <%=  join.key1.inspect %>
+        t.integer  <%=  join.key2.inspect %>
+      end
+      <%- if join.index -%>
+      add_index :<%= join.table %>, <%= join.key1.inspect %>
+      add_index :<%= join.table %>, <%= join.key2.inspect %>
+      <%- end -%> 
     end
-    <%- if join.index -%>
-    add_index :<%= join.table %>, <%= join.key1.inspect %>
-    add_index :<%= join.table %>, <%= join.key2.inspect %>
-    <%- end -%> 
 <%- end -%>
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -884911166514939792
+      hash: -2284041961868308555
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: