draw_uml 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceb3e8989bb14bc8cf5566082e8141a34f5b27a9
-  data.tar.gz: b3b09a7a300aea789dd171453d54d64f62a1ce72
+  metadata.gz: dd61f33a91e12c47f1a95e534cdd12c28799df53
+  data.tar.gz: 1ae9588e9720cc9622a7c2595113eb1799e36700
 SHA512:
-  metadata.gz: af9528a752388a7dae0584c702968363a5f6ae2b7d616c33eae1bbea014c56fefc6114b5ea0e8fb65efef339e07280c47aad9192ccf3a1b092019c2640ed2d39
-  data.tar.gz: 628067ce7c291d5c5c30ba9878fd7f4302dc2af990ccae4d2c4afb162d07f70a1d49d3e4904346ad216e291a0c6c4b055004e393a2607749e030760b18c94719
+  metadata.gz: aab34bc9bd3ef270800cce6e9f4553f470d04f41c92d49dc5dee0ef2913c9972f4c98e211a67ca0f25e101675f9a9f9d01745cd87662a51db8af63f1086c4bbd
+  data.tar.gz: 0f00818298793b7a4c310df033ea0e5289cd7c469d5c6476960c8eba399d82c1e4e5ba2b4d3e9fc733d56f2df8df51ebc12878837893c566e9202f03d9040c35

data/README.md

@@ -2,32 +2,40 @@
 
 [![Gem Version](https://badge.fury.io/rb/draw_uml.png)](https://rubygems.org/gems/draw_uml) [![Build Status](https://travis-ci.org/ogom/draw_uml.png?branch=master)](https://travis-ci.org/ogom/draw_uml)
 
-TODO: Write a gem description
+Drawing the Unified Modeling Language of Rack.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```ruby
+```
 gem 'draw_uml'
 ```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
+
+## Usage
 
-Or install it yourself as:
+### Rails
 
-    $ gem install draw_uml
+Add this line to your `config/routes.rb`:
 
-## Usage
+```
+mount DrawUml::Engine, at: '/rails/draw/uml'
+```
+
+Draw by selecting the model:
+
+![example_uml](http://ogom.github.io/draw_uml/assets/img/example_uml.png)
+
+## Use
 
-TODO: Write usage instructions here
+* [PlantUML](http://plantuml.sourceforge.net/)
 
-## Contributing
+## License
 
-1. Fork it ( https://github.com/[my-github-username]/draw_uml/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+* MIT

data/lib/draw_uml.rb

@@ -18,7 +18,7 @@ module DrawUml
     end
 
     def root
-      @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+      @root ||= Pathname.new(File.expand_path('..', File.dirname(__FILE__)))
     end
   end
 end

data/lib/draw_uml/configure.rb

@@ -7,6 +7,8 @@ module DrawUml
         keys.each do |key|
           instance_variable_set(:"@#{key}", DrawUml::Default.send(key))
         end
+
+        FileUtils.mkdir_p(self.source_path)
       end
 
       def keys
@@ -14,19 +16,23 @@ module DrawUml
       end
 
       def source_path
-        File.expand_path(self.diagram_path)
+        @source_path ||= File.expand_path(self.diagram_path)
       end
 
       def dest_path
-        File.expand_path(File.join(self.static_path, self.image_path))
+        @dest_path ||= File.expand_path(File.join(self.static_path, self.image_path))
       end
 
       def templates_path
-        DrawUml.root.join('lib', 'templates').to_s
+        @templates_path ||= DrawUml.root.join('lib', 'templates').to_s
+      end
+
+      def application_layout
+        @application_layout ||= File.expand_path('application.html.erb', File.join(self.templates_path, 'layouts'))
       end
 
       def application_template
-        File.read(File.expand_path('application.html.erb', File.join(self.templates_path, 'layouts')))
+        File.read(self.application_layout)
       end
     end
   end

data/lib/draw_uml/diagram.rb

@@ -7,17 +7,22 @@ module DrawUml
       FileUtils.mkdir_p(@path)
     end
 
-    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))
+    def create(source_path, dest_path)
+      raw = File.read(source_path)
+      digest = Digest::MD5.hexdigest(raw)
 
-      cmd = 'plantuml -pipe > ' + file
-      stdout, status = Open3.capture2(cmd, stdin_data: raw)
-    end
+      tmp_file = File.join(@path, dest_path + ".#{digest}.tmp")
+      unless File.exist?(tmp_file)
+        png_file = File.join(@path, dest_path + '.png')
+        FileUtils.mkdir_p(File.dirname(png_file))
+
+        cmd = 'plantuml -pipe > ' + png_file
+        stdout, status = Open3.capture2(cmd, stdin_data: raw)
 
-    def config
-      DrawUml::Configure
+        files = Dir[File.join(@path, dest_path + ".*.tmp")]
+        File.unlink(*files)
+        File.write(tmp_file, nil)
+      end
     end
   end
 end

data/lib/draw_uml/engine.rb

@@ -3,51 +3,75 @@ require 'erb'
 
 module DrawUml
   class Engine
-    class << self
-      def call(env)
-        @request = Rack::Request.new(env)
-        id = @request.params['id'] ||= nil
-        path = nil
+    attr_accessor :request, :tree
 
-        unless id.nil?
-          diagram = DrawUml::Diagram.new(DrawUml::Configure.dest_path)
-          diagram.create(id)
-          path = File.join(DrawUml::Configure.image_path, id + '.png')
-        end
+    def call(env)
+      @request = Rack::Request.new(env)
+      @tree = DrawUml::Tree.create(DrawUml::Configure.source_path)
 
-        erb = ERB.new(DrawUml::Configure.application_template)
-        body = erb.result(binding)
+      status = 200
+      headers = {'Content-Type' => 'text/html'}
+      body = ERB.new(DrawUml::Configure.application_template).result(binding)
 
-        status = 200
-        headers = {'Content-Type' => 'text/html'}
-        [status, headers, [body]]
+      [status, headers, [body]]
+    end
+
+    private
+      def image_path
+        path = nil
+        entry = find_entry(request.path_info)
+        unless entry.nil?
+          diagram = DrawUml::Diagram.new(DrawUml::Configure.dest_path)
+          diagram.create(entry.path, entry.id)
+          path = File.join(DrawUml::Configure.image_path, entry.id + '.png')
+        end
+        path
       end
 
-      private
-        def diagrams
-          @raw = ''
-          branch(DrawUml::Tree.create(DrawUml::Configure.source_path))
-          @raw
+      def find_entry(id)
+        raw = nil
+        tree.each do |entry|
+          if entry.id == id
+            raw = entry
+            break
+          end
         end
+        raw
+      end
+
+      def diagram_tag
+        render_branch(tree)
+      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
+      def render_branch(node)
+        raw = ''
+        raw += "<div style=\"padding-left: #{node.level}0px;\">\n"
+        raw += "<h3 onclick=\"check_branch('#{node.id}')\" >#{node.name}</h3>\n"
+        raw += "<div id=#{node.id}>\n"
+        arr = []
+        node.entries.each do |entry|
+          if entry.leaf?
+            arr << entry
+          else
+            raw += render_branch(entry)
           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
+        raw += "<ul>" + arr.map do |entry|
+          "<li><a href=#{request.script_name}#{entry.id}>#{entry.name}</a></li>"
+        end.join("\n")
+        raw += "</ul></div></div>\n"
+        raw
+      end
+    # end private
+
+    class << self
+      def prototype
+        @prototype ||= new
+      end
+
+      def call(env)
+        prototype.call(env)
+      end
     end
   end
 end

data/lib/draw_uml/tree/branch.rb

@@ -3,9 +3,9 @@ module DrawUml
     class Branch < DrawUml::Tree::Leaf
       attr_reader :entries
 
-      def initialize(name, level=0)
-        @entries = []
+      def initialize(path, level=0, trunk=nil)
         super
+        @entries = []
         node
       end
 
@@ -24,9 +24,9 @@ module DrawUml
         def node
           Dir[File.join(path, '*')].each do |path|
             if File.directory?(path)
-              entries << DrawUml::Tree::Branch.new(path, level+1)
+              entries << DrawUml::Tree::Branch.new(path, level, trunk)
             else
-              entries << DrawUml::Tree::Leaf.new(path, level+1)
+              entries << DrawUml::Tree::Leaf.new(path, level, trunk)
             end
           end
         end

data/lib/draw_uml/tree/leaf.rb

@@ -1,15 +1,21 @@
 module DrawUml
   module Tree
     class Leaf
-      attr_reader :name, :path, :level, :id
+      attr_reader :name, :path, :level, :trunk, :id
 
-      def initialize(name, level=0)
-        @name = File.basename(name, '.*')
-        @path = File.expand_path(name)
-        @level = level
+      def initialize(path, level=0, trunk=nil)
+        @name = File.basename(path, '.*')
+        @path = File.expand_path(path)
 
-        raw = path.sub(DrawUml::Configure.source_path, '')
-        @id = raw.sub('.' + DrawUml::Configure.diagram_extension, '')
+        if trunk.nil?
+          @level = level
+          @trunk = path
+          @id = :root
+        else
+          @level = level + 1
+          @trunk = trunk
+          @id = "#{File.dirname(@path)}/#{@name}".sub(trunk, '')
+        end
       end
 
       def leaf?

data/lib/draw_uml/version.rb

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

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

@@ -27,23 +27,39 @@
 
   div.diagrams {
     float:left;
+    padding-right: 30px;
+    padding-bottom: 10px;
+    border-right: solid #eee;
   }
 
   div.draw img {
     padding-top: 40px;
-    padding-left: 60px;
+    padding-left: 20px;
   }
 </style>
+
+<script type="text/ecmascript">
+  function check_branch(id) {
+    console.log(id);
+    var element = document.getElementById(id);
+    if (element.style.display == 'none') {
+      element.style.display = 'block';
+    } else {
+      element.style.display = 'none';
+    }
+  }
+</script>
 </head>
 <body>
-  <h2>Unified Modeling Language</h2>
+  <h2>Models</h2>
+  <p>Drawing the Unified Modeling Language</p>
 
   <div class='diagrams'>
-    <%= diagrams %>
+    <%= diagram_tag %>
   </div>
 
   <div class='draw'>
-    <img src=<%= path %>>
+    <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.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ogom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,8 +67,6 @@ files:
 - Rakefile
 - 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

data/example/bin/draw_uml

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../../lib/draw_uml'
-
-DrawUml.configure do |config|
-  config.diagram_path = 'example/doc/diagrams/uml'
-end
-
-diagram = DrawUml::Diagram.new(DrawUml::Configure.dest_path)
-DrawUml::Configure.source_file.each do |file|
-  diagram.create(file)
-end

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

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