infopark_reactor 1.9.0.beta2 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96463ad2562d6b77d097a3704b5abcd1f51439d
-  data.tar.gz: 0ab12aa9b56d9f5e181f19acc58d5fbc12f904f0
+  metadata.gz: 432173125e16982290bf5e7eb40370e0f37585d5
+  data.tar.gz: 2d7268785b33578ddee8890d8a2ac92deb3b1b91
 SHA512:
-  metadata.gz: 44c4dae0ba20c0c8f321c23257a20379030a50b73c4a613abfdcc13871783a0d2116fd9d0af87dfba873af6bc799b1d0ade407dc9254d18b65f162bb2aa5d7b0
-  data.tar.gz: bd94b0c7b9fdb84c32b559865549e922c7b0e3423246a1d41faae065e59c11b4f7a69d6daa3eef1f3b07a902eefd616b335dbdc4e158efe0481aeaf59d3be20c
+  metadata.gz: 00ffdd16e4a53f1246861515d148ccf7031e4aa1a2b6cbf2f5e809ed806269357db74c467d031e7c1abcd80bcb00f80a5df5bcfde862035eb1acf2d3a1681bbe
+  data.tar.gz: 7b1bfb1775ed0df349f555d0971beee2e323520c27a5c022ce490a50d7f86b29ea10ed32c97d518c5192504f2b71ea8ab91d88b9dfa8e07323ce8c6d6b6ecb11

data/lib/reactor/attributes/link_list_extender.rb

@@ -20,22 +20,40 @@ module Reactor
             Array.instance_methods(false).each do |meth|
               old = instance_method(meth)
               define_method(meth) do |*args, &block|
-                old_size = size
-                ret = old.bind(self).call(*args, &block)
-                size_changed(old_size, size) if old_size != size
-                ret
-              end if meth.to_sym != :size
+                detect_modification do
+                  old.bind(self).call(*args, &block)
+                end
+              end if meth.to_sym != :map
             end
 
             def changed?
-              @changed == true
+              @changed == true || temporary_links_present?
             end
 
-            protected
-            def size_changed(old_size, size)
+            def change!
               @changed = true
             end
 
+            def original_link_ids
+              @original_link_ids ||= link_ids
+            end
+
+            protected
+            def link_ids
+              self.map(&:id).compact
+            end
+
+            def temporary_links_present?
+              self.any? {|l| l.kind_of? Reactor::Link::TemporaryLink }
+            end
+
+            def detect_modification(&block)
+              original_link_ids
+              yield.tap do
+                @changed = @changed || original_link_ids != link_ids
+              end
+            end
+
             def transform_into_link(link_data)
               if (link_data.respond_to?(:external?) && link_data.respond_to?(:internal?))
                 link_data

data/lib/reactor/attributes/link_list_serializer.rb

@@ -15,6 +15,7 @@ module Reactor
         enumerate(@value).each do |link_data|
           linklist << link_data
         end
+        linklist.change!
         linklist
       end
 

data/lib/reactor/permission.rb

@@ -125,12 +125,12 @@ module Reactor
 
       # Returns true if given user (or current user, if none given) has 'read' permission
       def read?(user = nil)
-        granted?(user, :read)
+        granted?(user, :root) || granted?(user, :read)
       end
 
       # Returns true if given user (or current user, if none given) has 'write' permission
       def write?(user = nil)
-        granted?(user, :write)
+        granted?(user, :root) || granted?(user, :write)
       end
 
       # Returns true if given user (or current user, if none given) has 'root' permission
@@ -140,7 +140,7 @@ module Reactor
 
       # Returns true if given user (or current user, if none given) has 'create_children' permission
       def create_children?(user = nil)
-        granted?(user, :create_children)
+        granted?(user, :root) || granted?(user, :create_children)
       end
 
       # @see #root?
@@ -167,6 +167,7 @@ module Reactor
       # permissions depend on the state of the object)
       def release?(user = nil)
         (has_workflow? && root?(user)) || (!has_workflow? && write?(user))
+        write?(user) || root?(user)
       end
 
       # Setter to overwrite the current groups for the given +permission+ with the

data/lib/reactor/persistence.rb

@@ -177,23 +177,25 @@ module Reactor
       # any other reload methods (neither from RailsConnector nor from ActiveRecord)
       # but tries to mimmic their behaviour.
       def reload(options = nil)
-        #super # Throws RecordNotFound when changing obj_class
-        # AR reload
-        clear_aggregation_cache
-        clear_association_cache
-        fresh_object = Obj.find(self.id, options)
-        @attributes = fresh_object.instance_variable_get('@attributes')
-        @attributes_cache = {}
-        # RC reload
-        @attr_values = nil
-        @attr_defs = nil
-        @attr_dict = nil
-        @obj_class_definition = nil
-        @object_with_meta_data = nil
-        # meta reload
-        @editor = nil
-        @object_with_meta_data = nil
-        self
+        Obj.uncached do
+          #super # Throws RecordNotFound when changing obj_class
+          # AR reload
+          clear_aggregation_cache
+          clear_association_cache
+          fresh_object = Obj.find(self.id, options)
+          @attributes = fresh_object.instance_variable_get('@attributes')
+          @attributes_cache = {}
+          # RC reload
+          @attr_values = nil
+          @attr_defs = nil
+          @attr_dict = nil
+          @obj_class_definition = nil
+          @object_with_meta_data = nil
+          # meta reload
+          @editor = nil
+          @object_with_meta_data = nil
+          self
+        end
       end
 
       # Resolves references in any of the html fields. Returns true on success,
@@ -248,6 +250,7 @@ module Reactor
       end
 
 
+=begin
       # @see [ActiveRecord::Persistence#update_attributes]
       def update_attributes(attributes, options={})
         attributes.each do |attr, value|
@@ -263,6 +266,7 @@ module Reactor
         end
         self.save!
       end
+=end
 
       # Equivalent to Obj#edited?
       def really_edited?
@@ -275,14 +279,6 @@ module Reactor
       end
 
       protected
-      def requires_resolve_refs?(field)
-        force_resolve_refs?|| field == :blob || attribute_type(field.to_s) == :html
-      end
-
-      def force_resolve_refs
-        @force_resolve_refs = true
-      end
-
       def prevent_resolve_refs
         @prevent_resolve_refs = true
       end
@@ -291,10 +287,6 @@ module Reactor
         @prevent_resolve_refs == true
       end
 
-      def force_resolve_refs?
-        @force_resolve_refs == true
-      end
-
       def sanitize_name
         self.name = self.class.send(:sanitize_name, self.name)
       end
@@ -313,28 +305,11 @@ module Reactor
         end
       end
 
-      # Returns all values that will be set for crul interface
       def crul_attributes
         @__crul_attributes || {}
       end
 
-      # Takes cached values and sets the values for crul interface.
-      # Does not store them, only forwards them to underlying class.
-      def forward_crul_attributes
-        crul_attributes.each do |field, (value, options)|
-          options ||= {}
-          crul_obj.set(field, value, options) unless self.send(:attribute_type, field) == :linklist
-        end
-      end
-
-      def prepare_crul_links
-        changed_linklists.each do |link|
-          crul_set(link, self.send(:[], link.to_sym), {})
-        end
-      end
-
       def crul_obj
-        #@crul_obj ||= Reactor::Cm::Obj.get(obj_id)
         @crul_obj ||= Reactor::Cm::Obj.load(obj_id)
       end
 
@@ -343,30 +318,63 @@ module Reactor
       end
 
       def crul_obj_save
-        prepare_crul_links
-        if persisted?
-          take
-          edit
+        attrs, _ = crul_attributes.partition do |field, (value, options)|
+          self.send(:attribute_type, field) != :linklist
         end
+        linklists = changed_linklists
 
-        forward_crul_attributes
+        new_links = {}.tap do |result|
+          linklists.map do |field|
+            result[field] = self.__read_link(field).map do |l|
+              {:link_id => l.id, :title => l.title, :destination_url => (l.internal? ? l.destination_object.path : l.url)} 
+            end
+          end
+        end
 
-        crul_obj.save!
-        self.id = crul_obj.obj_id
+        links_modified = !linklists.empty?
 
-        crul_store_links
+        crul_obj.composite_save(attrs, [], [], [], links_modified) do |attrs, links_to_add, links_to_remove, links_to_set|
 
-        # TODO: REFACTOR!!!
-        possible_fields = ((self.obj_class_def.custom_attributes.keys) + [:blob, :body])
-        crul_obj.resolve_refs! if possible_fields.map {|field| requires_resolve_refs?(field) }.include?(true) && !prevent_resolve_refs?
-        #crul_obj.resolve_refs! if @force_resolve_refs == true || possible_fields.include?(:blob) || possible_fields.detect do |field|
-        #  attr = cms_attributes[field.to_s]
-        #  attr && attr.attribute_type == 'html'
-        #end
+          links_to_add.clear
+          links_to_remove.clear
+          links_to_set.clear
+
+          copy = Obj.find(self.id)
+
+          linklists.each do |linklist|
+            original_link_ids = copy.__read_link(linklist).original_link_ids
+            i = 0
+            common = [original_link_ids.length,
+                      new_links[linklist].length].min
 
-        @__crul_attributes = nil
+            # replace existing links
+            while i < common
+              link = new_links[linklist][i]
+              link[:link_id] = link_id = original_link_ids[i]
 
-        true
+              links_to_set << [link_id, link]
+              i += 1
+            end
+
+            # add appended links
+            while i < new_links[linklist].length
+              link = new_links[linklist][i]
+
+              links_to_add << [linklist, link]
+              i += 1
+            end
+
+            # remove trailing links
+            while i < original_link_ids.length
+              links_to_remove << original_link_ids[i]
+              i += 1
+            end
+          end
+        end
+      end
+
+      def __read_link(name)
+        self[name.to_sym] || RailsConnector::LinkList.new([])
       end
 
       private
@@ -391,32 +399,14 @@ module Reactor
         @crul_obj = Reactor::Cm::Obj.create(name, parent, klass)
       end
 
-      def crul_store_links
-        crul_attributes.each do |field, (value, options)|
-          if self.send(:attribute_type, field) == :linklist then
-            crul_store_links_for_attribute(field, value)
-          end
-        end
-        # self.class.send(:instance_variable_get, '@_o_allowed_attrs').each do |attr|
-        #   if self.send(:attribute_type, attr) == :linklist #&& self.send(attr).try(:changed?) then
-        #     crul_store_links_for_attribute(attr, self.send(attr))
-        #   end
-        # end
-      end
-
-      def crul_store_links_for_attribute(attr, links)
-        # FIXME: l.link_id ??
-        crul_obj.set_links(attr, links.map {|l| {:link_id => l.id, :title => l.title, :destination_url => (l.internal? ? l.destination_object.path : l.url)} })
-      end
-
       def create
         run_callbacks(:create) do
           c_name  = self.name
           c_parent= self.class.path_from_anything(self.parent_obj_id)
           c_objcl = self.obj_class
           crul_obj_create(c_name, c_parent, c_objcl)
-          crul_obj_save if crul_attributes_set? || crul_links_changed?
           self.id = @crul_obj.obj_id
+          crul_obj_save if crul_attributes_set? || crul_links_changed?
           self.reload # ?
           self.id
         end
@@ -544,7 +534,6 @@ module Reactor
       end
 
       protected
-      # TODO: TESTME!!!!
       def attribute_methods_overriden?
         self.name != 'RailsConnector::AbstractObj'
       end

data/lib/reactor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 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
@@ -149,9 +149,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