infopark_reactor_migrations 1.9.0.beta2 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3683df998cfb7366c3484a518fb90b6e92d5eba8
-  data.tar.gz: 8901065a07371fca7d400b9bbb3f89679b0eb26a
+  metadata.gz: a79422bdeff7f67cd50cfa57de204d9c0a88ce52
+  data.tar.gz: 920130097cd74911b52b2d52d48b6b080c3a73d8
 SHA512:
-  metadata.gz: 2a65898a08d1afa3db0610e2604ff659b014e2a77806900992bf4c05144d1caab01712509c9be68aa1ae476e08a406edf1216625b40ae92e16ad84302ddab151
-  data.tar.gz: c87be39c05b3998995ad47abaf535a1ab03af5db69cd71db680717df4671485a371c98eb3e3998ea08c66c2db895d82c339bf0ff214aee15328204a755931d49
+  metadata.gz: 7ce8837352a635b9621460169c71d1be0c3c1d1f536d383f89cfdb4b7f669b78e2f5c5f22281b272fe4601fb6e5b5b68ed9422a99b59d4bc6106344a0fcf4d8c
+  data.tar.gz: c8b0dc9d2627c00afe41ce0f289e730789a5f318113dc0d6e362b096efb284ffec7d212ab6db7b99bb608e5b32b13d1f979424d3405fea4f49e256282ba146d5

data/lib/reactor/cm/log_entry.rb

@@ -17,7 +17,9 @@ module Reactor
           response = request.execute!
           
           result = []
-          response.xpath('//logEntry').each do |log_entry_node|
+          log_entries = response.xpath('//logEntry')
+          log_entries = [log_entries] unless log_entries.kind_of?(Array)
+          log_entries.each do |log_entry_node|
             dict = {}
             log_entry_node.each_element do |value_node|
               if value_node.name == 'logTime'

data/lib/reactor/cm/multi_xml_request.rb

@@ -0,0 +1,102 @@
+# -*- encoding : utf-8 -*-
+require 'net/http'
+require 'reactor/cm/xml_response'
+require 'reactor/cm/xml_multi_request_error'
+require 'reactor/cm/xml_markup'
+require 'nokogiri'
+
+module Reactor
+  module Cm
+
+    class MultiXmlRequest
+
+      def self.token(login, instance_secret)
+        Digest::MD5.hexdigest(login + instance_secret)
+      end
+
+      def self.execute
+        access = Configuration::xml_access
+        sanity_check(access)
+        xml = XmlMarkup.new
+        xml2 = nil
+        ret = nil
+        xml.instruct!
+        req = nil
+        ret = xml.tag!('cm-payload', 'payload-id' =>'abcabc', 'timestamp' => Time.now.getutc.strftime('%Y%m%d%H%M%S'), 'version' => '6.7.3') do
+          xml.tag!('cm-header') do
+            xml.tag!('cm-sender', 'sender-id' => access[:id], 'name' => "ruby-simple-client")
+            xml.tag!('cm-authentication', 'login' => access[:username], 'token' => token(access[:username],access[:secret]))
+          end
+          req = self.new(xml).tap do |instance|
+            yield instance
+          end
+        end
+        req.execute!(ret)
+      end
+
+      def mandatory(&block)
+        req_id = self.class.generate_id
+        @mandatory << req_id
+        @builder.tag!('cm-request', 'request-id' => req_id, 'preclusive' => 'true') do |xml2|
+          yield xml2
+        end
+      end
+
+      def optional(&block)
+        req_id = self.class.generate_id
+        @optional << req_id
+        @builder.tag!('cm-request', 'request-id' => req_id, 'preclusive' => 'false') do |xml2|
+          yield xml2
+        end
+      end
+
+      def execute!(xml)
+        access = Configuration::xml_access
+        payload = xml
+
+        res = Net::HTTP.new(access[:host], access[:port]).start do |http|
+          req = Net::HTTP::Post.new('/xml')
+          req.body = payload
+          http.request(req)
+        end
+
+        result = MultiXmlResponse.new(res.body, @mandatory, @optional)
+      end
+
+      class << self
+
+        def generate_id
+          rand(10000)
+        end
+
+        protected
+
+        def sanity_check(access)
+          raise Reactor::Cm::MissingCredentials if access[:username].nil? || access[:username].empty?
+        end
+      end
+
+      protected
+
+      def initialize(builder)
+        @builder = builder
+        @mandatory = []
+        @optional = []
+      end
+
+      class MultiXmlResponse
+        def initialize(xml, mandatory, optional)
+          @xml, @mandatory, @optional = xml, mandatory, optional
+          @n = Nokogiri::XML.parse(@xml)
+        end
+
+        def assert_success
+          first_failed = nil
+          @mandatory.any? do |mandatory_id|
+            @n.xpath("//cm-response[@request-id='#{mandatory_id}']//cm-code[@numeric='200']").empty? && (first_failed = mandatory_id)
+          end && raise(XmlMultiRequestError, @n.xpath("//cm-response[@request-id='#{first_failed}']//cm-code//error/phrase/text()").map(&:to_s).join("\n"))
+        end
+      end
+    end
+  end
+end

data/lib/reactor/cm/obj.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'reactor/cm/multi_xml_request'
+
 module Reactor
   module Cm
     class Obj
@@ -140,49 +142,55 @@ module Reactor
         end
       end
 
-      def save!
-        edit! if not edited?
-        content = edited_content
-        @request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!('content', 'id', content)
-          xml.tag!("content-set") do
-            @attrs.each do |key, value|
-              if (@attr_options[key] || {})[:cdata]
-                xml.tag!(key.to_s) do
-                  xml.cdata!(value)
-                end
-              else
-                xml.value_tag!(key.to_s, value)
-              end
-            end
-          end
-        end
-        response = @request.execute!
-        return response if !response.ok?
-
-        unless @obj_attrs.empty?
-          request = XmlRequest.prepare do |xml|
-            xml.where_key_tag!(base_name, 'id', @obj_id)
-            xml.set_tag!(base_name) do
-              @obj_attrs.each do |key, value|
-                xml.value_tag!(key, value)
-              end
-            end
-          end
-          response = request.execute!
-        end
+      def set_mutiple(attrs)
+        attrs.each {|a,(v,o)| set(a,v,o||{}) }
+      end
+
+      def composite_save(attrs, links_to_add, links_to_remove, links_to_set, links_modified=false)
+        set_mutiple(attrs)
+
+        skip_version_creation = @attrs.empty? && links_to_remove.empty? && links_to_set.empty? && !links_modified
 
-        return response if !response.ok?
+        resp = MultiXmlRequest.execute do |reqs|
+          reqs.optional  {|xml| SimpleCommandRequest.build(xml, @obj_id, 'take') } unless skip_version_creation
+          reqs.optional  {|xml| SimpleCommandRequest.build(xml, @obj_id, 'edit') } unless skip_version_creation
 
-        @removed_links.each do |link|
-          link.delete!
+
+          reqs.mandatory {|xml| ObjSetRequest.build(xml, @obj_id, @obj_attrs) } unless @obj_attrs.empty? #important! requires different permissions
+          reqs.mandatory {|xml| ContentSetRequest.build(xml, @obj_id, @attrs, @attr_options) } unless skip_version_creation
         end
 
-        @links.each do |attr, links|
-          links.each do |link|
-            link.save!
+        resp.assert_success
+
+        yield(attrs, links_to_add, links_to_remove, links_to_set) if block_given?
+
+        resp = MultiXmlRequest.execute do |reqs|
+          links_to_remove.each do |link_id|
+            reqs.mandatory {|xml| LinkDeleteRequest.build(xml, link_id) }
+          end
+          links_to_add.each do |(attr, link)|
+
+            reqs.mandatory {|xml| LinkAddRequest.build(xml, @obj_id, attr, link) }
+          end
+
+          links_to_set.each do |(link_id, link)|
+            reqs.mandatory {|xml| LinkSetRequest.build(xml, link_id, link) }
           end
+
+          reqs.optional  {|xml| ResolveRefsRequest.build(xml, @obj_id) }
+        end unless skip_version_creation
+
+        resp.assert_success
+      end
+
+      def save!
+        links_to_remove = @removed_links.map {|l| l.link_id}
+        links_to_add = @links.map do |attr, links|
+          links.map do |link|
+            [attr, {:destination_url => link.dest_url, :title => link.title, :target => link.target, :position => link.position}]
+          end.flatten
         end
+        composite_save([], links_to_add, links_to_remove, [])
       end
 
 
@@ -426,6 +434,107 @@ module Reactor
 
         request.execute!
       end
+
+      class Request
+        attr_reader :xml
+
+        def initialize(xml)
+          @xml = xml
+        end
+
+        def self.build(xml, *args)
+          self.new(xml).build(*args)
+        end
+      end
+
+      class SimpleCommandRequest < Request
+        def build(obj_id, cmd_name, comment = nil)
+          xml.where_key_tag!('obj', 'id', obj_id)
+          if comment
+            xml.tag!("obj-#{cmd_name}") do
+              xml.tag!('comment', comment)
+            end
+          else
+            xml.tag!("obj-#{cmd_name}")
+          end
+        end
+      end
+
+      class ObjSetRequest < Request
+        def build(obj_id, obj_attrs)
+          xml.where_key_tag!('obj', 'id', obj_id)
+          xml.set_tag!('obj') do
+            obj_attrs.each do |key, value|
+              xml.value_tag!(key, value)
+            end
+          end
+        end
+      end
+
+      class ContentSetRequest < Request
+        def build(id, attrs, attr_options)
+          xml.tag!('content-where') do
+            xml.tag!('objectId', id.to_s)
+            xml.tag!('state', 'edited')
+          end
+          xml.tag!("content-set") do
+            attrs.each do |key, value|
+              if (attr_options[key] || {})[:cdata]
+                xml.tag!(key.to_s) do
+                  xml.cdata!(value)
+                end
+              else
+                xml.value_tag!(key.to_s, value)
+              end
+            end
+          end
+        end
+      end
+
+      class LinkDeleteRequest < Request
+        def build(link_id)
+          xml.where_key_tag!('link', 'id', link_id)
+          xml.tag!("link-delete")
+        end
+      end
+
+      class LinkAddRequest < Request
+        def build(obj_id, attr, link_data)
+          title = link_data[:title]
+          xml.tag!('content-where') do
+            xml.tag!('objectId', obj_id.to_s)
+            xml.tag!('state', 'edited')
+          end
+          xml.tag!('content-addLinkTo') do
+            xml.tag!('attribute', attr.to_s)
+            xml.tag!('destinationUrl', link_data[:destination_url].to_s)
+            xml.tag!('title', title.to_s) if title
+          end
+        end
+      end
+
+      class LinkSetRequest < Request
+        def build(link_id, link_data)
+          title = link_data[:title]
+          xml.tag!('link-where') do
+            xml.tag!('id', link_id)
+          end
+          xml.tag!('link-set') do
+            xml.tag!('destinationUrl', link_data[:destination_url].to_s)
+            xml.tag!('title', title.to_s) if title
+          end
+        end
+      end
+
+      class ResolveRefsRequest < Request
+        def build(obj_id)
+          xml.tag!('content-where') do
+            xml.tag!('objectId', obj_id.to_s)
+            xml.tag!('state', 'edited')
+          end
+          xml.tag!('content-resolveRefs')
+        end
+      end
     end
   end
 end

data/lib/reactor/cm/xml_multi_request_error.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+require 'reactor/cm/xml_request_error'
+
+module Reactor
+  module Cm
+    class XmlMultiRequestError < XmlRequestError
+
+    end
+  end
+end

data/lib/reactor/cm/xml_request.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'net/http'
 require 'reactor/cm/xml_response'
-require 'reactor/cm/xml_request_error'
+require 'reactor/cm/xml_single_request_error'
 require 'reactor/cm/xml_markup'
 require 'reactor/tools/smart_xml_logger'
 
@@ -56,7 +56,7 @@ module Reactor
         Reactor::Cm::LOGGER.log('RESPONSE:')
         Reactor::Cm::LOGGER.log_xml(:response, res.body)
         response = XmlResponse.new(res.body)
-        raise XmlRequestError, response unless response.ok?
+        raise XmlSingleRequestError, response unless response.ok?
         response
       end
 

data/lib/reactor/cm/xml_request_error.rb

@@ -2,14 +2,8 @@
 module Reactor
   module Cm
     class XmlRequestError < StandardError
-      def initialize(response)
-        @response = response
-        @xml = response.xml
-        super(phrase)
-      end
-
       def phrase
-        @response.xpath('//phrase').to_s
+        self.message
       end
 
     end

data/lib/reactor/cm/xml_single_request_error.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+require 'reactor/cm/xml_request_error'
+
+module Reactor
+  module Cm
+    class XmlSingleRequestError < XmlRequestError
+      def initialize(response)
+        @response = response
+        super(phrase)
+      end
+
+      def phrase
+        result = @response.xpath('//phrase')
+        result = [result] unless result.kind_of?(Array)
+
+        result.map(&:to_s).join("\n")
+      end
+
+    end
+  end
+end

data/lib/reactor/migrations/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Reactor
   module Migrations
-    VERSION = "1.9.0.beta2"
+    VERSION = "1.9.1"
   end
 end

data/lib/reactor/tools/sower.rb

@@ -33,7 +33,7 @@ module RailsConnector
         obj.save!
       rescue ActiveRecord::RecordNotFound
       end
-      obj.release unless obj.keep_edited || !Obj.last.edited?
+      obj.release unless obj.keep_edited
       obj
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor_migrations
 version: !ruby/object:Gem::Version
-  version: 1.9.0.beta2
+  version: 1.9.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,6 +100,7 @@ files:
 - lib/reactor/cm/live_group.rb
 - lib/reactor/cm/log_entry.rb
 - lib/reactor/cm/missing_credentials.rb
+- lib/reactor/cm/multi_xml_request.rb
 - lib/reactor/cm/obj.rb
 - lib/reactor/cm/obj_class.rb
 - lib/reactor/cm/object_base.rb
@@ -107,9 +108,11 @@ files:
 - lib/reactor/cm/workflow.rb
 - lib/reactor/cm/xml_attribute.rb
 - lib/reactor/cm/xml_markup.rb
+- lib/reactor/cm/xml_multi_request_error.rb
 - lib/reactor/cm/xml_request.rb
 - lib/reactor/cm/xml_request_error.rb
 - lib/reactor/cm/xml_response.rb
+- lib/reactor/cm/xml_single_request_error.rb
 - lib/reactor/configuration.rb
 - lib/reactor/migration.rb
 - lib/reactor/migrations/railtie.rb
@@ -161,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14