model_mill 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Model Mill #
 
+## 0.4.0 / 2011-01-26
+* Now generates belongs_to and has_many associations base on rails conventions
+
 ## 0.3.0 / 2011-01-25
 * Now generates an attr_accessible for all the columns in the table the model is generated from

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/generators/model_mill/models/models_generator.rb

@@ -15,6 +15,8 @@ module ModelMill
           @model_name = model_name_from_table_name table_name
           @model_file_name = model_file_name_from_table_name table_name
           @columns = connection.columns(table_name)
+          @indexes = connection.indexes(table_name)
+          @associations = detected_associations(table_name, @columns)
           template 'model.rb', "app/models/#{options[:namespace] ? options[:namespace]+'/' : ''}#{@model_file_name}.rb"
         end
         puts %Q(config.autoload_paths += %W(\#{config.root}/app/models/#{options[:namespace].downcase})) if options[:namespace]
@@ -44,6 +46,21 @@ module ModelMill
       def model_file_name_from_table_name tn
         tn.singularize.underscore
       end
+
+      def detected_associations(table_name, columns)
+        {:belongs_to => [], :has_many => []}.tap do |associations|
+          columns.each do |col|
+            associations[:belongs_to].push({:name => $1}) if col.name =~ /(.*)\_id$/
+          end
+
+          discovered_tables.each do |tn|
+            next if tn == table_name
+            connection.columns(tn).each do |col|
+              associations[:has_many].push({:name => tn}) if col.name =~ /#{table_name.singularize}\_id$/
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/generators/model_mill/models/templates/model.rb

@@ -1,4 +1,6 @@
 class <%= options[:namespace] ? options[:namespace].camelize + '::' : '' %><%= @model_name %> < <%= options[:namespace] ? options[:namespace].camelize : 'ActiveRecord' %>::Base
   attr_accessible <%= @columns.map(&:name).sort.map{|c| ":#{c}"}.join(', ') %>
+
+  <% @associations.each do |cardinality, associations| -%><% associations.each do |a| -%><%= "#{cardinality} :#{a[:name]}" %><% end %><% end %>
 end
 

data/model_mill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{model_mill}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Martinez"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-26}
   s.description = %q{Generates bare model files that can be used for a migration of legacy data to new models or to get a jump on development for an existing database}
   s.email = %q{joe@joemartinez.name}
   s.extra_rdoc_files = [
@@ -77,6 +77,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/models/schema_migration.rb",
+    "spec/dummy/app/models/user.rb",
+    "spec/dummy/app/models/widget.rb",
     "spec/dummy/config/application.rb",
     "spec/dummy/config/boot.rb",
     "spec/dummy/config/environment.rb",

data/spec/dummy/app/models/schema_migration.rb

@@ -0,0 +1,6 @@
+class SchemaMigration < ActiveRecord::Base
+  attr_accessible :version
+
+  
+end
+

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  attr_accessible :created_at, :email, :first_name, :id, :last_name, :updated_at
+
+  has_many :widgets
+end
+

data/spec/dummy/app/models/widget.rb

@@ -0,0 +1,6 @@
+class Widget < ActiveRecord::Base
+  attr_accessible :color, :created_at, :id, :quantity, :updated_at, :user_id
+
+  belongs_to :user
+end
+

data/spec/dummy/db/migrate/20110125024703_create_some_tables.rb

@@ -10,6 +10,7 @@ class CreateSomeTables < ActiveRecord::Migration
     create_table :widgets, :force => true do |t|
       t.integer :quantity, :default => 0
       t.string :color
+      t.references :user
       t.timestamps
     end
   end

data/spec/dummy/db/schema.rb

@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20110125024703) do
   create_table "widgets", :force => true do |t|
     t.integer  "quantity",   :default => 0
     t.string   "color"
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/spec/generators/model_generator_spec.rb

@@ -67,13 +67,13 @@ describe 'models_generator' do
       @tables = %w(users widgets)
       @table_columns = {
         'users'   => %w(created_at email first_name id last_name updated_at),
-        'widgets' => %w(color created_at id quantity updated_at)
+        'widgets' => %w(color created_at id quantity updated_at user_id)
       }
     end
 
     after :each do
       @tables.each do |tn|
-        FileUtils.rm_r File.expand_path("app/models/#{tn.singularize.underscore}.rb", ::Rails.root)
+        #FileUtils.rm_r File.expand_path("app/models/#{tn.singularize.underscore}.rb", ::Rails.root)
       end
     end
 
@@ -96,6 +96,14 @@ describe 'models_generator' do
         end
       end
     end
+
+    it 'adds associations' do
+      GeneratorSpec.with_generator do |g|
+        g.run_generator
+        file_contents("app/models/widget.rb").should match(/belongs_to :user/)
+        file_contents("app/models/user.rb").should match(/has_many :widgets/)
+      end
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_mill
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Joe Martinez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -216,6 +216,9 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/model_mill_spec.rb
 - spec/spec_helper.rb
+- spec/dummy/app/models/schema_migration.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/widget.rb
 - spec/matchers/all.rb
 - spec/matchers/generate_file.rb
 - spec/matchers/generate_migration.rb
@@ -258,6 +261,9 @@ summary: Generates ActiveRecord models from existing database tables.
 test_files: 
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/schema_migration.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/widget.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/environment.rb