infopark_reactor 1.22.5 → 1.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a9e143ee816eacbc2f0432347dda891a0f6484f
-  data.tar.gz: 87aab58e69637be98ca5ff72dcb3a5646276072a
+  metadata.gz: 411243dbe16d77f7eb90a4db5971c1311a4d5572
+  data.tar.gz: 9a78a8c682728552b701b6c9fec5f1de1d23adf1
 SHA512:
-  metadata.gz: 75f268a458653f8d8233f76654fe8200df705b3c4f769b1f6085675439b02add96ad945a5d2f3b063b1f61967e0efbd6b533f1e2f83d2734d63c7c8d1c6feeaf
-  data.tar.gz: ec9925bdc617d7bd897a8bbec323d462c8dc15517cf69f90597eed0163be4e15e0dba462e6a1902fa8cb7f7062c0e0bae1da82862fe3f1927cf3bfa35405eb78
+  metadata.gz: a0b887b0cc7e81fddada0d55e0d745401fe757f41fef3dc3d4f0f59a6a33d0016f2bd18fdced5cf26c9fc952497f300e93816c922d1f37180ee658737d94cfa9
+  data.tar.gz: e370727be51373b5f8a834805c99ca5d9b0f227cfb8e1dfe2bdfe9264c6c72759f554b95b23edd189509e09c192a2f0b5fd475143b85044b766fa3e9a623a7f6

data/infopark_reactor.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '>= 3.0.10', '< 4.3.0'
   #s.add_dependency 'infopark_rails_connector'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'term-ansicolor'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'

data/lib/reactor/permission.rb

@@ -166,8 +166,13 @@ module Reactor
       # Returns true if given user has permissions required to release an object (the exact
       # permissions depend on the state of the object)
       def release?(user = nil)
-        (has_workflow? && root?(user)) || (!has_workflow? && write?(user))
-        write?(user) || root?(user)
+        if !has_workflow?
+          # NOTE: order matters for speed
+          write?(user) || root?(user)
+        else
+          # this is slow
+          root?(user) || (has_workflow_api? && obj.workflow.release?)
+        end
       end
 
       # Setter to overwrite the current groups for the given +permission+ with the
@@ -243,11 +248,18 @@ module Reactor
         self.class.permissions[permission]
       end
 
+      # NOTE: this method may lie, when:
+      # - object received workflow and the cached state says otherwise
+      # - the workflow api is deactivated
       def has_workflow?
         cache.lookup(:any, "#{obj.path}:workflow") do
-          RailsConnector::ObjectWithMetaData.find_by_object_id(obj.id).try(:workflow_name).present?
+          obj.workflow_name.present?
         end
       end
+
+      def has_workflow_api?
+        obj.class < Reactor::Workflow::Base
+      end
     end
 
     class PermissionLookup

data/lib/reactor/tools/smart_xml_logger.rb

@@ -1,11 +1,8 @@
 # -*- encoding : utf-8 -*-
 require 'nokogiri'
-require 'term/ansicolor'
 
 class SmartXmlLogger
 
-  include Term::ANSIColor
-
   def initialize(forward_to, method = nil)
     @logger = forward_to
     @method = method
@@ -47,13 +44,13 @@ class SmartXmlLogger
 
     out = ' ' * indent
 
-    attrs = node.attributes.values.map{|attr| %|#{attr.name}="#{red(attr.value)}"|}.join(' ')
+    attrs = node.attributes.values.map{|attr| %|#{attr.name}="#{(attr.value)}"|}.join(' ')
     attrs = " #{attrs}" if attrs.present?
 
-    out << "<#{green(node.name)}#{attrs}#{'/' if empty}>"
+    out << "<#{(node.name)}#{attrs}#{'/' if empty}>"
 
     if has_text
-      out << "#{red(node.text)}"
+      out << "#{(node.text)}"
     else
       out << "\n"
     end
@@ -63,7 +60,7 @@ class SmartXmlLogger
     end
 
     out << ' ' * indent unless has_text || empty
-    out << "</#{green(node.name)}>\n" unless empty
+    out << "</#{(node.name)}>\n" unless empty
     out
   end
 

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.22.5"
+  VERSION = "1.22.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.22.5
+  version: 1.22.6
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,20 +44,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  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