railroady 1.0.7 → 1.0.8

data/README.rdoc

@@ -65,6 +65,7 @@ Models diagram options:
                                        (not just content columns)
         --hide-magic                 Hide magic field names
         --hide-types                 Hide attributes type
+        --hide-through               Hide through associations
     -j, --join                       Concentrate edges
     -m, --modules                    Include modules
     -p, --plugins-models             Include plugins models

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 0
-:patch: 7
+:patch: 8
 :build: 

data/lib/railroady/app_diagram.rb

@@ -66,7 +66,8 @@ class AppDiagram
   # Prevents Rails application from writing to STDOUT
   def disable_stdout
     @old_stdout = STDOUT.dup
-    STDOUT.reopen(::RUBY_PLATFORM =~ /mswin/ ? "NUL" : "/dev/null")
+    #via  Tomas Matousek, http://www.ruby-forum.com/topic/205887
+    STDOUT.reopen(::RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/? "NUL" : "/dev/null")
   end
 
   # Restore STDOUT  

data/lib/railroady/models_diagram.rb

@@ -82,7 +82,7 @@ class ModelsDiagram < AppDiagram
       node_type = 'model'
 
       # Collect model's content columns
-    	content_columns = current_class.content_columns
+    	#content_columns = current_class.content_columns
 
     	if @options.hide_magic
         # From patch #13351
@@ -95,7 +95,7 @@ class ModelsDiagram < AppDiagram
         magic_fields << current_class.table_name + "_count" if current_class.respond_to? 'table_name'
         content_columns = current_class.content_columns.select {|c| ! magic_fields.include? c.name}
       else
-        content_columns = current_class.content_columns
+        content_columns = current_class.columns
       end
 
       content_columns.each do |a|
@@ -220,6 +220,10 @@ class ModelsDiagram < AppDiagram
     macro = assoc.macro.to_s
     return if %w[belongs_to referenced_in].include?(macro) && !@options.show_belongs_to
 
+    # Skip "through" associations
+    through = assoc.options.include?(:through)
+    return if through && @options.hide_through
+
     #TODO:
     # FAIL: assoc.methods.include?(:class_name)
     # FAIL: assoc.responds_to?(:class_name)

data/lib/railroady/options_struct.rb

@@ -29,6 +29,7 @@ class OptionsStruct < OpenStruct
                      :plugins_models => false,
                      :root => '',
                      :show_belongs_to => false,
+                     :hide_through => false,
                      :transitive => false,
                      :verbose => false,
                      :xmi => false,
@@ -82,6 +83,9 @@ class OptionsStruct < OpenStruct
       opts.on("--show-belongs_to", "Show belongs_to associations") do |s|
         self.show_belongs_to = s
       end
+      opts.on("--hide-through", "Hide through associations") do |h|
+        self.hide_through = h
+      end
       opts.on("--all-columns", "Show all columns (not just content columns)") do |h|
         self.all_columns = h
       end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: railroady
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
+version: !ruby/object:Gem::Version
+  version: 1.0.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Preston Lee
 - Tobias Crawley
 - Peter Hoeg
@@ -17,28 +12,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-28 00:00:00 +05:30
-default_executable: railroady
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies: []
-
-description: Ruby on Rails 3 model and controller UML class diagram generator. Originally based on the 'railroad' plugin and contributions of many others. (`sudo port install graphviz` before use!)
-email: 
+description: Ruby on Rails 3 model and controller UML class diagram generator. Originally
+  based on the 'railroad' plugin and contributions of many others. (`sudo port install
+  graphviz` before use!)
+email:
 - conmotto@gmail.com
 - tcrawley@gmail.com
 - peter@hoeg.com
 - p.hoeg@northwind.sg
 - javier@smaldone.com.ar
-executables: 
+executables:
 - railroady
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
 - LICENSE.rdoc
 - README.rdoc
-files: 
+files:
 - .document
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
@@ -57,39 +50,28 @@ files:
 - lib/railroady/railtie.rb
 - lib/railroady/version.rb
 - tasks/railroady.rake
-has_rdoc: true
 homepage: http://github.com/preston/railroady
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails 3 model and controller UML class diagram generator.
 test_files: []
-