railroady 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7fa0d96074617758610fbbb1d18b7bbe69c379
-  data.tar.gz: 4ad8fd7e21e1a2b9c277498862d8463a446e377d
+  metadata.gz: 043d4fabd22b5dd3d3dc0a609893e4fd64ed487b
+  data.tar.gz: 77bfad01bdee0e9ef6a1df0a129fb266f437281b
 SHA512:
-  metadata.gz: 9eeea0a386b4acecb19a053cf8fb2327dc2c5cd1e6f30afda00e5162648c6d464eb8af2e5befe984ce3f0579c2e942cd3c3cb3e911de86cdf341b025cfaf0dfc
-  data.tar.gz: 2222c3470ec2585ad2428ee14c6939064da0e7a2026acb15fa2bfa8f8c875232b2d9f7fce7ec26f17d6eed723808b864b72d99908df1b4967619a20e3dd21764
+  metadata.gz: 7d8b22d0ef7a702a6b071fa6d6237976b9fbeecb3f3533e8f16cfcf9f53543bfff45b768f0802da32e53aa1db21f49d0cfd622052210b59775b1cc23f735e50a
+  data.tar.gz: d3f34e56283d7d6deb889b92b021821706be5be3468bf6c54fdd667716bc972e5e3b5378e307a562c299c727f0b8ec2a458796539d4810975664483b13a52db9

data/bin/railroady

@@ -13,7 +13,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# Modification 2010 by Preston Lee.
+# Modifications 2010-2015 by Preston Lee.
 #
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/lib/railroady/models_diagram.rb

@@ -39,9 +39,31 @@ class ModelsDiagram < AppDiagram
   def engine_files
     engines.collect { |engine| Dir.glob("#{engine.root}/app/models/**/*.rb") }.flatten
   end
-
+  
   def extract_class_name(filename)
-    filename.match(/.*\/models\/(.*).rb$/)[1].camelize
+    filename_was, class_name = filename, nil
+      
+    filename = "app/models/#{filename.split('app/models')[1]}"   
+      
+    while filename.split('/').length > 2
+      begin
+        class_name = filename.match(/.*\/models\/(.*).rb$/)[1].camelize
+        class_name.constantize
+        
+        break
+      rescue Exception => e
+        class_name = nil
+        filename_end = filename.split('/')[2..-1]
+        filename_end.shift
+        filename = "#{filename.split('/')[0, 2].join('/')}/#{filename_end.join('/')}"
+      end
+    end
+    
+    if class_name.nil?
+      filename_was.match(/.*\/models\/(.*).rb$/)[1].camelize
+    else
+      class_name
+    end
   end
 
   # Process a model class

data/lib/railroady/version.rb

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

data/test/file_fixture/app/models/concerns/author_settings.rb

@@ -0,0 +1,12 @@
+module AuthorSettings   
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :set_up_author
+  end
+
+  def set_up_author
+    self.created_by = 'Admin'
+    self.updated_by = 'Admin'
+  end
+end

data/test/lib/railroady/aasm_diagram_spec.rb

@@ -12,7 +12,7 @@ describe AasmDiagram do
       options = OptionsStruct.new(include_concerns: true)
       ad = AasmDiagram.new(options)
       files = ad.get_files('test/file_fixture/')
-      files.size.must_equal 4
+      files.size.must_equal 5
     end
 
     it 'should exclude a specific file' do

data/test/lib/railroady/models_diagram_spec.rb

@@ -12,7 +12,7 @@ describe ModelsDiagram do
       options = OptionsStruct.new(include_concerns: true)
       ad = ModelsDiagram.new(options)
       files = ad.get_files('test/file_fixture/')
-      files.size.must_equal 4
+      files.size.must_equal 5
     end
 
     it 'should exclude a specific file' do
@@ -60,4 +60,40 @@ describe ModelsDiagram do
       end
     end
   end
+  
+  describe '#extract_class_name' do
+    describe 'class can be found' do
+      describe 'module without namespace' do
+        module AuthorSettings
+        end
+        
+        it 'does not take every models subdirectory as a namespace' do
+          md = ModelsDiagram.new(OptionsStruct.new)
+          
+          md.extract_class_name('test/file_fixture/app/models/concerns/author_settings.rb').must_equal 'AuthorSettings'
+        end
+      end
+      
+      describe 'module with parent namespace / class' do
+        class User
+          module Authentication
+          end
+        end
+        
+        it 'does not take every models subdirectory as a namespace' do
+          md = ModelsDiagram.new(OptionsStruct.new)
+          
+          md.extract_class_name('test/file_fixture/app/models/concerns/user/authentication.rb').must_equal 'User::Authentication'
+        end
+      end
+    end
+    
+    describe 'class cannot be found' do
+      it 'returns the full class name' do
+        md = ModelsDiagram.new(OptionsStruct.new)
+        
+        md.extract_class_name('test/file_fixture/app/models/concerns/dummy.rb').must_equal 'Concerns::Dummy'
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railroady
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Preston Lee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - test/file_fixture/app/controllers/dummy1_controller.rb
 - test/file_fixture/app/controllers/dummy2_controller.rb
 - test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb
+- test/file_fixture/app/models/concerns/author_settings.rb
 - test/file_fixture/app/models/concerns/taggable.rb
 - test/file_fixture/app/models/dummy1.rb
 - test/file_fixture/app/models/dummy2.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails 3/4 model and controller UML class diagram generator.
@@ -150,6 +151,7 @@ test_files:
 - test/file_fixture/app/controllers/dummy1_controller.rb
 - test/file_fixture/app/controllers/dummy2_controller.rb
 - test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb
+- test/file_fixture/app/models/concerns/author_settings.rb
 - test/file_fixture/app/models/concerns/taggable.rb
 - test/file_fixture/app/models/dummy1.rb
 - test/file_fixture/app/models/dummy2.rb
@@ -163,3 +165,4 @@ test_files:
 - test/lib/railroady/diagram_graph_spec.rb
 - test/lib/railroady/models_diagram_spec.rb
 - test/spec_helper.rb
+has_rdoc: