railroady 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c445e74b5659404f61ab558a1bf02f496d7b34c
-  data.tar.gz: f5a44d738815114e732b44c650129ff6870a710f
+  metadata.gz: 5a7fa0d96074617758610fbbb1d18b7bbe69c379
+  data.tar.gz: 4ad8fd7e21e1a2b9c277498862d8463a446e377d
 SHA512:
-  metadata.gz: 7fe0e9ecb631a4482179083fd47cbe75316ea3cfa39c48e6df315a802108336d6dba8b9ff94670125be8cc2486a7846a00d8e50b75aa8b7a0aa24b2f83fe6751
-  data.tar.gz: 4df37c87884a01dca2859f2ba244652c4c58099abddc9907d30d31dddfcd0ece044fd05c8a3de07497a8a9c8b93bb95f7e938b607599823196434d1f5a1c484b
+  metadata.gz: 9eeea0a386b4acecb19a053cf8fb2327dc2c5cd1e6f30afda00e5162648c6d464eb8af2e5befe984ce3f0579c2e942cd3c3cb3e911de86cdf341b025cfaf0dfc
+  data.tar.gz: 2222c3470ec2585ad2428ee14c6939064da0e7a2026acb15fa2bfa8f8c875232b2d9f7fce7ec26f17d6eed723808b864b72d99908df1b4967619a20e3dd21764

data/.gitignore

@@ -1,3 +1,4 @@
+.idea
 *.sw?
 .DS_Store
 coverage

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    railroady (1.3.0)
+    railroady (1.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     i18n (0.7.0)
-    json (1.8.1)
-    minitest (5.5.0)
+    json (1.8.3)
+    minitest (5.8.1)
     rake (10.4.2)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -29,3 +29,6 @@ DEPENDENCIES
   minitest
   railroady!
   rake
+
+BUNDLED WITH
+   1.10.6

data/lib/railroady/aasm_diagram.rb

@@ -53,7 +53,7 @@ class AasmDiagram < AppDiagram
 
     # Only interested in acts_as_state_machine models.
     process_acts_as_state_machine_class(current_class)  if current_class.respond_to?(:states)
-    process_aasm_class(current_class)  if current_class.respond_to?(:aasm_states)
+    process_aasm_class(current_class)  if current_class.respond_to?(:aasm_states) || current_class.respond_to?(:aasm)
   end # process_class
 
   def process_acts_as_state_machine_class(current_class)
@@ -91,13 +91,13 @@ class AasmDiagram < AppDiagram
     end
     @graph.add_node [node_type, current_class.name, node_attribs]
 
-    current_class.aasm.events.each do |event_name, event|
+    current_class.aasm.events.each do |event|
       event.transitions.each do |transition|
         @graph.add_edge [
           'event',
           current_class.name.downcase + '_' + transition.from.to_s,
           current_class.name.downcase + '_' + transition.to.to_s,
-          event_name.to_s
+          event.name.to_s
         ]
       end
     end

data/lib/railroady/diagram_graph.rb

@@ -97,8 +97,8 @@ class DiagramGraph
         # Return subgraph format
         return "subgraph cluster_#{name.downcase} {\n\tlabel = #{quote(name)}\n\t#{attributes.join("\n  ")}}"
     end # case
-    options = [options, custom_options].compact.join(', ')
-    "\t#{quote(name)} [#{options}]\n"
+    options = [options, custom_options].compact.reject{|o| o.empty?}.join(', ')
+    return "\t#{quote(name)} [#{options}]\n"
   end # dot_node
 
   # Build a DOT graph edge
@@ -112,7 +112,10 @@ class DiagramGraph
       when 'one-many'
         options += 'arrowtail=odot, arrowhead=crow' + suffix
       when 'many-many'
-        options += 'arrowtail=crow, arrowhead=crow' + suffix
+        options += "arrowtail=crow, arrowhead=crow" + suffix
+      when 'belongs-to'
+           # following http://guides.rubyonrails.org/association_basics.html#the-belongs-to-association
+           options += "arrowtail=none, arrowhead=normal" + suffix
       when 'is-a'
         options += 'arrowhead="none", arrowtail="onormal"'
       when 'event'

data/lib/railroady/models_diagram.rb

@@ -108,7 +108,7 @@ class ModelsDiagram < AppDiagram
 
       content_columns.each do |a|
         content_column = a.name
-        content_column += ' :' + a.type.to_s unless @options.hide_types
+        content_column += ' :' + a.sql_type.to_s unless @options.hide_types
         node_attribs << content_column
       end
     end
@@ -284,6 +284,8 @@ class ModelsDiagram < AppDiagram
     elsif macro == 'has_many' && (!assoc.options[:through]) ||
           %w(references_many embeds_many).include?(macro)
       assoc_type = 'one-many'
+    elsif macro == 'belongs_to'
+      assoc_type = 'belongs-to'
     else # habtm or has_many, :through
       # Add FAKE associations too in order to understand mistakes
       return if @habtm.include? [assoc_class_name, class_name, assoc_name]

data/lib/railroady/version.rb

@@ -1,3 +1,3 @@
 module RailRoady
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railroady
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Preston Lee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails 3/4 model and controller UML class diagram generator.
@@ -163,4 +163,3 @@ test_files:
 - test/lib/railroady/diagram_graph_spec.rb
 - test/lib/railroady/models_diagram_spec.rb
 - test/spec_helper.rb
-has_rdoc: