asciidoctor-diagram 1.1.5 → 1.1.6

data/spec/test_helper.rb

@@ -6,9 +6,11 @@ require 'stringio'
 require 'tmpdir'
 
 require_relative '../lib/asciidoctor-diagram'
+require_relative '../lib/asciidoctor-diagram/blockdiag/extension'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
 require_relative '../lib/asciidoctor-diagram/graphviz/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
+require_relative '../lib/asciidoctor-diagram/shaape/extension'
 
 module Asciidoctor
   class AbstractBlock

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rjb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.8
 description: Asciidoctor diagramming extension
@@ -97,27 +97,34 @@ files:
 - examples/design.adoc
 - examples/features.adoc
 - lib/asciidoctor-diagram.rb
+- lib/asciidoctor-diagram/blockdiag.rb
+- lib/asciidoctor-diagram/blockdiag/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
-- lib/asciidoctor-diagram/ditaa/generator.rb
 - lib/asciidoctor-diagram/graphviz.rb
 - lib/asciidoctor-diagram/graphviz/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
 - lib/asciidoctor-diagram/plantuml/generator.rb
+- lib/asciidoctor-diagram/shaape.rb
+- lib/asciidoctor-diagram/shaape/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
+- lib/asciidoctor-diagram/util/cli_generator.rb
 - lib/asciidoctor-diagram/util/diagram.rb
 - lib/asciidoctor-diagram/util/java.rb
 - lib/asciidoctor-diagram/util/java_jruby.rb
 - lib/asciidoctor-diagram/util/java_rjb.rb
 - lib/asciidoctor-diagram/util/png.rb
 - lib/asciidoctor-diagram/util/svg.rb
+- lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/version.rb
 - lib/ditaamini0_9.jar
 - lib/plantuml.jar
+- spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
+- spec/shaape_spec.rb
 - spec/test_helper.rb
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
@@ -129,23 +136,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
   using PlantUML
 test_files:
+- spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
+- spec/shaape_spec.rb
 - spec/test_helper.rb

data/lib/asciidoctor-diagram/ditaa/generator.rb

@@ -1,31 +0,0 @@
-require_relative '../util/java'
-
-module Asciidoctor
-  module Diagram
-    module DitaaGenerator
-      private
-
-      DITAA_JAR_PATH = File.expand_path File.join('../..', 'ditaamini0_9.jar'), File.dirname(__FILE__)
-      Java.classpath << DITAA_JAR_PATH
-
-      def ditaa(code)
-        Java.load
-
-        args = ['-e', 'UTF-8']
-
-        bytes = code.encode(Encoding::UTF_8).bytes.to_a
-        bis = Java.new_object( Java.java.io.ByteArrayInputStream, '[B', Java.array_to_java_array(bytes, :byte))
-        bos = Java.new_object( Java.java.io.ByteArrayOutputStream )
-        result_code = Java.org.stathissideris.ascii2image.core.CommandLineConverter.convert(Java.array_to_java_array(args, :string), bis, bos)
-        bis.close
-        bos.close
-
-        result = Java.string_from_java_bytes(bos.toByteArray)
-
-        raise "Ditaa image generation failed: #{result}" unless result_code == 0
-
-        result
-      end
-    end
-  end
-end