conventional_models 0.1.1 → 0.1.2

data/README.rdoc

@@ -19,9 +19,6 @@ We have a table called Page and another called ContentItems (not following Activ
   require 'conventional_models'
   ConventionalModels.configure do
     primary_key_name "Id"
-    table_name do |table|
-      table
-    end
   end
   
   # use the models
@@ -51,7 +48,7 @@ Output:
     belongs_to_matcher {|column| column.name.end_with? "_id"}
     belongs_to_name {|column| column.name.gsub(/_id$/, "")}
     primary_key_name "id"
-    table_name {|table_name| table_name.pluralize}
+    table_name {|name| name.pluralize}
     class_name {|table_name| table_name.singularize.camelize}
     ignore_tables "schema_migrations", "sqlite_sequence", "sysdiagrams"
   end

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "cucumber", ">= 0.6.4"
     gem.add_development_dependency "aruba", ">= 0.1.7"
+    gem.add_dependency "activerecord", ">= 2.3.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/conventional_models.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{conventional_models}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Hodgkiss"]
@@ -66,15 +66,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.6.4"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.7"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0.6.4"])
       s.add_dependency(%q<aruba>, [">= 0.1.7"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0.6.4"])
     s.add_dependency(%q<aruba>, [">= 0.1.7"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
   end
 end
 

data/features/conventional_models.feature

@@ -32,11 +32,7 @@ Feature: ConventionalModels
       require 'active_record'
       ActiveRecord::Base.establish_connection(:database => '../test.sqlite', :adapter => 'sqlite3')
       require 'conventional_models'
-      ConventionalModels.configure do
-        table_name do |table|
-          table
-        end
-      end
+      ConventionalModels.configure
       puts "Number of records: #{<model_name>.count}"
       """
     When I run "ruby my_script.rb"
@@ -66,9 +62,6 @@ Feature: ConventionalModels
       require 'conventional_models'
       ConventionalModels.configure do
         primary_key_name "Id"
-        table_name do |table|
-          table
-        end
       end
       page = Page.create :Name => 'test'
       page.content_items.create :Name => 'content1'

data/features/output_model_code.feature

@@ -22,9 +22,6 @@ Feature: Output model code
       require 'conventional_models'
       ConventionalModels.configure do
         primary_key_name "Id"
-        table_name do |table|
-          table
-        end
       end
       puts "ContentItem code:<<\n#{ContentItem.model_code}>>"
       puts "Page code:<<\n#{Page.model_code}>>"

data/lib/conventional_models/conventions.rb

@@ -6,7 +6,7 @@ module ConventionalModels
     end
     
     attr_accessor :ignored_tables, :primary_key_name, :class_name,
-                  :table_name, :belongs_to_matcher, :belongs_to_name
+                  :belongs_to_matcher, :belongs_to_name
     
     class Builder
       def initialize(config)
@@ -14,7 +14,6 @@ module ConventionalModels
         belongs_to_matcher {|column| column.name.end_with? "_id"}
         belongs_to_name {|column| column.name.gsub(/_id$/, "")}
         primary_key_name "id"
-        table_name {|table_name| table_name.pluralize}
         class_name {|table_name| table_name.singularize.camelize}
         ignore_tables "schema_migrations", "sqlite_sequence", "sysdiagrams"
       end
@@ -27,10 +26,6 @@ module ConventionalModels
         @config.primary_key_name = name
       end
       
-      def table_name(&block)
-        @config.table_name = block
-      end
-      
       def belongs_to_matcher(&block)
         @config.belongs_to_matcher = block
       end

data/lib/conventional_models/database.rb

@@ -19,8 +19,7 @@ module ConventionalModels
       @tables.each do |table|
         table.belongs_to_names.each do |belongs_to|
           name = conventions.belongs_to_name.call(belongs_to)
-          table_name = conventions.table_name.call(name)
-          has_many_table = @tables.select{|t| t.name == table_name}.first
+          has_many_table = @tables.select{|t| t.class_name == conventions.class_name.call(name)}.first
           if has_many_table
             has_many_table.lines << "has_many :#{table.name.tableize}, :class_name => '#{table.class_name}', :primary_key => '#{conventions.primary_key_name}', :foreign_key => '#{belongs_to.name}'"
           end

data/lib/conventional_models/table.rb

@@ -18,8 +18,7 @@ module ConventionalModels
       
       @lines << "set_primary_key \"#{conventions.primary_key_name}\""
       
-      table_name = conventions.table_name.call(name)
-      @lines << "set_table_name \"#{table_name}\""
+      @lines << "set_table_name \"#{@name}\""
       
       @columns.each do |column|
         if conventions.belongs_to_matcher.call(column)

data/spec/conventional_models/conventions_spec.rb

@@ -16,15 +16,6 @@ module ConventionalModels
       config.primary_key_name.should == "Id"
     end
   
-    it "should set table name" do
-      config = Conventions.new do
-        table_name do |table_name|
-          table_name
-        end
-      end
-      config.table_name.call("test").should == "test"
-    end
-  
     it "should set belongs to matcher" do
       config = Conventions.new do
         belongs_to_matcher do |column|
@@ -59,8 +50,8 @@ module ConventionalModels
       config.belongs_to_name.call(@site_id_column).should == "site"
       config.belongs_to_matcher.call(@site_id_column).should be_true
       config.primary_key_name.should == "id"
-      config.table_name.call("pages").should == "pages"
       config.class_name.call("pages").should == "Page"
+      config.class_name.call("page").should == "Page"
       config.ignored_tables.should == %w{schema_migrations sqlite_sequence sysdiagrams}
     end
   end

data/spec/conventional_models/table_spec.rb

@@ -36,17 +36,6 @@ module ConventionalModels
         @table.lines[0].should == "set_primary_key \"ID\""
       end
       
-      it "sets the table name" do
-        @conventions = Conventions.new do
-          table_name do |table|
-            "Test"
-          end
-        end
-        @table = Table.new("Page", @columns)
-        @table.apply_conventions(@conventions)
-        @table.lines[1].should == "set_table_name \"Test\""
-      end
-      
       it "sets the class name" do
         @conventions = Conventions.new do
           class_name do |table|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Steve Hodgkiss
@@ -59,6 +59,20 @@ dependencies:
         version: 0.1.7
   prerelease: false
   requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  prerelease: false
+  requirement: *id004
 description: Generate ActiveRecord models automatically with basic relationships based on conventions.
 email: steve@hodgkiss.me.uk
 executables: []