draw_uml 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16573e1346be07f6a72455846d71b467481650eb
-  data.tar.gz: 21e1ea5695fa77ca471cfcc291f96ea59b5f2ad1
+  metadata.gz: ceb3e8989bb14bc8cf5566082e8141a34f5b27a9
+  data.tar.gz: b3b09a7a300aea789dd171453d54d64f62a1ce72
 SHA512:
-  metadata.gz: 01061dff6d43219858caf9172bcacde58cb4331f9f34348b8a4a85f4d8c8ec50b50009b7b25cd7b01a549470b2c1a4ab0a390c9d6118be382e4b250f9ee1766e
-  data.tar.gz: 948eb17cdab82df86a8a75b09f792e1e92aa0989df6cc27140097fcc5c209624d60e53163408a2d278069962b6a0aaf38c2ff8a8f160c493dc94ac783f06e7e4
+  metadata.gz: af9528a752388a7dae0584c702968363a5f6ae2b7d616c33eae1bbea014c56fefc6114b5ea0e8fb65efef339e07280c47aad9192ccf3a1b092019c2640ed2d39
+  data.tar.gz: 628067ce7c291d5c5c30ba9878fd7f4302dc2af990ccae4d2c4afb162d07f70a1d49d3e4904346ad216e291a0c6c4b055004e393a2607749e030760b18c94719

data/lib/draw_uml/configure.rb

@@ -17,10 +17,6 @@ module DrawUml
         File.expand_path(self.diagram_path)
       end
 
-      def parent_path
-        File.expand_path('..', self.source_path)
-      end
-
       def dest_path
         File.expand_path(File.join(self.static_path, self.image_path))
       end

data/lib/draw_uml/default.rb

@@ -1,9 +1,9 @@
 module DrawUml
   module Default
     DIAGRAM_EXTENSION = 'uml'.freeze
-    DIAGRAM_PATH = 'doc/diagrams/uml'.freeze
+    DIAGRAM_PATH = 'doc/diagrams'.freeze
     STATIC_PATH = 'public'.freeze
-    IMAGE_PATH = '/images/uml'.freeze
+    IMAGE_PATH = '/images/draw_uml'.freeze
 
     class << self
       def options

data/lib/draw_uml/diagram.rb

@@ -7,11 +7,17 @@ module DrawUml
       FileUtils.mkdir_p(@path)
     end
 
-    def create(file)
-      raw = File.read(file)
-      filename = File.basename(file, '.*')
-      cmd = 'plantuml -pipe > ' + File.join(@path, filename + '.png')
+    def create(path)
+      file = File.join(@path, path + '.png')
+      raw = File.read(File.join(config.source_path, path + '.' + config.diagram_extension))
+      FileUtils.mkdir_p(File.dirname(file))
+
+      cmd = 'plantuml -pipe > ' + file
       stdout, status = Open3.capture2(cmd, stdin_data: raw)
     end
+
+    def config
+      DrawUml::Configure
+    end
   end
 end

data/lib/draw_uml/engine.rb

@@ -6,14 +6,13 @@ module DrawUml
     class << self
       def call(env)
         @request = Rack::Request.new(env)
-        file_path = @request.params['path'] ||= nil
-        image_path = nil
+        id = @request.params['id'] ||= nil
+        path = nil
 
-        unless file_path.nil?
+        unless id.nil?
           diagram = DrawUml::Diagram.new(DrawUml::Configure.dest_path)
-          diagram.create(expand_path(file_path))
-          file = File.basename(file_path, '.*')
-          image_path = File.join(DrawUml::Configure.image_path, file + '.png')
+          diagram.create(id)
+          path = File.join(DrawUml::Configure.image_path, id + '.png')
         end
 
         erb = ERB.new(DrawUml::Configure.application_template)
@@ -24,46 +23,29 @@ module DrawUml
         [status, headers, [body]]
       end
 
-      def tree
-        @raw = ''
-        branch(DrawUml::Tree.create(DrawUml::Configure.source_path))
-        @raw
-      end
-
-      def branch(node)
-        @raw += "<div style=\"padding-left: #{node.level}0px;\">\n"
-        @raw += "<h3>#{node.name}</h3>\n"
-        arr = []
-        node.entries.each do |entry|
-          if entry.leaf?
-            arr << entry
-          else
-            branch(entry)
-          end
-        end
-        @raw += "<ul>"
-        @raw += arr.map do |entry|
-          link_to(entry)
-        end.join("\n")
-        @raw += "</ul></div>\n"
-      end
-
       private
-        def link_to(entry)
-          raw = ''
-          raw += "<li>"
-          raw += "<a href=#{@request.path}?path="
-          raw += "#{contract_path(entry.path)}>#{entry.name}</a>"
-          raw += "</li>"
-          raw
-        end
-
-        def contract_path(path)
-          path.sub(DrawUml::Configure.parent_path, '')
+        def diagrams
+          @raw = ''
+          branch(DrawUml::Tree.create(DrawUml::Configure.source_path))
+          @raw
         end
 
-        def expand_path(path)
-          File.join(DrawUml::Configure.parent_path, path)
+        def branch(node)
+          @raw += "<div style=\"padding-left: #{node.level}0px;\">\n"
+          @raw += "<h3>#{node.name}</h3>\n"
+          arr = []
+          node.entries.each do |entry|
+            if entry.leaf?
+              arr << entry
+            else
+              branch(entry)
+            end
+          end
+          @raw += "<ul>"
+          @raw += arr.map do |entry|
+            "<li><a href=#{@request.path}?id=#{entry.id}>#{entry.name}</a></li>"
+          end.join("\n")
+          @raw += "</ul></div>\n"
         end
       # end private
     end

data/lib/draw_uml/tree/branch.rb

@@ -13,6 +13,13 @@ module DrawUml
         false
       end
 
+      def each(&block)
+        entries.each do |entry|
+          block.call(entry)
+          entry.each(&block) if entry.is_a?(DrawUml::Tree::Branch)
+        end
+      end
+
       private
         def node
           Dir[File.join(path, '*')].each do |path|

data/lib/draw_uml/tree/leaf.rb

@@ -1,12 +1,15 @@
 module DrawUml
   module Tree
     class Leaf
-      attr_reader :name, :path, :level
+      attr_reader :name, :path, :level, :id
 
       def initialize(name, level=0)
         @name = File.basename(name, '.*')
         @path = File.expand_path(name)
         @level = level
+
+        raw = path.sub(DrawUml::Configure.source_path, '')
+        @id = raw.sub('.' + DrawUml::Configure.diagram_extension, '')
       end
 
       def leaf?

data/lib/draw_uml/version.rb

@@ -1,3 +1,3 @@
 module DrawUml
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/templates/layouts/application.html.erb

@@ -25,7 +25,7 @@
   h2 { padding-left: 10px; }
   h3 { padding-left: 10px; }
 
-  div.tree {
+  div.diagrams {
     float:left;
   }
 
@@ -38,12 +38,12 @@
 <body>
   <h2>Unified Modeling Language</h2>
 
-  <div class='tree'>
-    <%= tree %>
+  <div class='diagrams'>
+    <%= diagrams %>
   </div>
 
   <div class='draw'>
-    <img src=<%= image_path %>>
+    <img src=<%= path %>>
   </div>
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draw_uml
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ogom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack