infopark_reactor 1.20.2 → 1.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ab88a38947b88c87f42fa56578bca63d39d5cc
-  data.tar.gz: f47aa9aa911c0a619fa5fdff8e015864050a38e8
+  metadata.gz: b0d4cdc9b5a3e3e40cff91833be18dbed74bfbd6
+  data.tar.gz: 9f58e6890f99908e7690e5aa1b668c0bf915e384
 SHA512:
-  metadata.gz: 42273a654a39f33f0ea848cff6d3ddc97186d3d3b59b89c6d11f465376b22f9ca41700a2750f7175283e6e33e734db50bdf25a43920358acf4b998649597f311
-  data.tar.gz: 0b319684ebcf5a4308cb73810df3def0941ae1321313aa14669497938e13a0fb89e27f7f6e490463fd95a8326e6881a8c97b582f0ceb6bb654749485d067c2d2
+  metadata.gz: 8ec0832951ca68a4474fc8f1ee8bbb7b00bf2d70bc9e2fe0a9252982a265c302fc26dc5656e57c7bf647e29fc909f6b8178e36a7eee5d6567cc3d22b520b8815
+  data.tar.gz: 48d62d3954be30727d2e8caca055888a468feeb1850ac8f19dc7c765cbce28d4b72a5935856eaeabf93afdc7059cae06120ebd1102129f7688623000d8ebc1ad

data/lib/reactor/attributes/link_list_from_accessor.rb

@@ -0,0 +1,17 @@
+module Reactor
+  module Attributes
+    class LinkListFromAccessor
+      def initialize(obj, attribute)
+        self.obj       = obj
+        self.attribute = attribute
+      end
+
+      def call
+        self.obj[self.attribute.to_sym] || RailsConnector::LinkList.new([])
+      end
+
+      protected
+      attr_accessor :obj, :attribute
+    end
+  end
+end

data/lib/reactor/attributes/link_list_from_attr_values.rb

@@ -0,0 +1,19 @@
+module Reactor
+  module Attributes
+    class LinkListFromAttrValues
+      def initialize(obj, attribute)
+        self.obj       = obj
+        self.attribute = attribute
+      end
+
+      def call
+        (self.obj.attr_values[self.attribute.to_s] || []).map do |link_data|
+          RailsConnector::Link.new(link_data)
+        end
+      end
+
+      protected
+      attr_accessor :obj, :attribute
+    end
+  end
+end

data/lib/reactor/persistence.rb

@@ -1,4 +1,7 @@
 # -*- encoding : utf-8 -*-
+require 'reactor/attributes/link_list_from_accessor'
+require 'reactor/attributes/link_list_from_attr_values'
+
 module Reactor
   module Persistence
     # Provides API for writing into the Content Manager.
@@ -249,25 +252,6 @@ module Reactor
         raise RuntimeError, "Unsupported Rails version!"
       end
 
-
-=begin
-      # @see [ActiveRecord::Persistence#update_attributes]
-      def update_attributes(attributes, options={})
-        attributes.each do |attr, value|
-          self.send(:"#{attr}=", value)
-        end
-        self.save
-      end
-
-      # @see [ActiveRecord::Persistence#update_attributes!]
-      def update_attributes!(attributes, options={})
-        attributes.each do |attr, value|
-          self.send(:"#{attr}=", value)
-        end
-        self.save!
-      end
-=end
-
       # Equivalent to Obj#edited?
       def really_edited?
         self.edited?
@@ -335,7 +319,7 @@ module Reactor
 
         new_links = {}.tap do |result|
           linklists.map do |field|
-            result[field] = self.__read_link(field).map do |l|
+            result[field] = Reactor::Attributes::LinkListFromAccessor.new(self, field).call.map do |l|
               {:link_id => l.id, :title => l.title, :destination_url => (l.internal? ? l.destination_object.path : l.url), :target => l.target}
             end
           end
@@ -352,7 +336,7 @@ module Reactor
           copy = RailsConnector::AbstractObj.uncached { RailsConnector::AbstractObj.find(self.id) }
 
           linklists.each do |linklist|
-            original_link_ids = copy.__read_link(linklist).original_link_ids
+            original_link_ids = Reactor::Attributes::LinkListFromAttrValues.new(copy, linklist).call.map(&:id)
             i = 0
             common = [original_link_ids.length,
                       new_links[linklist].length].min
@@ -385,10 +369,6 @@ module Reactor
         self.class.connection.clear_query_cache
       end
 
-      def __read_link(name)
-        self[name.to_sym] || RailsConnector::LinkList.new([])
-      end
-
       private
 
       # TODO: test it & make it public

data/lib/reactor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.20.3
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,6 +120,8 @@ files:
 - lib/reactor/attributes/date_serializer.rb
 - lib/reactor/attributes/html_serializer.rb
 - lib/reactor/attributes/link_list_extender.rb
+- lib/reactor/attributes/link_list_from_accessor.rb
+- lib/reactor/attributes/link_list_from_attr_values.rb
 - lib/reactor/attributes/link_list_serializer.rb
 - lib/reactor/cache/permission.rb
 - lib/reactor/cache/user.rb
@@ -230,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Write into CM in familiar, Rails-like way