jruby_activiti 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee20adca9322128e6a2fe8e47fe82e2c34a70e9b
-  data.tar.gz: cf5bb3ebf2b27f03bb19635397f96e76e4ec5667
+  metadata.gz: f43fcc1008f52c6469fac5e823785b2ce41345a3
+  data.tar.gz: 9b4e254a6997f1be058505f195c820b172397bc2
 SHA512:
-  metadata.gz: ff006529fc0f9abc530842e4fe0bd96046eae8c93432eb09803a77075e02897a30b8a68e2c319505d5ed41db5c320198108708ee200bd4a5979e9cc36ecb4e84
-  data.tar.gz: 2e6411a2766da4d3a2941afe1903c02140161e0747518b12e38260c43400d8f8db143152653cf79c958d2ba1910b13c6a7e9c9810a58b85aaf9e5d4d8ebec743
+  metadata.gz: e514944941f818024cbcf2e589ea00a1831316c4f9f7d98d5f98ead84f51ca045ba36cfdab8836736368c339b55e43766c1e82dd436a22e32b5c3405bc0be009
+  data.tar.gz: acd200e0a9f6660e8cc1f1533264c70f468be2506610f44d1dd4406f2f0dc8f7d9d828958b9f10e2099ec60e2936157f29c1a1b40110f03bab5a40e1b3798a19

data/README.md

@@ -2,7 +2,7 @@
 
 You can directly access Activiti BPM in JRuby Application.
 
-## Test Environments
+## Test Environment
 JRuby-9.0.3.0, Activiti-5.18.0
 
 ## Installation
@@ -15,7 +15,7 @@ gem 'jruby_activiti'
 
 Run the `bundle install` command to install it.
 
-After you install and add it to your Gemfile, you need to run the generator:
+You need to run the generator:
 
 ```
 rails g jruby_activiti:install
@@ -32,11 +32,19 @@ create  config/initializers/jruby_activiti.rb
 And then execute `jbundle install`
 
 ## Usage
-You can access Activiti directly by using `ActivitiEngine`. For example, in a Rails controller
+You can access Activiti directly by using `Activiti`. For example, in a Rails controller
 
 ```
-repositoryService = ActivitiEngine.getRepositoryService()
-repositoryService.createDeployment().
+Activiti::Engine
+Activiti::RepositoryService
+Activiti::RuntimeService
+Activiti::TaskService
+Activiti::ManagementService
+Activiti::IdentityService
+Activiti::HistoryService
+Activiti::FormService
+
+Activiti::RepositoryService.createDeployment().
   addClasspathResource("config/your_bpm_xml_file.bpmn20.xml").
   deploy()
 ```

data/lib/generators/jruby_activiti/install_generator.rb

@@ -8,7 +8,7 @@ module JrubyActiviti
       desc "Creates a initializer and copy config files to your application."
 
       def create_jarfile
-        copy_file "Jarfile", "Jarfile"
+        copy_file "../../../../Jarfile", "Jarfile"
       end
 
       def create_config

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

@@ -1 +1 @@
-ActivitiEngine = JrubyActiviti.get_engine
+Activiti = JrubyActiviti::Activiti

data/lib/jruby_activiti/version.rb

@@ -1,3 +1,3 @@
 module JrubyActiviti
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/lib/jruby_activiti.rb

@@ -3,12 +3,24 @@ require "jruby_activiti/version"
 require "jbundler"
 Bundler.require "activiti-engine"
 
-ActivitiConfigPath ||= "config/activiti.cfg.xml"
-
 module JrubyActiviti
+  ConfigPath ||= "config/activiti.cfg.xml"
+
   def self.get_engine
     configuration = Java::OrgActivitiEngine::ProcessEngineConfiguration.
-      createProcessEngineConfigurationFromResource(ActivitiConfigPath)
+      createProcessEngineConfigurationFromResource(ConfigPath)
     configuration.buildProcessEngine
   end
-end
+
+  module Activiti
+    Engine              = JrubyActiviti.get_engine
+    RepositoryService   = Engine.getRepositoryService()
+    RuntimeService      = Engine.getRuntimeService()
+    TaskService         = Engine.getTaskService()
+    ManagementService   = Engine.getManagementService()
+    IdentityService     = Engine.getIdentityService()
+    HistoryService      = Engine.getHistoryService()
+    FormService         = Engine.getFormService()
+
+  end
+end

data/test/base_test.rb

@@ -2,62 +2,56 @@ require 'test_helper'
 
 Bundler.require "h2"
 
-ActivitiEngine = JrubyActiviti.get_engine
+Activiti = JrubyActiviti::Activiti
 
 class BaseTest < Minitest::Test
   def deploy_vacation_request
-    repositoryService = ActivitiEngine.getRepositoryService()
-    repositoryService.createDeployment().
+    Activiti::RepositoryService.createDeployment().
       addClasspathResource("test/VacationRequest.bpmn20.xml").
       deploy()
   end
 
   def test_create_deploy
-    repositoryService = ActivitiEngine.getRepositoryService()
-    before_count = repositoryService.createProcessDefinitionQuery().count()
+    before_count = Activiti::RepositoryService.createProcessDefinitionQuery().count()
     deploy_vacation_request
-    after_count = repositoryService.createProcessDefinitionQuery().count()
+    after_count = Activiti::RepositoryService.createProcessDefinitionQuery().count()
     assert_equal 1, after_count - before_count
   end
 
   def test_create_process_instance
     deploy_vacation_request
 
-    runtime_service = ActivitiEngine.getRuntimeService();
     variables = {
       'employeeName' => "Kermit",
       'numberOfDays' =>  4,
       'vacationMotivation' => "I'm really tired!"
     }
     assert_output(/hello, this is a script task/) do
-      runtime_service.startProcessInstanceByKey("vacationRequest", variables);
+      Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", variables);
     end
 
-    instance_count = runtime_service.createProcessInstanceQuery().count()
+    instance_count = Activiti::RuntimeService.createProcessInstanceQuery().count()
     assert_equal 1, instance_count
   end
 
   def test_task_process
     deploy_vacation_request
     
-    runtime_service = ActivitiEngine.getRuntimeService();
-    runtime_service.startProcessInstanceByKey("vacationRequest", {});
+    Activiti::RuntimeService.startProcessInstanceByKey("vacationRequest", {});
 
-    task_service = ActivitiEngine.getTaskService();
-    tasks = task_service.createTaskQuery().taskCandidateGroup("management").list();
+    tasks = Activiti::TaskService.createTaskQuery().taskCandidateGroup("management").list();
     task = tasks.first
     assert_equal 'Handle vacation request', task.getName
 
-    task_service = ActivitiEngine.getTaskService();
-    tasks = task_service.createTaskQuery().taskCandidateGroup("management").list();
+    tasks = Activiti::TaskService.createTaskQuery().taskCandidateGroup("management").list();
     task = tasks.first
     task_variables = {
       "vacationApproved" => "false",
       "managerMotivation" => "We have a tight deadline!"
     }
-    task_service.complete(task.getId, task_variables);
+    Activiti::TaskService.complete(task.getId, task_variables);
 
-    tasks = task_service.createTaskQuery().taskAssignee("Kermit").list();
+    tasks = Activiti::TaskService.createTaskQuery().taskAssignee("Kermit").list();
     task = tasks.first
     assert_equal 'Adjust vacation request', task.getName
   end

data/test/test_helper.rb

@@ -1,4 +1,7 @@
-ActivitiConfigPath = "test/activiti.cfg.xml"
+module JrubyActiviti
+  ConfigPath = "test/activiti.cfg.xml"
+end
+
 require 'jruby_activiti'
 
 require 'minitest/autorun'

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: jruby_activiti
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - richfisher
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.8'
-  type: :development
+  name: minitest
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: jbundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
+  name: jbundler
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +55,6 @@ files:
 - Rakefile
 - jruby_activiti.gemspec
 - lib/generators/jruby_activiti/install_generator.rb
-- lib/generators/jruby_activiti/templates/Jarfile
 - lib/generators/jruby_activiti/templates/activiti.cfg.xml
 - lib/generators/jruby_activiti/templates/initializer.rb
 - lib/jruby_activiti.rb
@@ -68,7 +67,7 @@ homepage: https://github.com/richfisher/jruby_activiti
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,9 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Access and interact with Activiti BPM in JRuby directly, https://github.com/richfisher/jruby_activiti
 test_files:

data/lib/generators/jruby_activiti/templates/Jarfile

@@ -1,3 +0,0 @@
-jar 'org.activiti:activiti-engine', '~> 5.18'
-jar 'org.slf4j:slf4j-log4j12', '>= 1.7'
-jar 'com.h2database:h2', '>= 1.4'