draw_uml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9e424fce3edd91c448e800ae8e84b4c07fb03f
-  data.tar.gz: 8c6525c225b817c8f326b12f37d11f5779d8b72f
+  metadata.gz: 86908c27699847e4e49ecd3e0f4f76c25bc9d929
+  data.tar.gz: 98c770b3c7a3a49698f775b693033c3503e2a2e1
 SHA512:
-  metadata.gz: 5fd3054cd9cf0d3f35a5ce03c6621d80378ac3e2e596b8fdba0adfdf3a13b75b7c5b8b9c9d893d5ce122f4d267c9891e32b98f532dcf6ad41f597b8d359023db
-  data.tar.gz: 3d0dd57faaa43dca9a5eafc6d16ccf4bb0dae9e0510871c661e5f1772f6926dd37c96881f192aa5117bc20bf47ada7fd9e812519dfcdea1bb6f1d7dbf5fdcac2
+  metadata.gz: 8342d7334734b458e48e566614b1a78c94928b723cd3b3a1f8dfaaee46bf433d125d7c10e6f1e574c743517b53762e8f7e4772cf12b076c9b72e5ac41efcf21e
+  data.tar.gz: 459c443e3e93b395e3268cd107868a848d04f12691f9ccf646126129f105f033603f01a0f21a4f8f1708f379d1eb60a2c34b8c549c7e98c3349eeb82efd9c504

data/.gitignore

@@ -1,6 +1,6 @@
 .bundle
-doc
-pkg
-public
-tmp
+/doc
+/pkg
+/public
+/tmp
 Gemfile.lock

data/config.ru

@@ -1,3 +1,3 @@
 require_relative './lib/draw_uml'
-use Rack::Static, :urls => ['/images'], :root => "public"
+use Rack::Static, urls: ['/images'], root: 'public'
 run DrawUml::Engine

data/example/doc/diagrams/uml/sequence.uml

@@ -0,0 +1,7 @@
+@startuml
+Alice -> Bob: Authentication Request
+Bob --> Alice: Authentication Response
+
+Alice -> Bob: Another authentication Request
+Alice <-- Bob: another authentication Response
+@enduml

data/lib/draw_uml.rb

@@ -4,6 +4,7 @@ require_relative 'draw_uml/version'
 require_relative 'draw_uml/configure'
 require_relative 'draw_uml/default'
 require_relative 'draw_uml/engine'
+require_relative 'draw_uml/tree'
 require_relative 'draw_uml/diagram'
 
 module DrawUml

data/lib/draw_uml/configure.rb

@@ -13,8 +13,12 @@ module DrawUml
         @keys ||= %i[diagram_extension diagram_path static_path image_path]
       end
 
+      def source_path
+        File.expand_path(self.diagram_path)
+      end
+
       def source_file
-        Dir[File.expand_path('**/*.' + self.diagram_extension, self.diagram_path)]
+        Dir[File.join(self.source_path, '**/*.' + self.diagram_extension)]
       end
 
       def dest_path

data/lib/draw_uml/default.rb

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

data/lib/draw_uml/engine.rb

@@ -1,18 +1,23 @@
 require 'rack'
 require 'erb'
+require 'pp'
 
 module DrawUml
   class Engine
     class << self
       def call(env)
-        params = Rack::Request.new(env).params
-        id = params['id'].to_i ||= 0
+        request = Rack::Request.new(env)
+        id = request.params['id'].to_i ||= 0
+
+        # root = DrawUml::Tree.create(DrawUml::Configure.source_path)
+        # root.each do |node|
+        # end
 
         diagram = DrawUml::Diagram.new(DrawUml::Configure.dest_path)
         diagram.create(DrawUml::Configure.source_file[id])
 
         files = DrawUml::Configure.source_file.map { |file| File.basename(file, '.*') }
-        path = File.join(DrawUml::Configure.image_path, files[id] + '.png')
+        image_path = File.join(DrawUml::Configure.image_path, files[id] + '.png')
 
         erb = ERB.new(DrawUml::Configure.application_template)
         body = erb.result(binding)

data/lib/draw_uml/tree.rb

@@ -0,0 +1,10 @@
+require_relative 'tree/leaf'
+require_relative 'tree/branch'
+
+module DrawUml
+  module Tree
+    def self.create(path)
+      DrawUml::Tree::Branch.new(path)
+    end
+  end
+end

data/lib/draw_uml/tree/branch.rb

@@ -0,0 +1,32 @@
+module DrawUml
+  module Tree
+    class Branch < DrawUml::Tree::Leaf
+      attr_reader :entries
+
+      def initialize(name)
+        @entries = []
+        super
+        node
+      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|
+            if File.directory?(path)
+              entries << DrawUml::Tree::Branch.new(path)
+            else
+              entries << DrawUml::Tree::Leaf.new(path)
+            end
+          end
+        end
+      # end private
+    end
+  end
+end

data/lib/draw_uml/tree/leaf.rb

@@ -0,0 +1,12 @@
+module DrawUml
+  module Tree
+    class Leaf
+      attr_reader :name, :path
+
+      def initialize(name)
+        @name = File.basename(name, '.*')
+        @path = File.expand_path(name)
+      end
+    end
+  end
+end

data/lib/draw_uml/version.rb

@@ -1,3 +1,3 @@
 module DrawUml
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

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

@@ -1,15 +1,29 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>UML</title>
+<head><title>Diagrams</title>
+<style type="text/css">
+  div.diagrams {
+    padding-top: 20px;
+    float:left;
+  }
+
+  div.draw img {
+    padding-top: 40px;
+    padding-left: 80px;
+  }
+</style>
 </head>
 <body>
 
-<% files.each_with_index do |item, idx| %>
-  <a href="./?id=<%= idx %>"><%= item %></a><br>
-<% end %>
+<div class='diagrams'>
+  <% files.each_with_index do |item, idx| %>
+    <a href="<%= request.path %>?id=<%= idx %>"><%= item %></a><br>
+  <% end %>
+</div>
 
-<img src=<%= path %>>
+<div class='draw'>
+  <img src=<%= image_path %>>
+</div>
 
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draw_uml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ogom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -68,11 +68,15 @@ files:
 - config.ru
 - draw_uml.gemspec
 - example/bin/draw_uml
+- example/doc/diagrams/uml/sequence.uml
 - lib/draw_uml.rb
 - lib/draw_uml/configure.rb
 - lib/draw_uml/default.rb
 - lib/draw_uml/diagram.rb
 - lib/draw_uml/engine.rb
+- lib/draw_uml/tree.rb
+- lib/draw_uml/tree/branch.rb
+- lib/draw_uml/tree/leaf.rb
 - lib/draw_uml/version.rb
 - lib/templates/layouts/application.html.erb
 - spec/lib/version_spec.rb