infopark_reactor 1.11.0.beta3 → 1.12.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc04099064780ed9c6480ed010c5911fc7c6ab8
-  data.tar.gz: 04b8654ad0ae1c2d61d65fcb67a8a76309e21a02
+  metadata.gz: f11250eb1074d38b5ebb2a39478405e8ac6bc524
+  data.tar.gz: 78b247bbe2eff3558ebb11a2f61be01bbce2a1ba
 SHA512:
-  metadata.gz: 5a49301c71daa7a5f265623c259d3a6c1dd4127819771e345cb929e084c9b27b3204c1ed3ba25b4d29e8ff4d5f863c8909cb305b435308d06526c531961a6177
-  data.tar.gz: e57cf0ab9b1d21e8b8ea06152c2a94541b4ff43aab5f8f48a7a30fcea3fc5e51be17d7a45328433bb234c6589ab1355a5007c0fc1a0f004e7a06bae5c1d7d70e
+  metadata.gz: 24eb0e3129bd243babbbaf8aea970b79dbc8495d7a0d435af025a83989f76b93aba5363f4bada7073e357d4beff9e60a3eba659a25edc687cfde8f0858db2d4e
+  data.tar.gz: 94aac0a1070407ffdef59e7cede02e819004862cc59a7f69b422442c175bf0e91fd661a7162f7c207566779f0b4fc4aa80d0eab63430bbcba0f1d304f76129f8

data/app/models/rails_connector/obj_class.rb

@@ -25,6 +25,16 @@ module RailsConnector
       @blob_data['titles'] || {}
     end
 
+    def attribute_groups
+      load_blob_data
+      @blob_data['attributeGroups'] || []
+    end
+
+    def valid_sub_obj_classes
+      load_blob_data
+      @blob_data['validSubObjClasses'] || []
+    end
+
     # returns channel feature is_activate?
     def can_create_news_items?
       load_blob_data

data/lib/infopark_reactor.rb

@@ -37,6 +37,7 @@ require 'reactor/cm/user'
 require 'reactor/cm/attribute'
 require 'reactor/cm/obj'
 require 'reactor/cm/obj_class'
+require 'reactor/cm/attribute_group'
 require 'reactor/cm/link'
 require 'reactor/cm/group'
 require 'reactor/cm/editorial_group'

data/lib/reactor/attributes.rb

@@ -125,6 +125,14 @@ module Reactor
         EOC
       end
 
+      # if a handler for this obj class has been defined previously, purge its methods
+      if Reactor::AttributeHandlers.const_defined?("Handler__#{obj_class.name}")
+        mod = Reactor::AttributeHandlers.const_get("Handler__#{obj_class.name}")
+        mod.instance_methods.each do |method|
+          mod.send(:remove_method, method)
+        end
+      end
+
       Reactor.class_eval <<-EOC
         class AttributeHandlers
           module Handler__#{obj_class.name}
@@ -201,6 +209,10 @@ module Reactor
         set(:channels, value)
       end
 
+      def suppress_export=(value)
+        set(:suppress_export, value)
+      end
+
       def channels
         self[:channels] || []
       end
@@ -251,20 +263,25 @@ module Reactor
         crul_obj.set_link(key, target_path.to_s)
       end
 
-
-      protected
-      attr_accessor :uploaded
-
       def reload_attributes(new_obj_class=nil)
-        Reactor::AttributeHandlers.reinstall_attributes(self.class, new_obj_class || self.obj_class)
+        Reactor::AttributeHandlers.reinstall_attributes(self.singleton_class, new_obj_class || self.obj_class)
       end
 
+      protected
+      attr_accessor :uploaded
       def builtin_attr?(attr)
-        [:channels, :valid_from, :valid_until, :name, :obj_class, :content_type, :body, :blob, :permalink, :title].include?(attr)
+        [:channels, :valid_from, :valid_until, :name, :obj_class, :content_type, :body, :blob, :suppress_export, :permalink, :title].include?(attr)
       end
 
       def allowed_attr?(attr)
-        builtin_attr?(attr) || (self.class.send(:instance_variable_get,'@_o_allowed_attrs') || []).include?(key_to_attr(attr))
+        return true if builtin_attr?(attr)
+
+        custom_attrs = 
+          self.singleton_class.send(:instance_variable_get, '@_o_allowed_attrs') ||
+          self.class.send(:instance_variable_get, '@_o_allowed_attrs') ||
+          []
+
+        custom_attrs.include?(key_to_attr(attr))
       end
 
       def resolve_attribute_alias(key)
@@ -277,6 +294,7 @@ module Reactor
           :valid_until      => :validUntil,
           :valid_from       => :validFrom,
           :content_type     => :contentType,
+          :suppress_export  => :suppressExport,
           :obj_class        => :objClass
         }
 
@@ -337,7 +355,7 @@ module Reactor
       def attribute_type(attr)
         return :html if [:body, :blob].include?(attr.to_sym)
         return :date if [:valid_from, :valid_until, :last_changed].include?(attr.to_sym)
-        return :string if [:name, :title, :obj_class, :permalink].include?(attr.to_sym)
+        return :string if [:name, :title, :obj_class, :permalink, :suppress_export].include?(attr.to_sym)
         return :multienum if [:channels].include?(attr.to_sym)
 
         custom_attr = self.obj_class_def.try(:custom_attributes).try(:[],attr.to_s)
@@ -368,6 +386,13 @@ module Reactor
         obj_class_def = RailsConnector::Meta::EagerLoader.instance.obj_class(obj_class) #RailsConnector::ObjClass.where(:obj_class_name => obj_class).first
         obj_class_def ? obj_class_def.mandatory_attribute_names(:only_custom_attributes => true) : []
       end
+
+      def reload_attributes(new_obj_class=nil)
+        new_obj_class ||= self.name
+        raise ArgumentError, "Cannot reload attributes because obj_class is unknown, provide one as a parameter" if new_obj_class.nil?
+
+        Reactor::AttributeHandlers.reinstall_attributes(self, new_obj_class)
+      end
     end
   end
 end

data/lib/reactor/cm/attribute_group.rb

@@ -0,0 +1,113 @@
+require 'reactor/cm/object_base'
+
+module Reactor
+  module Cm
+    class AttributeGroup < ObjectBase 
+      set_base_name 'attributeGroup'
+
+      attribute :obj_class, name: :objClass
+      attribute :name
+      attribute :title
+
+      attribute :attributes, :except => [:set], :type => :list
+      attribute :index
+
+      # virtual attribute!
+      primary_key :identifier
+
+      def identifier
+        primary_key_value
+      end
+
+      def identifier=(val)
+        primary_key_value_set(val)
+      end
+
+      def self.exists?(pk_val)
+        request = XmlRequest.prepare do |xml|
+          xml.where_key_tag!(base_name, primary_key, pk_val)
+          xml.get_key_tag!(base_name, :name)
+        end
+
+        response = request.execute!
+
+        return response.ok?
+
+      rescue XmlRequestError => e
+        return false
+      end
+
+
+      def self.create(obj_class, name, index=nil)
+        pk = [obj_class, name].join('.')
+        attributes = {
+          objClass: obj_class,
+          name: name
+        }
+        attributes[:index] = index if index
+
+        super(pk, attributes)
+      end
+
+      def add_attributes(attributes)
+        add_or_remove_attributes(attributes, 'add')
+      end
+
+      def remove_attributes(attributes)
+        add_or_remove_attributes(attributes, 'remove')
+      end
+
+      def move_attribute(attribute, index)
+        request = XmlRequest.prepare do |xml|
+          xml.where_key_tag!(base_name, primary_key, primary_key_value)
+          xml.tag!("#{base_name}-moveAttribute") do
+            xml.tag!('attribute') do
+              xml.text!(attribute.to_s)
+            end
+            xml.tag!('index') do
+              xml.text!(index.to_s)
+            end
+          end
+
+        end
+
+        response = request.execute!
+
+        response.ok? && reload
+      end
+
+      def set(attr, value)
+        self.send(:"#{attr}=", value)
+      end
+
+      protected
+      def primary_key_value
+        "#{self.obj_class}.#{self.name}"
+      end
+
+      def primary_key_value_set(value)
+        a = value.split('.')
+        self.obj_class = a.first
+        self.name = a.last
+      end
+
+      def add_or_remove_attributes(attributes, add_or_remove)
+        request = XmlRequest.prepare do |xml|
+          xml.where_key_tag!(base_name, primary_key, primary_key_value)
+          xml.tag!("#{base_name}-#{add_or_remove}Attributes") do
+            attributes.each do |attribute|
+              xml.tag!('listitem') do
+                xml.text!(attribute)
+              end
+            end
+          end
+
+        end
+
+        response = request.execute!
+
+        response.ok? && reload
+      end
+    end
+  end
+end

data/lib/reactor/migration.rb

@@ -9,6 +9,9 @@ require 'reactor/plans/rename_obj_class'
 require 'reactor/plans/create_attribute'
 require 'reactor/plans/delete_attribute'
 require 'reactor/plans/update_attribute'
+require 'reactor/plans/create_attribute_group'
+require 'reactor/plans/delete_attribute_group'
+require 'reactor/plans/update_attribute_group'
 require 'reactor/plans/create_group'
 require 'reactor/plans/update_group'
 require 'reactor/plans/delete_group'
@@ -29,6 +32,9 @@ module Reactor
       :create_attribute => Plans::CreateAttribute,
       :delete_attribute => Plans::DeleteAttribute,
       :update_attribute => Plans::UpdateAttribute,
+      :create_attribute_group => Plans::CreateAttributeGroup,
+      :delete_attribute_group => Plans::DeleteAttributeGroup,
+      :update_attribute_group => Plans::UpdateAttributeGroup,
       :create_group => Plans::CreateGroup,
       :delete_group => Plans::DeleteGroup,
       :update_group => Plans::UpdateGroup,

data/lib/reactor/plans/common_attribute_group.rb

@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+module Reactor
+  module Plans
+    class CommonAttributeGroup
+      include Prepared
+
+      ALLOWED_PARAMS = [:title, :index]
+
+      def initialize
+        @params = {}
+      end
+
+      def set(key,value)
+        @params[key.to_sym] = value
+      end
+
+      def add_attributes(attributes)
+        @add_attributes = attributes
+      end
+
+      def remove_attributes(attributes)
+        @remove_attributes = attributes
+      end
+
+      def migrate!
+        raise "#{self.class.name} did not implement migrate!"
+      end
+
+      protected
+      def prepare_params!(attribute=nil)
+        @params.keys.each{|k| error("unknown parameter: #{k}") unless ALLOWED_PARAMS.include? k}
+      end
+
+      def migrate_params!(attribute)
+        attribute.add_attributes(@add_attributes) if @add_attributes
+        attribute.remove_attributes(@remove_attributes) if @remove_attributes
+        @params.each{|k,v|attribute.set(k,v)}
+        attribute.save!
+      end
+    end
+  end
+end

data/lib/reactor/plans/common_obj_class.rb

@@ -22,6 +22,10 @@ module Reactor
         @params[key.to_sym] = value
       end
 
+      def preset(attribute, value)
+        @preset_attrs[attribute] = value
+      end
+
       def take(attr_name, opts={})
         attr_name = attr_name.to_s
         @take_attrs << attr_name

data/lib/reactor/plans/create_attribute_group.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+require 'reactor/plans/common_attribute_group'
+
+module Reactor
+  module Plans
+    class CreateAttributeGroup < CommonAttributeGroup
+      def initialize(*args)
+        super()
+        (obj_class, name, index), options = separate_arguments(*args)
+        @name = name || options[:name]
+        @obj_class = obj_class || options[:obj_class]
+        @index = index || options[:index]
+      end
+
+      def prepare!
+        error("name ist nil") if @name.nil?
+        error("obj_class is nil") if @obj_class.nil?
+        prepare_params!(nil)
+      end
+
+      def migrate!
+        attrib = Reactor::Cm::AttributeGroup.create(@obj_class, @name, @index)
+        migrate_params!(attrib)
+      end
+
+    end
+  end
+end

data/lib/reactor/plans/delete_attribute_group.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+require 'reactor/plans/common_attribute_group'
+
+module Reactor
+  module Plans
+    class DeleteAttributeGroup < CommonAttributeGroup
+      def initialize(*args)
+        super()
+        (obj_class, name), options = separate_arguments(*args)
+        @name = name || options[:name]
+        @obj_class = obj_class || options[:obj_class]
+        @pk = "#{@obj_class}.#{@name}"
+      end
+
+      def prepare!
+        error("name ist nil") if @name.nil?
+        error("obj_class is nil") if @obj_class.nil?
+        error("attribute group #{@pk} does not exist") if not Reactor::Cm::AttributeGroup.exists?(@pk)
+      end
+
+      def migrate!
+        attrib = Reactor::Cm::AttributeGroup.get(@pk)
+        attrib.delete!
+      end
+
+    end
+  end
+end

data/lib/reactor/plans/update_attribute_group.rb

@@ -0,0 +1,29 @@
+# -*- encoding : utf-8 -*-
+require 'reactor/plans/common_attribute_group'
+
+module Reactor
+  module Plans
+    class UpdateAttributeGroup < CommonAttributeGroup
+      def initialize(*args)
+        super()
+        (obj_class, name), options = separate_arguments(*args)
+        @name = name || options[:name]
+        @obj_class = obj_class || options[:obj_class]
+        @pk = "#{@obj_class}.#{@name}"
+      end
+
+      def prepapre!
+        error("name ist nil") if @name.nil?
+        error("obj_class is nil") if @obj_class.nil?
+        error("attribute group #{@pk} does not exist") if not Reactor::Cm::AttributeGroup.exists?(ok)
+        prepare_params!(nil)
+      end
+
+      def migrate!
+        attrib = Reactor::Cm::AttributeGroup.get(@pk)
+        migrate_params!(attrib)
+      end
+
+    end
+  end
+end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.11.0.beta3"
+  VERSION = "1.12.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta3
+  version: 1.12.0.beta1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,7 @@ files:
 - lib/reactor/cache/permission.rb
 - lib/reactor/cache/user.rb
 - lib/reactor/cm/attribute.rb
+- lib/reactor/cm/attribute_group.rb
 - lib/reactor/cm/bridge.rb
 - lib/reactor/cm/channel.rb
 - lib/reactor/cm/editorial_group.rb
@@ -159,15 +160,18 @@ files:
 - lib/reactor/permission.rb
 - lib/reactor/persistence.rb
 - lib/reactor/plans/common_attribute.rb
+- lib/reactor/plans/common_attribute_group.rb
 - lib/reactor/plans/common_channel.rb
 - lib/reactor/plans/common_group.rb
 - lib/reactor/plans/common_obj_class.rb
 - lib/reactor/plans/create_attribute.rb
+- lib/reactor/plans/create_attribute_group.rb
 - lib/reactor/plans/create_channel.rb
 - lib/reactor/plans/create_group.rb
 - lib/reactor/plans/create_obj.rb
 - lib/reactor/plans/create_obj_class.rb
 - lib/reactor/plans/delete_attribute.rb
+- lib/reactor/plans/delete_attribute_group.rb
 - lib/reactor/plans/delete_channel.rb
 - lib/reactor/plans/delete_group.rb
 - lib/reactor/plans/delete_obj.rb
@@ -176,6 +180,7 @@ files:
 - lib/reactor/plans/rename_group.rb
 - lib/reactor/plans/rename_obj_class.rb
 - lib/reactor/plans/update_attribute.rb
+- lib/reactor/plans/update_attribute_group.rb
 - lib/reactor/plans/update_group.rb
 - lib/reactor/plans/update_obj.rb
 - lib/reactor/plans/update_obj_class.rb