conventional_models 0.2.0 → 0.2.1

data/spec/conventional_models/{conventions_spec.rb → config_spec.rb}

@@ -1,23 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ConventionalModels 
-  describe Conventions do
+  describe Config do
     it "should set ignored tables" do
-      config = Conventions.new do
+      config = Config.new do
         ignore_tables "slc", "abc"
       end
       config.ignored_tables.should == ["slc", "abc"]
     end
   
     it "should set primary key name" do
-      config = Conventions.new do
+      config = Config.new do
         primary_key_name "Id"
       end
       config.primary_key_name.should == "Id"
     end
   
     it "should set belongs to matcher" do
-      config = Conventions.new do
+      config = Config.new do
         belongs_to_matcher do |column|
           true
         end
@@ -26,7 +26,7 @@ module ConventionalModels
     end
   
     it "should set belongs to name" do
-      config = Conventions.new do
+      config = Config.new do
         belongs_to_name do |column|
           column
         end
@@ -35,18 +35,32 @@ module ConventionalModels
     end
     
     it "should set class name" do
-      config = Conventions.new do
+      config = Config.new do
         class_name do |column|
           "test"
         end
       end
       config.class_name.call("").should == "test"
     end
+    
+    it "should set connection" do
+      config = Config.new do
+        connection :adapter => 'sqlite3'
+      end
+      config.connection[:adapter].should == 'sqlite3'
+    end
+    
+    it "should set module name" do
+      config = Config.new do
+        module_name "test"
+      end
+      config.module_name.should == "test"
+    end
   
     it "should have default settings" do
       @site_id_column = Column.new("site_id", nil, "integer")
       
-      config = Conventions.new
+      config = Config.new
       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"

data/spec/conventional_models/database_spec.rb

@@ -2,44 +2,36 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ConventionalModels
   describe Database do
-    before(:each) do
-      @conventions = mock(Conventions)
-      @conventions.stub(:ignored_tables).and_return([])
-      
-      @connection = mock(::ActiveRecord::ConnectionAdapters::AbstractAdapter)
-      @columns = [mock(Column)]
-      
-      ::ActiveRecord::Base.stub(:connection).and_return(@connection)
-      
-      @connection.stub(:tables).and_return(["Test"])
-      @connection.stub(:columns).with("Test").and_return(@columns)
-      
-      @table = mock(Table)
-      @table.stub(:apply_conventions)
-      @table.stub(:belongs_to_names).and_return([])
-      @table.stub(:name).and_return("Test")
-      Table.stub(:new => @table)
+    let(:table) { mock(Table, :apply_conventions => nil, :belongs_to_names => [], :name => "Test") }
+    let(:config) { mock(Config, :ignored_tables => [], :connection => nil) }
+    let(:connection) do
+      mock(::ActiveRecord::ConnectionAdapters::AbstractAdapter, :tables => ["Test"], :columns => columns)
+    end
+    let(:columns) { [mock(Column)] }
+    
+    before do
+      ::ActiveRecord::Base.stub(:connection).and_return(connection)
+      Table.stub(:new => table)
     end
     
     describe ".new" do
-      it "creates a table with the table name, column definitions and conventions" do
-        Table.should_receive(:new).with("Test", @columns, @conventions).and_return(@table)
-        @database = Database.new(@conventions)
-        @database.tables.first.should == @table
+      it "creates a table with the table name, column definitions and config" do
+        Table.should_receive(:new).with("Test", columns, config).and_return(table)
+        Database.new(config).tables.first.should == table
       end
       
-      describe "has many relationships" do
+      context "has many relationships" do
         
-        describe "conventional" do
+        context "conventional" do
           before(:each) do
-            @connection.stub(:tables).and_return(["sites", "pages"])
+            connection.stub(:tables).and_return(["sites", "pages"])
 
             Table.unstub!(:new)
             @site_columns = [Column.new("name", nil, "string")]
             @pages_columns = [Column.new("site_id", nil, "integer")]
-            @connection.stub(:columns).with("sites").and_return(@site_columns)
-            @connection.stub(:columns).with("pages").and_return(@pages_columns)
-            @database = Database.new(Conventions.new)
+            connection.stub(:columns).with("sites").and_return(@site_columns)
+            connection.stub(:columns).with("pages").and_return(@pages_columns)
+            @database = Database.new(Config.new)
           end
 
           it "sets the table name" do
@@ -52,15 +44,15 @@ module ConventionalModels
           end
         end
 
-        describe "unconventional" do
+        context "unconventional" do
           before(:each) do
-            @connection.stub(:tables).and_return(["Site", "Page"])
+            connection.stub(:tables).and_return(["Site", "Page"])
             Table.unstub!(:new)
             @site_columns = [Column.new("Name", nil, "string")]
             @pages_columns = [Column.new("Site_id", nil, "integer")]
-            @connection.stub(:columns).with("Site").and_return(@site_columns)
-            @connection.stub(:columns).with("Page").and_return(@pages_columns)
-            @database = Database.new(Conventions.new{ primary_key_name "ID" })
+            connection.stub(:columns).with("Site").and_return(@site_columns)
+            connection.stub(:columns).with("Page").and_return(@pages_columns)
+            @database = Database.new(Config.new{ primary_key_name "ID" })
           end
 
           it "sets the table name" do
@@ -75,34 +67,34 @@ module ConventionalModels
       end
       
       it "ignores tables" do
-        @conventions = Conventions.new do
+        config = Config.new do
           ignore_tables "Test"
         end
-        @table.should_not_receive(:apply_conventions)
-        @database = Database.new(@conventions)
+        table.should_not_receive(:apply_conventions)
+        @database = Database.new(config)
       end
     end
 
     describe "code outputting" do
       before(:each) do
-        @table.stub(:name).and_return("Test")
+        table.stub(:name).and_return("Test")
       end
       describe "#code" do
         it "should return the code for each table" do
-          @table.should_receive(:code).and_return("test")
-          @database = Database.new(@conventions)
+          table.should_receive(:code).and_return("test")
+          @database = Database.new(config)
           @database.code.should == "test"
         end
       end
     
       describe "#code_for" do
         it "should return the model code for a specific table" do
-          @table.should_receive(:code).and_return("test")
-          @database = Database.new(@conventions)
+          table.should_receive(:code).and_return("test")
+          @database = Database.new(config)
           @database.code_for("Test").should == "test"
         end
         it "should return not found for unknown tables" do
-        @database = Database.new(@conventions)
+        @database = Database.new(config)
           @database.code_for("SomeTable").should == "SomeTable not found"
         end
       end

data/spec/conventional_models/option_parser_spec.rb

@@ -7,7 +7,7 @@ module ConventionalModels
       @option_parser.options
     end
     
-    describe "parsing" do
+    context "parsing" do
       it "accepts a database config file" do
         options_for(["-c", "config/db.yml"]).config.should == "config/db.yml"
         options_for(["--config", "config/db.yml"]).config.should == "config/db.yml"
@@ -34,7 +34,7 @@ module ConventionalModels
       end
     end
     
-    describe "invalid arguments" do
+    context "invalid arguments" do
       it "should set parsed_options? to false" do
         options_for(["--boobs"])
         @option_parser.parsed_options?.should == false

data/spec/conventional_models/options_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 module ConventionalModels
   describe Options do
-    before(:each) do
+    before do
       @options = Options.new
     end
     
-    describe "default options" do
+    context "default options" do
       it "should use rails location for default database.yml" do
         @options.config.should == "config/database.yml"
       end

data/spec/conventional_models/table_spec.rb

@@ -2,10 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ConventionalModels
   describe Table do
-    before(:each) do
-      @columns = [mock(Column, :name => "test")]
-      @conventions = Conventions.new
-    end
+    let(:columns) { [mock(Column, :name => "test")] }
+    let(:config) { Config.new }
     
     def has_item?(array, expected)
       @found = false
@@ -17,69 +15,69 @@ module ConventionalModels
     
     describe ".new" do
       it "sets the name" do
-        Table.new("test", @columns, @conventions).name.should == "test"
+        Table.new("test", columns, config).name.should == "test"
       end
       
       it "sets the columns" do
-        Table.new("test", @columns, @conventions).columns.should == @columns
+        Table.new("test", columns, config).columns.should == columns
       end
     end
     
     describe "#==" do
       it "is true for tables with the same name" do
-        Table.new("Page", @columns, @conventions).should == Table.new("Page", @columns, @conventions)
+        Table.new("Page", columns, config).should == Table.new("Page", columns, config)
       end
       
       it "is false for tables with different names" do
-        Table.new("Page", @columns, @conventions).should_not == Table.new("Bar", @columns, @conventions)
+        Table.new("Page", columns, config).should_not == Table.new("Bar", columns, config)
       end
     end
     
     describe "#conventional_name?" do
       it "is true for tables that have a name that matches rails conventions" do
-        Table.new("Page", @columns, @conventions).conventional_name?.should be_false
-        Table.new("pages", @columns, @conventions).conventional_name?.should be_true
+        Table.new("Page", columns, config).conventional_name?.should be_false
+        Table.new("pages", columns, config).conventional_name?.should be_true
       end
     end
     
     describe ".new" do
       it "sets the primary key" do
-        @conventions = Conventions.new do
+        config = Config.new do
           primary_key_name "ID"
         end
-        @table = Table.new("Page", @columns, @conventions)
+        @table = Table.new("Page", columns, config)
         has_item?(@table.lines, "set_primary_key \"ID\"").should be_true
       end
       
       it "doesn't set the primary key when it is the rails default" do
-        @table = Table.new("Page", @columns, @conventions)
+        @table = Table.new("Page", columns, config)
         has_item?(@table.lines, "set_primary_key \"id\"").should_not == be_true
       end
       
       it "sets the table name" do
-        @table = Table.new("Page", @columns, @conventions)
+        @table = Table.new("Page", columns, config)
         has_item?(@table.lines, "set_table_name \"Page\"").should be_true
       end
       
       it "doesn't set the table name if it is the rails default" do
-        @table = Table.new("pages", @columns, @conventions)
+        @table = Table.new("pages", columns, config)
         has_item?(@table.lines, "set_table_name \"pages\"").should be_false
       end
       
       it "sets the class name" do
-        @conventions = Conventions.new do
+        config = Config.new do
           class_name do |table|
             "BOO"
           end
         end
-        @table = Table.new("Page", @columns, @conventions)
+        @table = Table.new("Page", columns, config)
         @table.class_name.should == "BOO"
       end
       
       it "sets belongs to columns" do
-        @conventions = Conventions.new
-        @columns = [Column.new("Site_id", nil, "integer")]
-        @table = Table.new("Page", @columns, @conventions)
+        config = Config.new
+        columns = [Column.new("Site_id", nil, "integer")]
+        @table = Table.new("Page", columns, config)
         has_item?(@table.lines, "belongs_to :site, :class_name => 'Site'").should be_true
         @table.belongs_to_names.first.name.should == "Site_id"
       end
@@ -88,7 +86,7 @@ module ConventionalModels
     
     describe "#code" do
       before(:each) do
-        @table = Table.new("pages", @columns, @conventions)
+        @table = Table.new("pages", columns, config)
       end
       
       it "returns an activerecord class" do

data/spec/conventional_models_spec.rb

@@ -2,36 +2,25 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ConventionalModels
   describe ConventionalModels do
-    before(:each) do
-      @conventions = mock(Conventions)
-      Conventions.stub(:new => @conventions)
-      
+    let(:config) { mock(Config) }
+    let(:generated_code) { mock(String) }
+    let(:database) { mock(Database, :code => generated_code, :apply_conventions => nil) }
+    
+    before do
+      Config.stub(:new => config)
+      Database.stub(:new => database)
       ConventionalModels.stub(:run_code)
-      
-      @generated_code = mock(String)
-      @database = mock(Database, :code => @generated_code)
-      @database.stub(:apply_conventions).with(@conventions)
-      Database.stub(:new => @database)
-
-      ConventionalModels.stub(:remove)
     end
     
     describe ".configure" do
-      describe "with no args" do
+      context "with no args" do
         it "creates a database object with the conventions" do
-          Database.should_receive(:new).with(@conventions).and_return(@database)
+          Database.should_receive(:new).with(config).and_return(database)
           ConventionalModels.configure
         end
       
         it "run the generated code" do
-          ConventionalModels.should_receive(:run_code).with(@generated_code)
-          ConventionalModels.configure
-        end
-      end
-      describe "second call" do
-        it "should call remove if a database has already been configured" do
-          ConventionalModels.should_receive(:remove).with(@database)
-          ConventionalModels.configure
+          ConventionalModels.should_receive(:run_code).with(generated_code)
           ConventionalModels.configure
         end
       end
@@ -48,13 +37,13 @@ module ConventionalModels
     describe ".model_code" do
       it "returns the database code" do
         ConventionalModels.configure
-        ConventionalModels.model_code.should == @generated_code
+        ConventionalModels.model_code.should == generated_code
       end
     end
     
     describe ".model_code_for" do
       it "returns the model code for a specific model" do
-        @database.should_receive(:code_for).with("Test").and_return("test")
+        database.should_receive(:code_for).with("Test").and_return("test")
         ConventionalModels.configure
         ConventionalModels.model_code_for("Test").should == "test"
       end
@@ -68,18 +57,5 @@ module ConventionalModels
         ConventionalModels.run_console!
       end
     end
-    
-    describe ".remove" do
-      before(:each) do
-        ConventionalModels.unstub(:remove)
-        table = mock(Table, :class_name => "TestTable")
-        @database.should_receive(:tables).and_return([table])
-        Object.should_receive(:send).with(:remove_const, :TestTable)
-      end
-      
-      it "removes the table constants from the environment" do
-        ConventionalModels.remove(@database)
-      end
-    end
   end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Steve Hodgkiss
@@ -14,13 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 +01:00
+date: 2010-05-09 00:00:00 +01:00
 default_executable: cmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -29,12 +29,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  prerelease: false
-  requirement: *id001
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -43,12 +43,12 @@ dependencies:
         - 6
         - 4
         version: 0.6.4
-  prerelease: false
-  requirement: *id002
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: aruba
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,12 +57,12 @@ dependencies:
         - 1
         - 7
         version: 0.1.7
-  prerelease: false
-  requirement: *id003
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,8 +71,8 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  prerelease: false
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 description: Generate ActiveRecord models automatically with basic relationships based on conventions.
 email: steve@hodgkiss.me.uk
 executables: 
@@ -83,49 +83,26 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- bin/cmconsole
-- conventional_models.gemspec
-- features/cmconsole.feature
-- features/conventional_models.feature
-- features/output_model_code.feature
-- features/step_definitions/cmconsole_steps.rb
-- features/step_definitions/conventional_models_steps.rb
-- features/step_definitions/output_model_code_steps.rb
-- features/support/env.rb
-- lib/conventional_models.rb
 - lib/conventional_models/active_record_base_model_for.rb
 - lib/conventional_models/cli.rb
 - lib/conventional_models/column.rb
-- lib/conventional_models/conventions.rb
+- lib/conventional_models/config.rb
 - lib/conventional_models/database.rb
 - lib/conventional_models/option_parser.rb
 - lib/conventional_models/options.rb
 - lib/conventional_models/table.rb
 - lib/conventional_models/version.rb
-- spec/conventional_models/cli_spec.rb
-- spec/conventional_models/conventions_spec.rb
-- spec/conventional_models/database_spec.rb
-- spec/conventional_models/option_parser_spec.rb
-- spec/conventional_models/options_spec.rb
-- spec/conventional_models/table_spec.rb
-- spec/conventional_models_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- lib/conventional_models.rb
+- bin/cmconsole
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/stevehodgkiss/conventional_models
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -140,21 +117,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: conventional_models
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generate ActiveRecord models. For lazy people.
 test_files: 
 - spec/conventional_models/cli_spec.rb
-- spec/conventional_models/conventions_spec.rb
+- spec/conventional_models/config_spec.rb
 - spec/conventional_models/database_spec.rb
 - spec/conventional_models/option_parser_spec.rb
 - spec/conventional_models/options_spec.rb
 - spec/conventional_models/table_spec.rb
 - spec/conventional_models_spec.rb
 - spec/spec_helper.rb
+- features/cmconsole.feature
+- features/conventional_models.feature
+- features/multiple_databases.feature
+- features/output_model_code.feature
+- features/step_definitions/cmconsole_steps.rb
+- features/step_definitions/conventional_models_steps.rb
+- features/step_definitions/multiple_databases.rb
+- features/step_definitions/output_model_code_steps.rb
+- features/support/env.rb
+- Gemfile
+- Gemfile.lock