jruby_activiti 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b014547ed19ccc9e4dd9352847ab6fa4c16d6bf9
-  data.tar.gz: ed3e57aa2417b4b9aada9ee8497fc04a697c66ee
+  metadata.gz: 9f0a93eb101989b4848b8163247a7bc291af024a
+  data.tar.gz: 2206467cd0bac8c5affab560814b82a37cf8a5ee
 SHA512:
-  metadata.gz: 807f642746db84bc36b67c0508cb4e8f03cdddb67249ce7062c5945b4692a14f78976a2b707b327284c56874a623b026f9f4b511d55882d63c13ef2365e5fb25
-  data.tar.gz: 8a5adb4730f6665943ddc5adf0de9ea15384895386a0766264ee7c3b0a82f02f6e544eba865b748ba267c2353f1d7febe9a63ab31aba877564c3e22cb05bafc7
+  metadata.gz: ab7464720bfeaea53b840e408d2dbafb1a6140b5b578661a02c7fa70a22d304af4b0ad3227280cba1198a9173d7daebfab580c694eb3e8413cc91cce5290ad15
+  data.tar.gz: 3dffa1d82d9325692cdee98c3b426614dd47596fc3f2f86d278f258c8526c6911190a964062c5961490326546fdb283fd736a5c128f7136616789b05e3a232c4

data/lib/generators/jruby_activiti/templates/initializer.rb

@@ -1 +1 @@
-Activiti = JrubyActiviti::Activiti
+Activiti = JrubyActiviti.build_engine

data/lib/jruby_activiti/version.rb

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

data/lib/jruby_activiti.rb

@@ -7,22 +7,30 @@ module JrubyActiviti
   ConfigPath ||= "config/activiti.cfg.xml"
 
   def self.build_engine
-    return @engine if @engine
-
-    configuration = Java::OrgActivitiEngine::ProcessEngineConfiguration.
-      createProcessEngineConfigurationFromResource(ConfigPath)
-    @engine = configuration.buildProcessEngine
+    Activiti.build_engine
   end
 
   module Activiti
-    Engine              = JrubyActiviti.build_engine
-    RepositoryService   = Engine.getRepositoryService()
-    RuntimeService      = Engine.getRuntimeService()
-    TaskService         = Engine.getTaskService()
-    ManagementService   = Engine.getManagementService()
-    IdentityService     = Engine.getIdentityService()
-    HistoryService      = Engine.getHistoryService()
-    FormService         = Engine.getFormService()
+    def self.build_engine
+      return self if @engine
+
+      configuration = Java::OrgActivitiEngine::ProcessEngineConfiguration.
+        createProcessEngineConfigurationFromResource(ConfigPath)
+      @engine = configuration.buildProcessEngine
+      self.set_activiti_const
+
+      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
   end
 end

data/test/base_test.rb

@@ -2,9 +2,21 @@ require 'test_helper'
 
 Bundler.require "h2"
 
-Activiti = JrubyActiviti::Activiti
+Activiti = JrubyActiviti.build_engine
+
+def assert_difference(cmd, target_count)
+  count1 = eval(cmd)
+  yield if block_given?
+  count2 = eval(cmd)
+
+  assert_equal target_count, count2-count1 
+end
 
 class BaseTest < Minitest::Test
+  def before_setup
+    @@deployed ||= deploy_vacation_request
+  end
+
   def deploy_vacation_request
     Activiti::RepositoryService.createDeployment().
       addClasspathResource("test/resources/VacationRequest.bpmn20.xml").
@@ -20,43 +32,44 @@ class BaseTest < Minitest::Test
   end
 
   def test_create_deploy
-    before_count = Activiti::RepositoryService.createProcessDefinitionQuery().count()
-    deploy_vacation_request
-    after_count = Activiti::RepositoryService.createProcessDefinitionQuery().count()
-    assert_equal 1, after_count - before_count
+    assert_difference 'Activiti::RepositoryService.createProcessDefinitionQuery().count()', 1 do
+      deploy_vacation_request
+    end
   end
 
   def test_create_process_instance
-    deploy_vacation_request
+    assert_difference 'Activiti::RuntimeService.createProcessInstanceQuery().count()', 1 do
+      Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", task_variables);
+    end
+  end
 
-    
+  def test_create_process_instance_with_output
     assert_output(/hello, this is a script task/) do
       Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", task_variables);
     end
-
-    instance_count = Activiti::RuntimeService.createProcessInstanceQuery().count()
-    assert_equal 1, instance_count
   end
 
-  def test_task_process
-    deploy_vacation_request
-    
+  def test_task_query
     Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", task_variables);
 
     tasks = Activiti::TaskService.createTaskQuery().taskCandidateGroup("management").list();
-    task = tasks.first
-    assert_equal 'Handle vacation request', task.getName
+    task = tasks.first()
+    assert_equal 'Handle vacation request', task.getName()
+  end
+
+  def test_complete_task
+    Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", task_variables);
 
     tasks = Activiti::TaskService.createTaskQuery().taskCandidateGroup("management").list();
-    task = tasks.first
+    task = tasks.first()
     task_variables = {
       "vacationApproved" => "false",
       "managerMotivation" => "We have a tight deadline!"
     }
-    Activiti::TaskService.complete(task.getId, task_variables);
+    Activiti::TaskService.complete(task.getId(), task_variables);
 
     tasks = Activiti::TaskService.createTaskQuery().taskAssignee("Kermit").list();
     task = tasks.first
-    assert_equal 'Adjust vacation request', task.getName
+    assert_equal 'Adjust vacation request', task.getName()
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_activiti
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - richfisher