rmre 0.0.3 → 0.0.4

data/lib/rmre/generator.rb

@@ -84,7 +84,7 @@ module Rmre
     def constraint_src(table_name, fk={})
       src = nil
       if fk['from_table'] == table_name
-        src = "belongs_to :#{fk['to_table'].downcase}, :class_name => '#{fk['to_table'].tableize.classify}', :foreign_key => :#{fk['from_column']}"
+        src = "belongs_to :#{fk['to_table'].downcase.singularize}, :class_name => '#{fk['to_table'].tableize.classify}', :foreign_key => :#{fk['from_column']}"
       elsif fk['to_table'] == table_name
         src = "has_many :#{fk['from_table'].downcase.pluralize}, :class_name => '#{fk['from_table'].tableize.classify}'"
       end

data/lib/rmre/model.eruby

@@ -1,17 +1,18 @@
 class <%= table_name.tableize.classify %> < ActiveRecord::Base
   <% unless table_name == table_name.tableize %>
-    <%= "set_table_name '#{table_name}'" -%>
+    <%= "self.table_name = '#{table_name}'" -%>
   <% end %>
 
   <% unless "id" == primary_key || primary_key.nil? %>
-    <%= "set_primary_key :#{primary_key}" -%>
+    <%= "self.primary_key = :#{primary_key}" -%>
   <% end %>
 
   <% if has_type_column %>
-    <%= "set_inheritance_column :ruby_type" -%>
+    <%= "self.inheritance_column = :ruby_type" -%>
   <% end %>
 
   <% constraints.each do |constraint| %>
     <%= constraint -%>
+    
   <% end %>
 end

data/lib/rmre/version.rb

@@ -1,3 +1,3 @@
 module Rmre
-  VERSION = "0.0.3" unless defined?(::Rmre::VERSION)
+  VERSION = "0.0.4" unless defined?(::Rmre::VERSION)
 end

data/spec/rmre/generator_spec.rb

@@ -38,7 +38,7 @@ module Rmre
 
     it "should contain set_table_name 'incl1_tbl1' in generated source" do
       generator.stub_chain(:connection, :primary_key).and_return("id")
-      generator.send(:generate_model_source, 'incl1_tbl1', []).should match(/set_table_name \'incl1_tbl1\'/)
+      generator.send(:generate_model_source, 'incl1_tbl1', []).should match(/self\.table_name = \'incl1_tbl1\'/)
     end
 
     it "should create three model files" do
@@ -68,7 +68,7 @@ module Rmre
       generator.connection.stub(:primary_key).and_return("usr_id")
 
       File.stub(:open).and_yield(file)
-      file.should_receive(:write).with(/set_primary_key :usr_id/)
+      file.should_receive(:write).with(/self\.primary_key = :usr_id/)
 
       generator.create_model("users")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmre
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20264180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20264180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &20263340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *20263340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.6
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20262920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20262920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rmre creates ActiveRecord models for legacy database with all constraints
   found.
 email:
@@ -95,8 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: rmre
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The easiest way to create ActiveRecord models for legacy database
 test_files: []
+has_rdoc: