modaldiagrams 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/modaldiagrams/modaldiagrams.rb

@@ -6,20 +6,6 @@ require 'modalsupport'
 
 module ModalDiagrams
 
-  # Field type abbreviations
-  TYPE = {
-    :date=>'d',
-    :datetime=>'dt',
-    :timestamp=>'ts',
-    :boolean=>'b',
-    :integer=>'i',
-    :string=>'s',
-    :text=>'tx',
-    :float=>'f',
-    :decimal=>'d',
-    :geometry=>'g'
-  }
-
   class <<self
 
     def enable_clusters
@@ -57,7 +43,7 @@ module ModalDiagrams
       models.each do |cls|
         if cls.respond_to?(:reflect_on_all_associations) && ActiveRecord::Base.connection.table_exists?(cls.table_name)
           # Note: Don't use content_columns ignores columns ending with _id which I use for enum fields
-          columns = cls.columns.reject { |c| c.primary || c.name =~ /(_count)$/ || c.name == cls.inheritance_column || c.name =~ /^(created_at|updated_at)$/ }.map{|c| "#{c.name} : #{TYPE[c.type]}"}
+          columns = cls.columns.reject { |c| c.primary || c.name =~ /(_count)$/ || c.name == cls.inheritance_column || c.name =~ /^(created_at|updated_at)$/ }.map{|c| field_spec(cfg, c)}
           columns_to_ignore = cls.reflect_on_all_associations.map{|a|
             cols = []
             if a.macro == :belongs_to
@@ -162,7 +148,7 @@ module ModalDiagrams
             cluster = ""
           end
           if cfg.sti_fields && sti_class.respond_to?(:fields_info) && sti_class.fields_info!=:omitted
-            columns = sti_class.fields_info.map{|c| "#{c.name} : #{TYPE[c.type]}"}
+            columns = sti_class.fields_info.map{|c| field_spec(cfg, c)}
             columns = columns.to(cfg.max_attributes) + ['...'] if columns.size > cfg.max_attributes
           else
             columns = nil
@@ -330,6 +316,11 @@ module ModalDiagrams
       f.puts "}\n"
     end
 
+    def field_spec(cfg, c)
+      type = cfg.type_abbreviations[c.type] || c.type
+      "#{c.name} : #{type}"
+    end
+
   end
 
 end

data/lib/modaldiagrams/parameters.rb

@@ -14,7 +14,20 @@ module ModalDiagrams
       :sti_fields => true,                       # show fields of STI classes where declared if using modalfields
       :unified_polymorphic => false,             # unify the circled end of polymorphic associations
       :no_association_labels=>false,             # don't show association labels
-      :output_tools => %w{dot fdp neato}         # graphviz styles (tools) used whe generating output (ps/png/pdf)
+      :output_tools => %w{dot fdp neato},        # graphviz styles (tools) used whe generating output (ps/png/pdf)
+      :type_abbreviations => {                   # abbreviations used for field types
+        :date=>'d',
+        :datetime=>'dt',
+        :timestamp=>'ts',
+        :boolean=>'b',
+        :integer=>'i',
+        :string=>'s',
+        :text=>'tx',
+        :float=>'f',
+        :decimal=>'d',
+        :geometry=>'g',
+        :spatial=>'g'
+      }
     ].merge Settings.load(Rails.root.join('config','modal_diagrams.yml'))
   end
 

data/modaldiagrams.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "modaldiagrams"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modaldiagrams
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -587444840250185935
+      hash: -1469969141258000337
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: