jruby_activiti 1.2.5 → 2.0.0

data/jruby_activiti.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   # spec.platform      = "java"
   spec.authors       = ["richfisher"]
   spec.email         = ["richfisher.pan@gmail.com"]
-  spec.summary       = "Access and interact with Activiti BPM in JRuby/Rails directly, https://github.com/richfisher/jruby_activiti"
+  spec.summary       = "Integrate Activiti BPM in JRuby/Rails, including Activiti Engine, Modeler and Diagram Viewer. https://github.com/richfisher/jruby_activiti"
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/richfisher/jruby_activiti"
   spec.license       = "MIT"
@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "minitest", '~> 5.8'
 
-  spec.add_dependency "jbundler", '~> 0.9'
+  spec.add_dependency "jbundler"
+  spec.add_dependency "sinatra"
 end

data/lib/generators/jruby_activiti/install_generator.rb

@@ -22,6 +22,10 @@ module JrubyActiviti
       def create_initializer_file
         copy_file "initializer.rb", "config/initializers/jruby_activiti.rb"
       end
+
+      def add_routes
+        route "mount JrubyActiviti::Web => '/activiti' if defined?(JrubyActiviti)"
+      end
     end
   end
 end

data/lib/jruby_activiti/version.rb

@@ -1,3 +1,3 @@
 module JrubyActiviti
-  VERSION = "1.2.5"
+  VERSION = "2.0.0"
 end

data/lib/jruby_activiti/web.rb

@@ -0,0 +1,81 @@
+require 'sinatra'
+
+module JrubyActiviti
+  class Web < Sinatra::Base
+    set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
+    set :public_folder, proc { "#{root}/public" }
+    set :views, proc { "#{root}/views" }
+
+    get "/" do
+      redirect uri('/models')
+    end
+
+    get "/service/model/:model_id/json" do
+      model = Activiti::RepositoryService.createModelQuery().modelId(params['model_id']).singleResult()
+      modeler = Java::Jrubyactiviti::Modeler.new(Activiti::RepositoryService)
+      modeler.show(model.getId()).to_s
+    end
+
+    get "/service/editor/stencilset" do
+      Java::Jrubyactiviti::StencilsetResource.getStencilset().to_s
+    end
+
+    put "/service/model/:model_id/save" do
+      model = Activiti::RepositoryService.createModelQuery().modelId(params['model_id']).singleResult()
+      map = Activiti::Utils.hash_to_map(params)
+      modeler = Java::Jrubyactiviti::Modeler.new(Activiti::RepositoryService)
+      modeler.save(model.getId(), map)
+      200
+    end
+
+    get "/service/process-definition/:process_definition_id/diagram-layout" do
+      diagramer = Java::Jrubyactiviti::ProcessDiagram.new(
+        Activiti::RuntimeService,
+        Activiti::RepositoryService,
+        Activiti::HistoryService)
+      json = diagramer.getDiagramNode(nil, params[:process_definition_id]).to_s
+      "#{params[:callback]}(#{json})"
+    end
+
+    # seems not be used
+    get "/service/process-instance/:process_instance_id/diagram-layout" do
+      diagramer = Java::Jrubyactiviti::ProcessDiagram.new(
+        Activiti::RuntimeService,
+        Activiti::RepositoryService,
+        Activiti::HistoryService)
+      json = diagramer.getDiagramNode(params[:process_instance_id], nil).to_s
+      "#{params[:callback]}(#{json})"
+    end
+
+    get "/service/process-instance/:process_instance_id/highlights" do
+      highlighter = Java::Jrubyactiviti::ProcessInstanceHighlights.new(
+        Activiti::RuntimeService,
+        Activiti::RepositoryService,
+        Activiti::HistoryService)
+      json = highlighter.getHighlighted(params[:process_instance_id]).to_s
+      "#{params[:callback]}(#{json})"
+    end
+
+    get "/models" do
+      @models = Activiti::RepositoryService.createModelQuery().orderByCreateTime().desc().list()
+      erb 'models/index'.to_sym
+    end
+
+    get "/models/new" do
+      erb 'models/new'.to_sym
+    end
+
+    post "/models" do
+      model = Activiti::RepositoryService.newModel
+      model.setName(params[:name])
+      model.setCategory(params[:category])
+      model.setMetaInfo('{}')
+      Activiti::RepositoryService.saveModel(model)
+
+      init_json = '{"id":"canvas","resourceId":"canvas","stencilset":{"namespace":"http://b3mn.org/stencilset/bpmn2.0#"}}'
+      Activiti::RepositoryService.addModelEditorSource(model.getId(), init_json.bytes)
+
+      redirect uri('/models')
+    end
+  end
+end

data/lib/jruby_activiti.rb

@@ -1,36 +1,44 @@
 require "jruby_activiti/version"
+require "jruby_activiti/web"
+# require File.dirname(__FILE__) + '/../java/target/jrubyactiviti-2.0.jar'
+require File.dirname(__FILE__) + '/jar/jrubyactiviti-2.0.jar'
 
 require "jbundler"
 Bundler.require "activiti-engine"
+Bundler.require "util"
 
 module JrubyActiviti
   ConfigPath ||= "config/activiti.cfg.xml"
 
   def self.build_engine
-    Activiti.build_engine
-  end
+    return self if @engine
 
-  module Activiti
-    def self.build_engine
-      return self if @engine
+    configuration = Java::OrgActivitiEngine::ProcessEngineConfiguration.
+      createProcessEngineConfigurationFromResource(ConfigPath)
+    @engine = configuration.buildProcessEngine
+    self.set_activiti_const
 
-      configuration = Java::OrgActivitiEngine::ProcessEngineConfiguration.
-        createProcessEngineConfigurationFromResource(ConfigPath)
-      @engine = configuration.buildProcessEngine
-      self.set_activiti_const
+    return self
+  end
 
-      return self
-    end
+  def self.set_activiti_const
+    const_set 'Engine', @engine
+    const_set 'RepositoryService', @engine.getRepositoryService()
+    const_set 'RuntimeService', @engine.getRuntimeService()
+    const_set 'TaskService', @engine.getTaskService()
+    const_set 'ManagementService', @engine.getManagementService()
+    const_set 'IdentityService', @engine.getIdentityService()
+    const_set 'HistoryService', @engine.getHistoryService()
+    const_set 'FormService', @engine.getFormService()
+  end
 
-    def self.set_activiti_const
-      const_set 'Engine', @engine
-      const_set 'RepositoryService', @engine.getRepositoryService()
-      const_set 'RuntimeService', @engine.getRuntimeService()
-      const_set 'TaskService', @engine.getTaskService()
-      const_set 'ManagementService', @engine.getManagementService()
-      const_set 'IdentityService', @engine.getIdentityService()
-      const_set 'HistoryService', @engine.getHistoryService()
-      const_set 'FormService', @engine.getFormService()
+  module Utils
+    def self.hash_to_map(hash)
+      map = Java::JavaUtil::HashMap.new
+      hash.each do |k,v|
+        map.put(k.to_s,v.to_s)
+      end
+      map
     end
   end
 end

data/test/{base_test.rb → activiti_test.rb}

@@ -2,8 +2,6 @@ require 'test_helper'
 
 Bundler.require "h2"
 
-Activiti = JrubyActiviti.build_engine
-
 def assert_difference(cmd, target_count)
   count1 = eval(cmd)
   yield if block_given?
@@ -12,7 +10,7 @@ def assert_difference(cmd, target_count)
   assert_equal target_count, count2-count1 
 end
 
-class BaseTest < Minitest::Test
+class IntegrationTest < Minitest::Test
   def before_setup
     @@deployed ||= deploy_vacation_request
   end

data/test/instance_hights_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class InstanceHightsTest < Minitest::Test
+  def test_instance_diagram
+    highlighter = Java::Jrubyactiviti::ProcessInstanceHighlights.new(
+      Activiti::RuntimeService,
+      Activiti::RepositoryService,
+      Activiti::HistoryService)
+
+    Activiti::RepositoryService.createDeployment().
+      addClasspathResource("test/resources/VacationRequest.bpmn20.xml").
+      deploy()
+    Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", {});
+
+    instance = Activiti::RuntimeService.createProcessInstanceQuery().list().first()
+    assert highlighter.getHighlighted(instance.getId())
+  end
+end

data/test/modeler_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class ModelerTest < Minitest::Test
+  def setup
+    @modeler = Java::Jrubyactiviti::Modeler.new(Activiti::RepositoryService)
+  end
+
+  def create_model
+    model = Activiti::RepositoryService.newModel
+    model.setName('modeler_test')
+    model.setMetaInfo('{}')
+    Activiti::RepositoryService.saveModel(model)
+    init_json = File.open(File.dirname(__FILE__)+'/resources/model_init_editor_source.json').read
+    Activiti::RepositoryService.addModelEditorSource(model.getId(),init_json.bytes)
+    model
+  end
+
+  def test_save
+    hash = {
+      'name': 'aname',
+      'description': 'adescription',
+      'json_xml': File.open(File.dirname(__FILE__)+'/resources/model_json_xml.json').read,
+      'svg_xml': File.open(File.dirname(__FILE__)+'/resources/model_svg_xml.xml').read
+    }
+    map = Activiti::Utils.hash_to_map(hash)
+
+    model = create_model
+    @modeler.save(model.getId(), map)
+  end
+
+  def test_show
+    model = create_model
+    assert @modeler.show(model.getId())
+  end
+end

data/test/process_diagram_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ProcessDiagramTest < Minitest::Test
+  def test_definition_diagram
+    diagramer = Java::Jrubyactiviti::ProcessDiagram.new(
+      Activiti::RuntimeService,
+      Activiti::RepositoryService,
+      Activiti::HistoryService)
+
+    Activiti::RepositoryService.createDeployment().
+      addClasspathResource("test/resources/VacationRequest.bpmn20.xml").
+      deploy()
+    Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", {});
+
+    pdid = Activiti::RuntimeService.createProcessInstanceQuery().list().first().getProcessDefinitionId()
+    assert diagramer.getDiagramNode(nil, pdid)
+  end
+
+  def test_instance_diagram
+    diagramer = Java::Jrubyactiviti::ProcessDiagram.new(
+      Activiti::RuntimeService,
+      Activiti::RepositoryService,
+      Activiti::HistoryService)
+
+    Activiti::RepositoryService.createDeployment().
+      addClasspathResource("test/resources/VacationRequest.bpmn20.xml").
+      deploy()
+    Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", {});
+
+    instance = Activiti::RuntimeService.createProcessInstanceQuery().list().first()
+    assert diagramer.getDiagramNode(instance.getId(), nil)
+  end
+end

data/test/resources/model_init_editor_source.json

@@ -0,0 +1 @@
+{"id":"canvas","resourceId":"canvas","stencilset":{"namespace":"http://b3mn.org/stencilset/bpmn2.0#"}}

data/test/resources/model_json_xml.json

@@ -0,0 +1,278 @@
+{
+    "resourceId": "1649",
+    "properties": {
+        "process_id": "process",
+        "name": "",
+        "documentation": "",
+        "process_author": "",
+        "process_version": "",
+        "process_namespace": "http://www.activiti.org/processdef",
+        "executionlisteners": "",
+        "eventlisteners": "",
+        "signaldefinitions": "",
+        "messagedefinitions": ""
+    },
+    "stencil": {
+        "id": "BPMNDiagram"
+    },
+    "childShapes": [{
+        "resourceId": "sid-661AFB90-AD05-4D8F-ABB9-64018D8A271D",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "executionlisteners": "",
+            "initiator": "",
+            "formkeydefinition": "",
+            "formproperties": ""
+        },
+        "stencil": {
+            "id": "StartNoneEvent"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-F7856D41-5426-4FC5-B267-7AF366537986"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 143.5,
+                "y": 147
+            },
+            "upperLeft": {
+                "x": 113.5,
+                "y": 117
+            }
+        },
+        "dockers": []
+    }, {
+        "resourceId": "sid-B5E2DF17-E733-4D5C-9B2A-1B4947DE82ED",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "asynchronousdefinition": "false",
+            "exclusivedefinition": "false",
+            "executionlisteners": "",
+            "multiinstance_type": "None",
+            "multiinstance_cardinality": "",
+            "multiinstance_collection": "",
+            "multiinstance_variable": "",
+            "multiinstance_condition": "",
+            "isforcompensation": "false",
+            "usertaskassignment": "",
+            "formkeydefinition": "",
+            "duedatedefinition": "",
+            "prioritydefinition": "",
+            "formproperties": "",
+            "tasklisteners": ""
+        },
+        "stencil": {
+            "id": "UserTask"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-75F9A329-B83E-400D-8647-1BC0618A8211"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 288.5,
+                "y": 172
+            },
+            "upperLeft": {
+                "x": 188.5,
+                "y": 92
+            }
+        },
+        "dockers": []
+    }, {
+        "resourceId": "sid-F7856D41-5426-4FC5-B267-7AF366537986",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "conditionsequenceflow": "",
+            "executionlisteners": "",
+            "defaultflow": "false"
+        },
+        "stencil": {
+            "id": "SequenceFlow"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-B5E2DF17-E733-4D5C-9B2A-1B4947DE82ED"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 187.65625,
+                "y": 132
+            },
+            "upperLeft": {
+                "x": 144.109375,
+                "y": 132
+            }
+        },
+        "dockers": [{
+            "x": 15,
+            "y": 15
+        }, {
+            "x": 50,
+            "y": 40
+        }],
+        "target": {
+            "resourceId": "sid-B5E2DF17-E733-4D5C-9B2A-1B4947DE82ED"
+        }
+    }, {
+        "resourceId": "sid-EED58D00-9C48-4C71-842D-2559368AC304",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "asynchronousdefinition": "false",
+            "exclusivedefinition": "false",
+            "executionlisteners": "",
+            "multiinstance_type": "None",
+            "multiinstance_cardinality": "",
+            "multiinstance_collection": "",
+            "multiinstance_variable": "",
+            "multiinstance_condition": "",
+            "isforcompensation": "false",
+            "usertaskassignment": "",
+            "formkeydefinition": "",
+            "duedatedefinition": "",
+            "prioritydefinition": "",
+            "formproperties": "",
+            "tasklisteners": ""
+        },
+        "stencil": {
+            "id": "UserTask"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-DECD18FD-D6AF-4AF6-8A1F-15C234F06AB9"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 433.5,
+                "y": 172
+            },
+            "upperLeft": {
+                "x": 333.5,
+                "y": 92
+            }
+        },
+        "dockers": []
+    }, {
+        "resourceId": "sid-75F9A329-B83E-400D-8647-1BC0618A8211",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "conditionsequenceflow": "",
+            "executionlisteners": "",
+            "defaultflow": "false"
+        },
+        "stencil": {
+            "id": "SequenceFlow"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-EED58D00-9C48-4C71-842D-2559368AC304"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 332.65625,
+                "y": 132
+            },
+            "upperLeft": {
+                "x": 289.34375,
+                "y": 132
+            }
+        },
+        "dockers": [{
+            "x": 50,
+            "y": 40
+        }, {
+            "x": 50,
+            "y": 40
+        }],
+        "target": {
+            "resourceId": "sid-EED58D00-9C48-4C71-842D-2559368AC304"
+        }
+    }, {
+        "resourceId": "sid-80A15A5A-C8F0-4BD5-B975-6BA4AA9EFF6C",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "executionlisteners": ""
+        },
+        "stencil": {
+            "id": "EndNoneEvent"
+        },
+        "childShapes": [],
+        "outgoing": [],
+        "bounds": {
+            "lowerRight": {
+                "x": 506.5,
+                "y": 146
+            },
+            "upperLeft": {
+                "x": 478.5,
+                "y": 118
+            }
+        },
+        "dockers": []
+    }, {
+        "resourceId": "sid-DECD18FD-D6AF-4AF6-8A1F-15C234F06AB9",
+        "properties": {
+            "overrideid": "",
+            "name": "",
+            "documentation": "",
+            "conditionsequenceflow": "",
+            "executionlisteners": "",
+            "defaultflow": "false"
+        },
+        "stencil": {
+            "id": "SequenceFlow"
+        },
+        "childShapes": [],
+        "outgoing": [{
+            "resourceId": "sid-80A15A5A-C8F0-4BD5-B975-6BA4AA9EFF6C"
+        }],
+        "bounds": {
+            "lowerRight": {
+                "x": 477.875,
+                "y": 132
+            },
+            "upperLeft": {
+                "x": 433.890625,
+                "y": 132
+            }
+        },
+        "dockers": [{
+            "x": 50,
+            "y": 40
+        }, {
+            "x": 14,
+            "y": 14
+        }],
+        "target": {
+            "resourceId": "sid-80A15A5A-C8F0-4BD5-B975-6BA4AA9EFF6C"
+        }
+    }],
+    "bounds": {
+        "lowerRight": {
+            "x": 1200,
+            "y": 1050
+        },
+        "upperLeft": {
+            "x": 0,
+            "y": 0
+        }
+    },
+    "stencilset": {
+        "url": "stencilsets/bpmn2.0/bpmn2.0.json",
+        "namespace": "http://b3mn.org/stencilset/bpmn2.0#"
+    },
+    "ssextensions": []
+}