lib/railroady/models_diagram.rb in railroady-1.3.0 vs lib/railroady/models_diagram.rb in railroady-1.3.1

@@ -15,40 +15,37 @@
     @habtm = []
   end
 
   # Process model files
   def generate
-    STDERR.puts "Generating models diagram" if @options.verbose
+    STDERR.puts 'Generating models diagram' if @options.verbose
     get_files.each do |f|
       begin
         process_class extract_class_name(f).constantize
       rescue Exception
-        STDERR.puts "Warning: exception #{$!} raised while trying to load model class #{f}"
+        STDERR.puts "Warning: exception #{$ERROR_INFO} raised while trying to load model class #{f}"
       end
-      
     end
   end
 
-  def get_files(prefix ='')
-    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob(prefix + "app/models/**/*.rb")
-    files += Dir.glob("vendor/plugins/**/app/models/*.rb") if @options.plugins_models
-    files -= Dir.glob(prefix + "app/models/concerns/**/*.rb") unless @options.include_concerns
-    files += get_engine_files if @options.engine_models
+  def get_files(prefix = '')
+    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob(prefix + 'app/models/**/*.rb')
+    files += Dir.glob('vendor/plugins/**/app/models/*.rb') if @options.plugins_models
+    files -= Dir.glob(prefix + 'app/models/concerns/**/*.rb') unless @options.include_concerns
+    files += engine_files if @options.engine_models
     files -= Dir.glob(@options.exclude)
     files
   end
 
-  def get_engine_files
-    engines.collect { |engine| Dir.glob("#{engine.root.to_s}/app/models/**/*.rb")}.flatten
+  def engine_files
+    engines.collect { |engine| Dir.glob("#{engine.root}/app/models/**/*.rb") }.flatten
   end
 
-
   def extract_class_name(filename)
-    filename.split('/').last.camelize.chomp(".rb")
+    filename.match(/.*\/models\/(.*).rb$/)[1].camelize
   end
 
-  
   # Process a model class
   def process_class(current_class)
     STDERR.puts "Processing #{current_class}" if @options.verbose
 
     generated =
@@ -56,29 +53,28 @@
         process_couchrest_model(current_class)
       elsif defined?(Mongoid::Document) && current_class.new.is_a?(Mongoid::Document)
         process_mongoid_model(current_class)
       elsif defined?(DataMapper::Resource) && current_class.new.is_a?(DataMapper::Resource)
         process_datamapper_model(current_class)
-      elsif current_class.respond_to?'reflect_on_all_associations'
+      elsif current_class.respond_to? 'reflect_on_all_associations'
         process_active_record_model(current_class)
       elsif @options.all && (current_class.is_a? Class)
         process_basic_class(current_class)
       elsif @options.modules && (current_class.is_a? Module)
         process_basic_module(current_class)
       end
 
     if @options.inheritance && generated && include_inheritance?(current_class)
       @graph.add_edge ['is-a', current_class.superclass.name, current_class.name]
     end
-
   end # process_class
 
   def include_inheritance?(current_class)
     STDERR.puts current_class.superclass if @options.verbose
     (defined?(ActiveRecord::Base) && current_class.superclass != ActiveRecord::Base) ||
-    (defined?(CouchRest::Model::Base) && current_class.superclass != CouchRest::Model::Base) ||
-    (current_class.superclass != Object)
+      (defined?(CouchRest::Model::Base) && current_class.superclass != CouchRest::Model::Base) ||
+      (current_class.superclass != Object)
   end
 
   def process_basic_class(current_class)
     node_type = @options.brief ? 'class-brief' : 'class'
     @graph.add_node [node_type, current_class.name]
@@ -96,22 +92,18 @@
       node_type = 'model-brief'
     else
       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
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
-        magic_fields = [
-          "created_at", "created_on", "updated_at", "updated_on",
-          "lock_version", "type", "id", "position", "parent_id", "lft",
-          "rgt", "quote", "template"
-        ]
-        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}
+        magic_fields = %w(created_at created_on updated_at updated_on lock_version type id position parent_id lft rgt quote template)
+        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.columns
       end
 
       content_columns.each do |a|
@@ -125,11 +117,11 @@
     # Process class associations
     associations = current_class.reflect_on_all_associations
     if @options.inheritance && ! @options.transitive
       superclass_associations = current_class.superclass.reflect_on_all_associations
 
-      associations = associations.select{|a| ! superclass_associations.include? a}
+      associations = associations.select { |a| !superclass_associations.include? a }
       # This doesn't works!
       # associations -= current_class.superclass.reflect_on_all_associations
     end
 
     associations.each do |a|
@@ -139,11 +131,11 @@
     true
   end
 
   def process_datamapper_model(current_class)
     node_attribs = []
-    if @options.brief #|| current_class.abstract_class?
+    if @options.brief # || current_class.abstract_class?
       node_type = 'model-brief'
     else
       node_type = 'model'
 
       # Collect model's properties
@@ -151,13 +143,12 @@
 
       if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
         magic_fields =
-          ["created_at", "created_on", "updated_at", "updated_on", "lock_version", "_type", "_id",
-           "position", "parent_id", "lft", "rgt", "quote", "template"]
-        props = props.select {|c| !magic_fields.include?(c.name.to_s) }
+          %w(created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template)
+        props = props.select { |c| !magic_fields.include?(c.name.to_s) }
       end
 
       props.each do |a|
         prop = a.name.to_s
         prop += ' :' + a.class.name.split('::').last unless @options.hide_types
@@ -190,16 +181,12 @@
       content_columns = current_class.fields.values.sort_by(&:name)
 
       if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
-        magic_fields = [
-          "created_at", "created_on", "updated_at", "updated_on",
-          "lock_version", "_type", "_id", "position", "parent_id", "lft",
-          "rgt", "quote", "template"
-        ]
-        content_columns = content_columns.select {|c| !magic_fields.include?(c.name) }
+        magic_fields = %w(created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template)
+        content_columns = content_columns.select { |c| !magic_fields.include?(c.name) }
       end
 
       content_columns.each do |a|
         content_column = a.name
         content_column += " :#{a.type}" unless @options.hide_types
@@ -211,11 +198,11 @@
 
     # Process class associations
     associations = current_class.relations.values
 
     if @options.inheritance && !@options.transitive &&
-      current_class.superclass.respond_to?(:relations)
+       current_class.superclass.respond_to?(:relations)
       associations -= current_class.superclass.relations.values
     end
 
     associations.each do |a|
       process_association current_class.name, a
@@ -240,15 +227,12 @@
 
       # Collect model's content columns
       content_columns = current_class.properties
 
       if @options.hide_magic
-        magic_fields = [
-          "created_at", "updated_at",
-          "type", "_id", "_rev"
-        ]
-        content_columns = content_columns.select {|c| !magic_fields.include?(c.name) }
+        magic_fields = %w(created_at updated_at type _id _rev)
+        content_columns = content_columns.select { |c| !magic_fields.include?(c.name) }
       end
 
       content_columns.each do |a|
         content_column = a.name
         content_column += " :#{a.type}" unless @options.hide_types || a.type.nil?
@@ -261,21 +245,21 @@
     true
   end
 
   # Process a model association
   def process_association(class_name, assoc)
-    STDERR.puts "- Processing model association #{assoc.name.to_s}" if @options.verbose
+    STDERR.puts "- Processing model association #{assoc.name}" if @options.verbose
 
     # Skip "belongs_to" associations
     macro = assoc.macro.to_s
-    return if %w[belongs_to referenced_in].include?(macro) && !@options.show_belongs_to
+    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:
+    # TODO:
     # FAIL: assoc.methods.include?(:class_name)
     # FAIL: assoc.responds_to?(:class_name)
     assoc_class_name = assoc.class_name rescue nil
     assoc_class_name ||= assoc.name.to_s.underscore.singularize.camelize
 
@@ -288,19 +272,19 @@
     else
       assoc_name = assoc.name.to_s
     end
 
     # Patch from "alpack" to support classes in a non-root module namespace. See: http://disq.us/yxl1v
-    if class_name.include?("::") && !assoc_class_name.include?("::")
-      assoc_class_name = class_name.split("::")[0..-2].push(assoc_class_name).join("::")
+    if class_name.include?('::') && !assoc_class_name.include?('::')
+      assoc_class_name = class_name.split('::')[0..-2].push(assoc_class_name).join('::')
     end
-    assoc_class_name.gsub!(%r{^::}, '')
+    assoc_class_name.gsub!(/^::/, '')
 
-    if %w[has_one references_one embeds_one].include?(macro)
+    if %w(has_one references_one embeds_one).include?(macro)
       assoc_type = 'one-one'
     elsif macro == 'has_many' && (!assoc.options[:through]) ||
-          %w[references_many embeds_many].include?(macro)
+          %w(references_many embeds_many).include?(macro)
       assoc_type = 'one-many'
     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]
       assoc_type = 'many-many'
@@ -311,11 +295,11 @@
     @graph.add_edge [assoc_type, class_name, assoc_class_name, assoc_name]
   end # process_association
 
   # Process a DataMapper relationship
   def process_datamapper_relationship(class_name, relation)
-    STDERR.puts "- Processing DataMapper model relationship #{relation.name.to_s}" if @options.verbose
+    STDERR.puts "- Processing DataMapper model relationship #{relation.name}" if @options.verbose
 
     # Skip "belongs_to" relationships
     dm_type = relation.class.to_s.split('::')[-2]
     return if dm_type == 'ManyToOne' && !@options.show_belongs_to
 
@@ -330,11 +314,11 @@
       assoc_class_name = dm_parent_model
     end
 
     # Only non standard association names needs a label
     assoc_name = ''
-    if !(relation.name.to_s.singularize.camelize.eql?(assoc_class_name.split('::').last))
+    unless relation.name.to_s.singularize.camelize.eql?(assoc_class_name.split('::').last)
       assoc_name = relation.name.to_s
     end
 
     # TO BE IMPROVED
     rel_type = 'many-many' # default value for ManyToOne and ManyToMany
@@ -342,11 +326,8 @@
       rel_type = 'one-one'
     elsif dm_type == 'OneToMany'
       rel_type = 'one-many'
     end
 
-    @graph.add_edge [rel_type, class_name, assoc_class_name, assoc_name ]
+    @graph.add_edge [rel_type, class_name, assoc_class_name, assoc_name]
   end
-
 end # class ModelsDiagram
-
-