ditaarb 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDVhYmYxNjBmOTM4ZTgwMTlmNTM0YzE3YWZmZjQyM2RlMzkxNGJlMQ==
+  data.tar.gz: !binary |-
+    YjRjOGFkMjQ5MWU3MGU3YmM3ZDA0MGRiMmFlNzUyY2UyZTgxYTg2OQ==
+SHA512:
+  metadata.gz: !binary |-
+    NWI5Y2QxZTZmNDQ4MDRmZTM5MjNmZmY4MDE5NDQ0NDQxYTQxYjg4ZTk2Y2Yw
+    ZDMzNDI2YmZmMGI3ZjM2MmNjZTY3MTQwMDFjOWE2YzNlNjEwNjlmYzE2ZWFm
+    MThhNTRhNGVlMDI1YWY2ZTc4NTRiY2EyZDEyYzhjNzFhOGJlNzA=
+  data.tar.gz: !binary |-
+    ZDZlODVjNWJjODFjMzhiNTg4ZGEwMTkxNjJkOTFmYTFhOTM1ZWVkZTM3MzJl
+    MzE1OGJiZGMyN2E3YjAxMjYwM2Q1MjlkNzU0OWU4ZmRhMTAyZTE1MTMzOWNm
+    OWU2MzAxYjc1Njk3Yjk5NjFhNDI2ODUzZTVjYjBjNjM0NDA1YmI=

data/README.md

@@ -57,7 +57,7 @@ end
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/ditaarb/fork )
+1. Fork it ( https://github.com/avalanche123/ditaarb/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`)

data/lib/ditaarb.rb

@@ -1,4 +1,6 @@
 require 'tempfile'
+require 'tmpdir'
+require 'digest'
 
 module Ditaa
   # @param ascii_art [String] original ascii diagram to render as image.
@@ -18,28 +20,67 @@ module Ditaa
   #   advisable to use tabs in your diagrams.
   # @return [String] processed image
   def self.render(ascii_art, options = {})
-    ditaa_jar  = File.expand_path(File.dirname(__FILE__) + '/../vendor/ditaa0_9.jar')
-    ditaa_jar << ' -A' if options[:antialiasing]
-    ditaa_jar << ' -d' if options[:debug]
-    ditaa_jar << ' -E' if options[:separation] == false
-    ditaa_jar << ' -r' if options[:rounded_corneres]
-    ditaa_jar << " -s #{options[:scale]}" if options[:scale]
-    ditaa_jar << ' -S' if options[:shadows] == false
-    ditaa_jar << ' -t' if options[:tabs]
-
-    input_file = Tempfile.new('ditaa.input')
-    input_file.write(ascii_art)
-    input_file.flush
-
-    output_file = Tempfile.new('ditaa.output')
-
-    pid = Process.spawn("java -jar #{ditaa_jar} -v #{input_file.path} #{output_file.path}", [:err, :out] => '/dev/null')
-    Process.wait(pid)
-    File.read(output_file.path)
-  ensure
-    input_file.close!
-    output_file.close!
+    filename = File.join(Dir.tmpdir, 'ditaarb-' + Digest::MD5.hexdigest(ascii_art) + '.tmp')
+
+    return File.read(filename) if File.exists?(filename)
+
+    begin
+      input_file = Tempfile.new('ditaa.input')
+      input_file.write(ascii_art)
+      input_file.flush
+
+      args  = ['java', '-jar']
+      args << File.expand_path(__FILE__ + '/../../vendor/ditaa0_9.jar')
+      args << '-A' if options[:antialiasing]
+      args << '-d' if options[:debug]
+      args << '-E' if options[:separation] == false
+      args << '-r' if options[:rounded_corneres]
+      args << '-s' << options[:scale] if options[:scale]
+      args << '-S' if options[:shadows] == false
+      args << '-t' if options[:tabs]
+      args << '-v'
+      args << input_file.path
+      args << filename
+      args << { [:err, :out] => '/dev/null' }
+
+      system(*args)
+    ensure
+      input_file.close!
+    end
+
+    File.read(filename)
   end
 end
 
 require 'ditaarb/version'
+
+File.open('diagram.png', 'w+') do |f|
+  f.write Ditaa.render(<<-ASCII)
+                                  /-------+
+                                  |Cluster|<----------------------------------+
+                                  +-------/                                   |
+                                      ^                                       |
+                                      |                                       |
+            +-------------------------+-------------------------+             |
+            :                         :                         :             |
+        /---+---+                 /---+---+                 /---+---+         |
+        |Session|                 |Session|                 |Session|         |
+        +-------/                 +-------/                 +-------/         |
+            ^                         ^                         ^             |
+            |                         |                         |             |
+     +------+-----+            +------+-----+            +------+-----+       |
+     :            :            :            :            :            :       |
+/----+-----+ /----+-----+ /----+-----+ /----+-----+ /----+-----+ /----+-----+ |
+|Connection| |Connection| |Connection| |Connection| |Connection| |Connection| |
++----+-----/ +----+-----/ +----+-----/ +----+-----/ +----+-----/ +----+-----/ |
+     :            :            :            :            :            :       |
+     +------------+-=----------+------+-----+-=----------+------------+       |
+                                      |                                       |
+                                      v                                       |
+                                /----------+                                  |
+                                |IO Reactor|                                  |
+                                +-----+----/                                  |
+                                      :                                       |
+                                      +---------------------------------------+
+ASCII
+end

data/lib/ditaarb/version.rb

@@ -1,3 +1,3 @@
 module Ditaa
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,44 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: ditaarb
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bulat Shakirzyanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -50,35 +45,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ditaarb/version.rb
-- lib/ditaarb.rb
 - README.md
+- lib/ditaarb.rb
+- lib/ditaarb/version.rb
 - vendor/ditaa0_9.jar
 homepage: https://github.com/avalanche123/ditaarb
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - java
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A wrapper around ditaa, to produce images from ascii art
 test_files: []
 has_rdoc: