conventional_models 0.2.0 → 0.2.1

data/Gemfile

@@ -1,8 +1,9 @@
 source :gemcutter
 
 group :features do
-  gem "cucumber", "0.6.4"
-  gem "aruba", "0.1.7"
+  gem "cucumber", "0.7.2"
+  gem "aruba"
+  gem "open4"
 end
 
 group :specs do
@@ -12,6 +13,7 @@ end
 group :development do
   gem "jeweler"
   gem "rake"
+  gem "ZenTest"
 end
 
 gem "activerecord", "2.3.5"

data/Gemfile.lock

@@ -1,5 +1,9 @@
 --- 
 dependencies: 
+  ZenTest: 
+    group: 
+    - :development
+    version: ">= 0"
   activerecord: 
     group: 
     - :default
@@ -19,7 +23,7 @@ dependencies:
   aruba: 
     group: 
     - :features
-    version: = 0.1.7
+    version: ">= 0"
   jeweler: 
     group: 
     - :development
@@ -27,43 +31,51 @@ dependencies:
   cucumber: 
     group: 
     - :features
-    version: = 0.6.4
+    version: = 0.7.2
+  open4: 
+    group: 
+    - :features
+    version: ">= 0"
 specs: 
 - rake: 
     version: 0.8.7
+- ZenTest: 
+    version: 4.3.1
 - activesupport: 
     version: 2.3.5
 - activerecord: 
     version: 2.3.5
 - aruba: 
-    version: 0.1.7
+    version: 0.1.9
 - builder: 
     version: 2.1.2
+- bundler: 
+    version: 0.9.24
 - diff-lcs: 
     version: 1.1.2
+- trollop: 
+    version: 1.16.2
+- gherkin: 
+    version: 1.0.25
 - json_pure: 
-    version: 1.2.4
-- polyglot: 
-    version: 0.3.1
+    version: 1.4.3
 - term-ansicolor: 
     version: 1.0.5
-- treetop: 
-    version: 1.4.5
 - cucumber: 
-    version: 0.6.4
+    version: 0.7.2
 - gemcutter: 
     version: 0.5.0
 - git: 
     version: 1.2.5
-- rubyforge: 
-    version: 2.0.4
 - jeweler: 
     version: 1.4.0
+- open4: 
+    version: 1.0.1
 - rspec: 
     version: 1.3.0
 - sqlite3-ruby: 
     version: 1.2.5
-hash: e54d068ab5b54822142a3392faafd4850696a431
+hash: 49b2ba6893f5940e80f19c400ec7f4a2d38964a5
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/features/cmconsole.feature

@@ -9,7 +9,7 @@ Feature: Cmconsole
       """
       development:
         adapter: sqlite3
-        database: test.sqlite
+        database: development.sqlite
         pool: 5
         timeout: 5000
         
@@ -26,8 +26,8 @@ Feature: Cmconsole
         timeout: 5000
       """
     And a table "pages"
-    When I run "../../bin/cmconsole"
-    Then I should see ">> "
+    When I run "../../bin/cmconsole" as child "irb"
+    Then I should see ">> " from child "irb"
   
   
 

data/features/conventional_models.feature

@@ -10,7 +10,7 @@ Feature: ConventionalModels
       $:.unshift("../../lib")
       require 'rubygems'
       require 'active_record'
-      ActiveRecord::Base.establish_connection(:database => 'test.sqlite', :adapter => 'sqlite3')
+      ActiveRecord::Base.establish_connection(:database => 'development.sqlite', :adapter => 'sqlite3')
       require 'conventional_models'
       ConventionalModels.configure
       puts "Number of records: #{<model_name>.count}"
@@ -30,7 +30,7 @@ Feature: ConventionalModels
       $:.unshift("../../lib")
       require 'rubygems'
       require 'active_record'
-      ActiveRecord::Base.establish_connection(:database => 'test.sqlite', :adapter => 'sqlite3')
+      ActiveRecord::Base.establish_connection(:database => 'development.sqlite', :adapter => 'sqlite3')
       require 'conventional_models'
       ConventionalModels.configure
       puts "Number of records: #{<model_name>.count}"
@@ -58,7 +58,7 @@ Feature: ConventionalModels
       $:.unshift("../../lib")
       require 'rubygems'
       require 'active_record'
-      ActiveRecord::Base.establish_connection(:database => 'test.sqlite', :adapter => 'sqlite3')
+      ActiveRecord::Base.establish_connection(:database => 'development.sqlite', :adapter => 'sqlite3')
       require 'conventional_models'
       ConventionalModels.configure do
         primary_key_name "Id"

data/features/multiple_databases.feature

@@ -0,0 +1,43 @@
+Feature: Multiple database connection
+  In order to transfer data between databases
+  As a user
+  I want to be able to connect and generate models for multiple databases
+
+  Scenario: Connect to multiple database
+    Given a table "pages" in "development"
+    And a table "pages" in "test"
+    And a file named "my_script.rb" with:
+      """
+      $:.unshift("../../lib")
+      require 'rubygems'
+      require 'active_record'
+      ActiveRecord::Base.establish_connection(:database => 'development.sqlite', :adapter => 'sqlite3')
+      require 'conventional_models'
+      config = {
+        "development" => {
+          "database" => 'development.sqlite',
+          "adapter" => 'sqlite3'
+        },
+        "test" => {
+          "database" => 'test.sqlite',
+          "adapter" => 'sqlite3'
+        }
+      }
+      ConventionalModels.configure do
+        connection config["development"]
+        module_name "Development"
+      end
+      ConventionalModels.configure do
+        connection config["test"]
+        module_name "Test"
+      end
+      puts ConventionalModels.model_code
+      Development::Page.create!
+      Development::Page.create!
+      Test::Page.create!
+      puts "Number of development records: #{Development::Page.count}"
+      puts "Number of production records: #{Test::Page.count}"
+      """
+    When I run "ruby my_script.rb"
+    Then I should see "Number of development records: 2"
+    Then I should see "Number of production records: 1"

data/features/output_model_code.feature

@@ -18,7 +18,7 @@ Feature: Output model code
       $:.unshift("../../lib")
       require 'rubygems'
       require 'active_record'
-      ActiveRecord::Base.establish_connection(:database => 'test.sqlite', :adapter => 'sqlite3')
+      ActiveRecord::Base.establish_connection(:database => 'development.sqlite', :adapter => 'sqlite3')
       require 'conventional_models'
       ConventionalModels.configure do
         primary_key_name "Id"

data/features/step_definitions/multiple_databases.rb

@@ -0,0 +1,4 @@
+Given /^a table "([^\"]*)" in "([^\"]*)"$/ do |name, connection|
+  ActiveRecord::Base.establish_connection(connection)
+  ActiveRecord::Base.connection.execute "CREATE TABLE \"#{name}\" (\"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)"
+end

data/features/support/env.rb

@@ -9,6 +9,10 @@ require 'active_record'
 Before do
   config = {
     "development" => {
+      "database" => 'tmp/aruba/development.sqlite',
+      "adapter" => 'sqlite3'
+    },
+    "test" => {
       "database" => 'tmp/aruba/test.sqlite',
       "adapter" => 'sqlite3'
     }
@@ -18,6 +22,6 @@ Before do
   
   system "mkdir -p tmp"
   system "mkdir -p tmp/aruba"
-  system 'rm -f tmp/aruba/test.sqlite'
+  system 'rm -f tmp/aruba/development.sqlite'
   ActiveRecord::Base.establish_connection(config["development"])
 end

data/lib/conventional_models.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'active_record'
 require 'active_support'
 require 'conventional_models/version'
-require 'conventional_models/conventions'
+require 'conventional_models/config'
 require 'conventional_models/database'
 require 'conventional_models/table'
 require 'conventional_models/column'
@@ -16,12 +16,9 @@ require 'irb/completion'
 module ConventionalModels
   @@database = nil
   
-  def self.configure(&block)
-    @@conventions = Conventions.new(&block)
-    unless @@database.nil?
-      remove(@@database)
-    end
-    @@database = Database.new(@@conventions)
+  def self.configure(config=nil, &block)
+    @@config = Config.new(&block)
+    @@database = Database.new(@@config)
     run_code @@database.code
   end
   
@@ -48,10 +45,4 @@ module ConventionalModels
     ActiveRecord::Base.configurations = config
     ActiveRecord::Base.establish_connection(config[environment])
   end
-  
-  def self.remove(database)
-    database.tables.map{|t| t.class_name.to_sym}.each do |class_sym|
-      Object.send(:remove_const, class_sym)
-    end
-  end
 end

data/lib/conventional_models/{conventions.rb → config.rb}

@@ -1,12 +1,12 @@
 module ConventionalModels
-  class Conventions
+  class Config
     def initialize(&block)
       builder = Builder.new(self)
       builder.instance_eval(&block) if block
     end
     
-    attr_accessor :ignored_tables, :primary_key_name, :class_name,
-                  :belongs_to_matcher, :belongs_to_name
+    attr_accessor :ignored_tables, :primary_key_name, :class_name, :base_class,
+                  :belongs_to_matcher, :belongs_to_name, :connection, :module_name
     
     class Builder
       def initialize(config)
@@ -16,6 +16,7 @@ module ConventionalModels
         primary_key_name "id"
         class_name {|table_name| table_name.singularize.camelize}
         ignore_tables "schema_migrations", "sqlite_sequence", "sysdiagrams"
+        base_class "::ActiveRecord::Base"
       end
       
       def ignore_tables(*tables)
@@ -37,6 +38,18 @@ module ConventionalModels
       def class_name(&block)
         @config.class_name = block
       end
+      
+      def connection(conn)
+        @config.connection = conn
+      end
+      
+      def module_name(name)
+        @config.module_name = name
+      end
+      
+      def base_class(name)
+        @config.base_class = name
+      end
     end
   end
   

data/lib/conventional_models/database.rb

@@ -4,9 +4,25 @@ module ConventionalModels
   class Database
     attr_accessor :tables
     
-    def initialize(conventions)
-      @connection = ::ActiveRecord::Base.connection
-      @conventions = conventions
+    def initialize(config)
+      if config.connection.nil?
+        @connection = ::ActiveRecord::Base.connection
+      else
+        base_class_code = []
+        base_class_code << "module ::#{config.module_name}"
+        base_class_code << "  class Base < ActiveRecord::Base;"
+        base_class_code << "    @abstract_class = true;"
+        base_class_code << "  end;"
+        base_class_code << "end"
+        eval base_class_code.join
+        @base_class = "::#{config.module_name}::Base".constantize
+        @base_class.class_eval do
+          establish_connection config.connection
+        end
+        config.base_class = @base_class
+        @connection = @base_class.connection
+      end
+      @config = config
       @tables = []
       apply_conventions
     end
@@ -26,22 +42,22 @@ module ConventionalModels
     
     protected
       def apply_conventions
-        @connection.tables.select{|table| !@conventions.ignored_tables.include? table}.each do |table|
-          @tables << Table.new(table, @connection.columns(table), @conventions)
+        @connection.tables.select{|table| !@config.ignored_tables.include? table}.each do |table|
+          @tables << Table.new(table, @connection.columns(table), @config)
         end
 
         @tables.each do |table|
           table.belongs_to_names.each do |belongs_to|
-            name = @conventions.belongs_to_name.call(belongs_to)
-            has_many_table = @tables.select{|t| t.class_name == @conventions.class_name.call(name)}.first
+            name = @config.belongs_to_name.call(belongs_to)
+            has_many_table = @tables.select{|t| t.class_name == @config.class_name.call(name)}.first
             if has_many_table
               unconventions = []
               unless table.conventional_name?
                 unconventions << ":class_name => '#{table.class_name}'"
                 unconventions << ":foreign_key => '#{belongs_to.name}'"
               end
-              unless @conventions.primary_key_name == "id"
-                unconventions << ":primary_key => '#{@conventions.primary_key_name}'"
+              unless @config.primary_key_name == "id"
+                unconventions << ":primary_key => '#{@config.primary_key_name}'"
               end
               
               has_many_table.lines << ["has_many :#{table.name.tableize}", "#{unconventions.join(", ")}"].select do |convention|

data/lib/conventional_models/table.rb

@@ -7,7 +7,7 @@ module ConventionalModels
       @columns = columns
       @lines = []
       @belongs_to_names = []
-      @conventions = conventions
+      @config = conventions
       
       apply_conventions
     end
@@ -17,7 +17,7 @@ module ConventionalModels
     end
     
     def code
-      "class ::#{@name.singularize.camelize} < ::ActiveRecord::Base\n#{@lines.map{|l| "  #{l}"}.join("\n")}\nend"
+      "class ::#{@class_name} < #{@config.base_class}\n#{@lines.map{|l| "  #{l}"}.join("\n")}\nend"
     end
     
     def conventional_name?
@@ -27,17 +27,21 @@ module ConventionalModels
     protected
     
       def apply_conventions
-        @class_name = @conventions.class_name.call(@name)
-      
-        @lines << "set_primary_key \"#{@conventions.primary_key_name}\"" unless @conventions.primary_key_name == "id"
+        @class_name = @config.class_name.call(@name)
+        
+        unless @config.module_name.nil?
+          @class_name = "#{@config.module_name}::#{@class_name}"
+        end
+        
+        @lines << "set_primary_key \"#{@config.primary_key_name}\"" unless @config.primary_key_name == "id"
       
         @lines << "set_table_name \"#{@name}\"" unless @name.tableize == @name
       
         @columns.each do |column|
-          if @conventions.belongs_to_matcher.call(column)
-            name = @conventions.belongs_to_name.call(column)
+          if @config.belongs_to_matcher.call(column)
+            name = @config.belongs_to_name.call(column)
             @belongs_to_names << column
-            @lines << "belongs_to :#{name.underscore}, :class_name => '#{@conventions.class_name.call(name)}'"
+            @lines << "belongs_to :#{name.underscore}, :class_name => '#{@config.class_name.call(name)}'"
           end
         end
       end

data/lib/conventional_models/version.rb

@@ -2,7 +2,7 @@ module ConventionalModels #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    BUILD = 0
+    BUILD = 1
  
     STRING = [MAJOR, MINOR, BUILD].join('.')
   end

data/spec/conventional_models/cli_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ConventionalModels
   describe CLI do
+    let(:option_parser) { mock(OptionParser, :options => @options) }
     before(:each) do
       @args = []
       @options = Options.new
-      @option_parser = mock(OptionParser, :options => @options)
-      OptionParser.stub(:new).and_return(@option_parser)
+      OptionParser.stub(:new).and_return(option_parser)
       File.stub(:exists?).with(@options.config).and_return(true)
     end
     
@@ -29,9 +29,9 @@ module ConventionalModels
         @cli.run
       end
       
-      describe "with parsed options" do
+      context "with parsed options" do
         before(:each) do
-          @option_parser.stub(:parsed_options?).and_return(true)
+          option_parser.stub(:parsed_options?).and_return(true)
           ConventionalModels.stub(:configure)
           ConventionalModels.stub(:model_code)
           ConventionalModels.stub(:configure_active_record)
@@ -43,7 +43,7 @@ module ConventionalModels
           run
         end
         
-        describe "when config doesnt exist" do
+        context "when config doesnt exist" do
           before(:each) do
             File.stub(:exists?).with(@options.config).and_return(false)
           end
@@ -75,7 +75,7 @@ module ConventionalModels
           run
         end
         
-        describe "with skip-configure option" do
+        context "with skip-configure option" do
           it "does not call configure" do
             @options.skip_configure = true
             ConventionalModels.should_not_receive(:configure)
@@ -83,7 +83,7 @@ module ConventionalModels
           end
         end
         
-        describe "with help option" do
+        context "with help option" do
           it "outputs help" do
             RDoc.should_receive(:usage)
             @options.output_help = true
@@ -92,7 +92,7 @@ module ConventionalModels
           end
         end
         
-        describe "with output version option" do
+        context "with output version option" do
           it "outputs the version" do
             @options.output_version = true
             ConventionalModels.should_not_receive(:configure_active_record)
@@ -102,10 +102,10 @@ module ConventionalModels
         end
       end
       
-      describe "with invalid options" do
+      context "with invalid options" do
         it "prints usage" do
           RDoc.should_receive(:usage).with('usage')
-          @option_parser.stub(:parsed_options?).and_return(false)
+          option_parser.stub(:parsed_options?).and_return(false)
           run
         end
       end