rare_map 1.1.6 → 1.2.0

data/lib/rare_map/config_loader.rb

@@ -18,9 +18,9 @@ module RareMap
         case v.class.name
         when 'Hash'
           if v[OPTS_KEY]
-            db_profiles << DatabaseProfile.new(remove_opts(v), Options.new(v[OPTS_KEY]))
+            db_profiles << DatabaseProfile.new(k, remove_opts(v), Options.new(v[OPTS_KEY]))
           else
-            db_profiles << DatabaseProfile.new(v, global_opts)
+            db_profiles << DatabaseProfile.new(k, v, global_opts)
           end
         when 'Array'
           v = v.reduce(:merge)
@@ -28,9 +28,9 @@ module RareMap
           
           v.each do |db, config|
             if config[OPTS_KEY]
-              db_profiles << DatabaseProfile.new(remove_opts(config), Options.new(config[OPTS_KEY], k))
+              db_profiles << DatabaseProfile.new(db, remove_opts(config), Options.new(config[OPTS_KEY], k))
             else
-              db_profiles << DatabaseProfile.new(config, group_opts)
+              db_profiles << DatabaseProfile.new(db, config, group_opts)
             end
           end
         end
@@ -45,11 +45,11 @@ module RareMap
   end
   
   class DatabaseProfile
-    attr_reader :connection, :options
+    attr_reader :name, :connection, :options
     attr_accessor :schema, :tables
     
-    def initialize(connection, options)
-      @connection = connection
+    def initialize(name, connection, options)
+      @name, @connection = name, connection
       @options = options || Options.new
       @tables = []
     end

data/lib/rare_map/model_builder.rb

@@ -5,7 +5,6 @@ module RareMap
     def build_models(db_profiles)
       models = []
       
-      default_id = 1
       db_profiles.each do |db_prof|
         db_prof.tables.each do |table|
           opts = db_prof.options
@@ -13,12 +12,11 @@ module RareMap
           set_foreign_keys_by_options(table, opts)
           set_fk_suffix_by_options(table, opts)
           if opts.group?
-            models << Model.new(db_prof.connection, table, opts.group)
+            models << Model.new(db_prof.connection, table, opts.group, db_prof.name)
           else
-            models << Model.new(db_prof.connection, table, 'default', default_id)
+            models << Model.new(db_prof.connection, table, 'default', db_prof.name)
           end
         end
-        default_id += 1 unless db_prof.options.group?
       end
       
       build_relations models
@@ -29,7 +27,7 @@ module RareMap
     private
     def build_relations(models)
       models.each do |model|
-        group_models = models.select { |m| m.group == model.group && m.default_id == model.default_id }
+        group_models = models.select { |m| m.group == model.group && m.db_name == model.db_name }
         
         group_models.each do |gm|
           model.table.columns.each do |col|
@@ -55,10 +53,10 @@ module RareMap
                rel_from.table != rel_to.table
               model_from = models.find { |m| m.table.name == rel_from.table &&
                                              m.group      == model.group &&
-                                             m.default_id == model.default_id }
+                                             m.db_name == model.db_name }
               model_to = models.find { |m| m.table.name == rel_to.table &&
                                            m.group      == model.group &&
-                                           m.default_id == model.default_id }
+                                           m.db_name == model.db_name }
               model_from.relations << Relation.new(:has_many_through, rel_to.foreign_key, model_to.table.name, model.table.name)
               model_to.relations << Relation.new(:has_many_through, rel_from.foreign_key, model_from.table.name, model.table.name)
             end
@@ -89,10 +87,10 @@ module RareMap
   end
   
   class Model
-    attr_reader :connection, :table, :group, :relations, :default_id
+    attr_reader :connection, :table, :group, :relations, :db_name
     
-    def initialize(connection, table, group = 'default', default_id = nil)
-      @connection, @table, @group, @default_id = connection, table, group, default_id
+    def initialize(connection, table, group = 'default', db_name)
+      @connection, @table, @group, @db_name = connection, table, group, db_name
       @relations = []
     end
     

data/lib/rare_map/model_generator.rb

@@ -5,12 +5,15 @@ module RareMap
     def generate_models(models, root = './')
       root ||= './'
       path = root + 'app/models/'
+      Dir.mkdir root + 'app' unless Dir.exist? root + 'app'
+      Dir.mkdir path unless Dir.exist? path
+      
+      group_db2conn = generate_connection_models(models, path)
       
       models.each do |model|
         output = ''
         output <<
-        "class #{model.classify} < ActiveRecord::Base\n" <<
-        "  establish_connection #{model.connection.map { |k, v| ":#{k} => #{v.inspect}" }.join(', ')}\n" <<
+        "class #{model.classify} < #{group_db2conn[[model.group, model.db_name]]}\n" <<
         "  self.table_name = '#{model.table.name}'\n" <<
         "  self.inheritance_column = 'ruby_type'\n" <<
         "  #{ "self.primary_key = '#{model.table.primary_key}'\n" if model.table.primary_key }\n" <<
@@ -46,8 +49,6 @@ module RareMap
         
         output << 'end'
         
-        Dir.mkdir root + 'app' unless Dir.exist? root + 'app'
-        Dir.mkdir path unless Dir.exist? path
         Dir.mkdir path + "#{model.group}" unless Dir.exist? path + "#{model.group}"
         f = File.new(path + "#{model.group}/#{model.classify.underscore}.rb", 'w')
         f.write output
@@ -61,8 +62,33 @@ module RareMap
     def classify_by_table(table, model, models)
       model = models.find { |m| m.table.name == table &&
                                 m.group      == model.group &&
-                                m.default_id == model.default_id }
+                                m.db_name    == model.db_name }
       model.classify
     end
+    
+    def generate_connection_models(models, path)
+      group_db2conn = {}
+      
+      group2connection = Hash[models.map { |model| [[model.group, model.db_name], model.connection] }]
+      group2connection.each do |(group, db_name), connection|
+        model = "#{group}_#{db_name}".camelize + 'Base'
+        
+        output = ''
+        output <<
+        "class #{model} < ActiveRecord::Base\n" <<
+        "  establish_connection #{connection.map { |k, v| ":#{k} => #{v.inspect}" }.join(', ')}\n" <<
+        'end'
+        
+        
+        Dir.mkdir path + "#{group}" unless Dir.exist? path + "#{group}"
+        f = File.new(path + "#{group}/#{model.underscore}.rb", 'w')
+        f.write output
+        f.close
+        
+        group_db2conn[[group, db_name]] = model
+      end
+      
+      group_db2conn
+    end
   end
 end

data/lib/rare_map/version.rb

@@ -1,8 +1,8 @@
 class RareMap
   module Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 6
+    MINOR = 2
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/rare_map.rb

@@ -45,6 +45,7 @@ module RareMap
     def generate_demo
       f = File.new('demo.rb', 'w')
       f.write "require 'active_record'\n"
+      f.write "Dir[File.dirname(__FILE__) + '/app/models/**/base*.rb'].each { |file| require file }\n"
       f.write "Dir[File.dirname(__FILE__) + '/app/models/**/*.rb'].each { |file| require file }\n"
       f.close
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rare_map
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2461692809645872672
+      hash: -2379119052270473471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: