infopark_reactor 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb189ac8a5cd0bb234270e74c7a2b311c84fc2bb
-  data.tar.gz: 983ff98495d04e26f6bf7e48b642cc05be2ce17b
+  metadata.gz: 4565152e9620ee1549db9c630f29fc09963aca7c
+  data.tar.gz: 2f73a2ba9c91bf01bb6e976c5dc3f7c95ae69131
 SHA512:
-  metadata.gz: 4db219d0c89f10a994f0a24c0f428130c456cf9076dc560e3ee9b3a06020ebe1b1244619f14696871fdf1e5708164cdb6c8865060c177dca355551ef2925bda9
-  data.tar.gz: 5044a959288429fe7c95b9be2080b0c2fe003164af3574c7b745e07b1b455a7a84256123014f9ae1799dc8daeaa3a4e5a1f108713d9e9fd1c5e6aa4e49e750aa
+  metadata.gz: ea47b54ec12a7c0d158194e00af28291028d63a9873fb88b66cf881891ed1f55ea3ab26709aa7741f45eeaf79bf6aa16b255170a0b5e9ad39fc04e80639aff04
+  data.tar.gz: 666ca185f3ff1ecbbc9fc489c37c88e2cfa7be23c48e2fa4da3aa9de8408635f7641dad6fb308bc6d2c2e521a328cadf93766abc55310afb06d3237c05abed37

data/lib/reactor/attributes.rb

@@ -197,6 +197,14 @@ module Reactor
         set(:body, value)
       end
 
+      def blob
+        if attr_dict.respond_to?(:blob)
+          attr_dict.send :blob
+        else
+          nil
+        end
+      end
+
       def blob=(value)
         set(:blob, value)
       end
@@ -230,9 +238,14 @@ module Reactor
         not_formated_value = value
         formated_value = serialize_value(key, value)
         crul_set(attr, formated_value, options)
+
+        __send__(:attribute_will_change!, key)
+
         active_record_set(key, formated_value) if active_record_attr?(key)
         rails_connector_set(key, formated_value)
-        send(key)
+
+        # return new value
+        __send__(key)
       end
 
 
@@ -346,6 +359,7 @@ module Reactor
         if Reactor.rails4_2?
           @attributes.write_from_user(field.to_s, value)
         else
+          @attributes_cache.delete(field.to_s)
           @attributes[field.to_s] = value
         end
       end

data/lib/reactor/attributes/html_serializer.rb

@@ -14,7 +14,7 @@ module Reactor
 
       private
       def serialize_html
-        link_expressions = [/(href|src)\s*=\s*"([^"]*)"/, /(href|src)\s*=\s*'([^']*)'/]
+        link_expressions = [/(href|src|usemap)\s*=\s*"([^"]*)"/, /(href|src|usemap)\s*=\s*'([^']*)'/]
         link_expressions.each do |expr|
           @value.gsub!(expr) do |string|
             link = Reactor::Support::LinkMatcher.new($2)

data/lib/reactor/attributes/link_list_extender.rb

@@ -16,6 +16,10 @@ module Reactor
               super(transform_into_link(link_data))
             end
 
+            def []=(idx, value)
+              super(idx, transform_into_link(value))
+            end
+
             # install #size_changed callback
             Array.instance_methods(false).each do |meth|
               old = instance_method(meth)

data/lib/reactor/cm/obj.rb

@@ -142,15 +142,42 @@ module Reactor
         end
       end
 
-      def set_mutiple(attrs)
+      def set_multiple(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)
+        set_multiple(attrs)
 
         skip_version_creation = @attrs.empty? && links_to_remove.empty? && links_to_set.empty? && !links_modified
 
+        # The save procedure consists of following steps:
+        # First request (assign attributes):
+        #  a. Execute take to assign the edited content to the current user
+        #  b. Execute edit to create an edited content if there is none present
+        #  c. Set object attributes (name, permalink, etc.)
+        #  d. Set content attributes (title, body etc. + custom attributes)
+        #  e. Resolve all links in *html* attributes
+        # Second request (overwrite linklists):
+        #  f. Remove superflous links
+        #  g. Overwrite existing links
+        #  h. Add missing links
+        #
+        # Second request is optional and only happens if linklists
+        # have been changed.
+        #
+        # Steps a,b,d,e,f,g,h are optional and are skipped if only
+        # object attributes have been supplied.
+        #
+        # It can happen that the second request is received by
+        # a different CM slave than the first request. If additionaly
+        # the slave has invalid cache (for example when the cache
+        # invalidate command has not yet been fully propagated among
+        # slaves), then race condition can occur.
+        # It is therefore extremely important for the second request
+        # to be resistant against invalid cache, otherwise then
+        # save operation aborts.
+
         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
@@ -158,6 +185,7 @@ module Reactor
 
           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
+          reqs.mandatory  {|xml| ResolveRefsRequest.build(xml, @obj_id) } unless skip_version_creation
         end
 
         resp.assert_success
@@ -165,20 +193,21 @@ module Reactor
         yield(attrs, links_to_add, links_to_remove, links_to_set) if block_given?
 
         resp = MultiXmlRequest.execute do |reqs|
+          reqs.optional  {|xml| SimpleCommandRequest.build(xml, @obj_id, 'take') }
+          reqs.optional  {|xml| SimpleCommandRequest.build(xml, @obj_id, 'edit') }
+
           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
+          links_to_add.each do |(attr, link)|
+            reqs.mandatory {|xml| LinkAddRequest.build(xml, @obj_id, attr, link) }
+          end
+        end unless skip_version_creation || (links_to_remove.empty? && links_to_add.empty? && links_to_set.empty?)
 
         resp.assert_success
       end

data/lib/reactor/persistence.rb

@@ -288,7 +288,12 @@ module Reactor
       end
 
       def sanitize_name
-        self.name = self.class.send(:sanitize_name, self.name)
+        return unless self.name.present?
+
+        sanitized_name = self.class.send(:sanitize_name, self.name)
+        if sanitized_name != self.name
+          self.name = sanitized_name
+        end
       end
 
       def crul_attributes_set?

data/lib/reactor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails