sequel-schema-dot-generator 0.0.2 → 0.0.3

data/lib/sequel/schema/dot/generator.rb

@@ -1,4 +1,7 @@
 require 'sequel/schema/dot/generator/version'
+require 'sequel/schema/dot/generator/schema_source_types/base'
+require 'sequel/schema/dot/generator/schema_source_types/column'
+require 'sequel/schema/dot/generator/schema_source_types/model'
 require 'erb'
 require 'logger'
 require 'sequel'
@@ -22,6 +25,7 @@ module Sequel
           #   :logger               [Logger]            optional Will be used for logging
           #   :dot_template_path    [String]            optional Template is supposed to be ERB template. Will be used as template for resulting Dot file
           #   :colored_associations [Boolean]           optional Whether lines representing associations will be draw in color (=False)
+          #   :schema_source_type   [Symbol]            optional How will be data acquired (:column|:model)
           #
           def initialize params
             check_params params
@@ -30,26 +34,31 @@ module Sequel
             @logger = params[:logger] || Logger.new(STDERR)
             @dot_template_path    = params[:dot_template_path] || File.join(File.dirname(__FILE__), 'generator/diagram.dot.erb')
             @colored_associations = params[:colored_associations]
+            initialize_ss params[:schema_source_type]
+          end
+
+          def initialize_ss type
+            sst_params = @db, @db.tables
+
+            if type == :model
+              @schema_source = SchemaSourceType::Model.new *sst_params
+            end
+
+            # Column Source as fallback
+            @schema_source ||= SchemaSourceType::Column.new *sst_params
           end
 
           # @return [String] Content which can be passed to dot parsing tool
           def generate
-            relations = []
             tables    = []
 
             @db.tables.each do |table_name|
               next if table_name == :schema_info
               tables << [table_name, @db.schema(table_name)]
-
-              # foreign keys by <table>_id name format
-              # @todo Read it from model
-              @db[table_name].columns.select{|cn|cn=~/_id$/}.each do |column_name|
-                foreign_column = column_name.to_s
-                foreign_table = existing_table_name foreign_column.gsub(/_id$/, '')
-                relations << [foreign_table, 'id', table_name, foreign_column]
-              end
             end
 
+            relations = @schema_source.relations
+
             if @colored_associations
               edge_colors = random_color_set relations.count
             else
@@ -61,19 +70,6 @@ module Sequel
 
           private
 
-          # @param  [String] name
-          #
-          # @return [String] form of name param in which it is name of existing table
-          def existing_table_name name
-            tables = @db.tables.map(&:to_s)
-            table_name = name if tables.include? name
-            table_name ||= name.pluralize if tables.include? name.pluralize
-            table_name ||= name.singularize if tables.include? name.singularize
-            table_name ||= 'association_table_not_found'
-
-            table_name
-          end
-
           # @param  [Integer] number of colors we want to generate
           #
           # @return [Array]   of random and unique colors

data/lib/sequel/schema/dot/generator/schema_source_types/base.rb

@@ -0,0 +1,29 @@
+module Sequel
+  module Schema
+    module Dot
+      module Generator
+        module SchemaSourceType
+          class Base
+            # Initialize Schema Source Type
+            #
+            # Tables could be retrieved from db connection, but there is plan to provide
+            # control over what tables will be in output structure
+            #
+            # @param [Sequel::Database] db     for which should be acquired data
+            # @param [Array]            tables for which should be acquired data
+            def initialize db, tables
+              @tables = tables
+              @db = db
+            end
+
+            # @return [Array] associations for tables given to constructor
+            #   Each item is array of [<foreign_table>, <id>, <table_name>, <foreign_column>]
+            def relations
+              raise NotImplementedError
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/schema/dot/generator/schema_source_types/column.rb

@@ -0,0 +1,40 @@
+module Sequel
+  module Schema
+    module Dot
+      module Generator
+        module SchemaSourceType
+          class Column < SchemaSourceType::Base
+            def relations
+              relations = []
+
+              @tables.each do |table_name|
+                @db[table_name].columns.select{|cn|cn=~/_id$/}.each do |column_name|
+                  foreign_column = column_name.to_s
+                  foreign_table = existing_table_name foreign_column.gsub(/_id$/, '')
+                  relations << [foreign_table, 'id', table_name, foreign_column]
+                end
+              end
+
+              relations
+            end
+
+            private
+
+            # @param  [String] name
+            #
+            # @return [String] form of name param in which it is name of existing table
+            def existing_table_name name
+              tables = @db.tables.map(&:to_s)
+              table_name = name if tables.include? name
+              table_name ||= name.pluralize if tables.include? name.pluralize
+              table_name ||= name.singularize if tables.include? name.singularize
+              table_name ||= 'association_table_not_found'
+
+              table_name
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/schema/dot/generator/schema_source_types/model.rb

@@ -0,0 +1,36 @@
+module Sequel
+  module Schema
+    module Dot
+      module Generator
+        module SchemaSourceType
+          class Model < SchemaSourceType::Base
+            def relations
+              relations = {}
+
+              @tables.collect do |table_name|
+                model = table_name.to_s.singularize.classify.constantize
+                model.associations.each do |assoc|
+                  assoc_info = model.association_reflection(assoc)
+
+                  right_key = assoc_info[:join_table].to_s+assoc_info[:right_key].to_s
+                  left_key = assoc_info[:join_table].to_s+assoc_info[:left_key].to_s
+
+                  if assoc_info[:type] == :many_to_many
+                    relations[right_key] = [assoc_info[:join_table].to_s, assoc_info[:right_key], assoc_info[:class_name].constantize.implicit_table_name, assoc_info[:class_name].constantize.primary_key]
+                    relations[left_key] = [assoc_info[:join_table].to_s, assoc_info[:left_key],  assoc_info[:model].implicit_table_name, assoc_info[:model].primary_key]
+                  else
+                    # one_to_many
+                    table_name = assoc_info[:model].implicit_table_name.to_s
+                    table_key = assoc_info[:key].to_s
+                    relations[right_key] = [table_name, table_key, assoc_info[:class_name].constantize.implicit_table_name, assoc_info[:class_name].constantize.primary_key]
+                  end
+                end
+              end
+              relations.values
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/schema/dot/generator/version.rb

@@ -2,7 +2,7 @@ module Sequel
   module Schema
     module Dot
       module Generator
-        VERSION = '0.0.2'
+        VERSION = '0.0.3'
       end
     end
   end

data/sequel-schema-dot-generator.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = %w(development@rooland.cz)
   spec.description   = %q{This gem makes it easier to generate database schema overview image}
   spec.summary       = %q{Dot language format generator for Sequel schema structure}
-  spec.homepage      = 'https://github.com/roolo/sequel-schema-dot-generator-gem'
+  spec.homepage      = 'http://www.rooland.cz/sequel-schema-dot-generator-gem'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-schema-dot-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,9 +90,12 @@ files:
 - Rakefile
 - lib/sequel/schema/dot/generator.rb
 - lib/sequel/schema/dot/generator/diagram.dot.erb
+- lib/sequel/schema/dot/generator/schema_source_types/base.rb
+- lib/sequel/schema/dot/generator/schema_source_types/column.rb
+- lib/sequel/schema/dot/generator/schema_source_types/model.rb
 - lib/sequel/schema/dot/generator/version.rb
 - sequel-schema-dot-generator.gemspec
-homepage: https://github.com/roolo/sequel-schema-dot-generator-gem
+homepage: http://www.rooland.cz/sequel-schema-dot-generator-gem
 licenses:
 - MIT
 post_install_message: 
@@ -107,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3561675813469084963
+      hash: -3800259323698899955
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3561675813469084963
+      hash: -3800259323698899955
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25