infopark_reactor 1.14.0.beta2 → 1.15.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d31c45363fc66e4fa2e33a596a28f961273a77f
-  data.tar.gz: 6d6bf3a3de71313b9e2b23f7431e528f2f88f3c0
+  metadata.gz: a56b31ba2e29489af380f651342ddc82f3b542d3
+  data.tar.gz: 9ed150774b911bb3dfb2c311d7a84dff1dc4fd72
 SHA512:
-  metadata.gz: 3fd880bf792f8a5677169c4bb1864fd29411d92756ff1c833eddf1ce43268f921ce6f30c0d35293d70412497a0d6b93fd223cd7ac0e88c124e6880e5008c6936
-  data.tar.gz: 8ada3be23e66e43a73f0f2d3075553b15787cd34112826cf702203c918e585a9d2d88ff84671dff83fe516210e8693eb82097f160aba9a803cdbd07f07691a97
+  metadata.gz: 78174cc1ebf120f5f844e1ebcb26c1f1e4245cb63bd03540bca50a380e455717c11580e4607a62e2406f1392991f1686670e7d39b5930259b598f3290dc3b134
+  data.tar.gz: 4faab19e5c534b811533d7a106057c03ed9fc2cff51fc70013a1743d2460db98e05ca12aa8d04bae89bedea2e4c3c3defc9004eb1afb2a2dd0884eeeba889ca4

data/app/models/rails_connector/blob_mapping.rb

@@ -8,5 +8,9 @@ module RailsConnector
     def self.get_fingerprint(name)
       find_by_blob_name(name).fingerprint
     end
+
+    def self.get_fingerprint_map(blob_names)
+      Hash[self.where(:blob_name => blob_names).select([:blob_name, :fingerprint]).map {|b| [b.blob_name, b.fingerprint] }]
+    end
   end
 end

data/lib/infopark_reactor.rb

@@ -69,6 +69,9 @@ require 'reactor/already_released'
 require 'reactor/no_working_version'
 require 'reactor/not_permitted'
 
+# require eager loader
+require 'rails_connector/meta/eager_loader'
+
 # require components
 require 'reactor/main'
 require 'reactor/rc_independent'

data/lib/rails_connector/meta/eager_loader.rb

@@ -0,0 +1,91 @@
+# -*- encoding : utf-8 -*-
+require 'singleton'
+require 'set'
+
+module RailsConnector
+  module Meta
+    class EagerLoader
+      include Singleton
+      attr_reader :obj_classes
+
+      def initialize
+        # Rails.logger.debug "EagerLoader: I am eager to start working"
+        @obj_classes = {}
+        # Rails 3.1 contains a bug that screws attribute loading
+        # attributes are set to assigned classes
+        if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 1
+          RailsConnector::ObjClass.all.each do |obj_class|
+            obj_class.custom_attributes
+            @obj_classes[obj_class.name] = obj_class
+          end
+        else
+          RailsConnector::ObjClass.includes(:custom_attributes_raw).all.each do |obj_class|
+            @obj_classes[obj_class.name] = obj_class
+          end
+          preload_attribute_blobs
+        end
+      end
+
+      def obj_class(name)
+        name = name.to_s
+        if !@obj_classes.fetch(name, nil).nil?
+          @obj_classes[name]
+        else
+          # TODO: preload_attribute_blobs for obj_class
+          @obj_classes[name] ||= RailsConnector::ObjClass.find_by_obj_class_name(name)
+        end
+      end
+
+      def forget_obj_class(name)
+        @obj_classes.delete(name.to_s)
+      end
+
+      protected
+      def preload_attribute_blobs
+        attribute_names = Set.new
+        @obj_classes.each do |_, obj_class|
+          obj_class.custom_attributes.each do |attribute_name, _|
+            attribute_names << attribute_name
+          end
+        end
+
+        blob_names = attribute_names.map {|attribute_name| "#{attribute_name}.jsonAttributeDict" }
+        # Fiona >= 6.8
+        if RailsConnector::BlobMapping.exists?
+          blob_names               = attribute_names.map {|attribute_name| "#{attribute_name}.jsonAttributeDict" }
+          fingerprint_map          = RailsConnector::BlobMapping.get_fingerprint_map(blob_names)
+          blob_fingerprints        = fingerprint_map.values
+          # NOTE: this is correct! 
+          blobs                    = RailsConnector::Blob.where(:blob_name => blob_fingerprints).to_a
+          blob_map                 = Hash[blobs.map {|b| [b.blob_name, b]}]
+
+          @obj_classes.each do |_, obj_class|
+            obj_class.custom_attributes.each do |_, attribute|
+              blob_name   = "#{attribute.name}.jsonAttributeDict"
+              fingerprint = fingerprint_map[blob_name]
+              blob        = blob_map[fingerprint]
+
+              next unless blob && blob.blob_data?
+              attribute.instance_variable_set(:@blob_data, ::JSON.parse(blob.blob_data))
+            end
+          end
+        # Fiona = 6.7
+        else
+          blob_names               = attribute_names.map {|attribute_name| "#{attribute_name}.jsonAttributeDict" }
+          blobs                    = RailsConnector::Blob.where(:blob_name => blob_names).to_a
+          blob_map                 = Hash[blobs.map {|b| [b.blob_name, b]}]
+
+          @obj_classes.each do |_, obj_class|
+            obj_class.custom_attributes.each do |_, attribute|
+              blob_name   = "#{attribute.name}.jsonAttributeDict"
+              blob        = blob_map[blob_name]
+
+              next unless blob && blob.blob_data?
+              attribute.instance_variable_set(:@blob_data, ::JSON.parse(blob.blob_data))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/reactor/attributes.rb

@@ -41,7 +41,7 @@ module Reactor
     end
 
     def regenerate_attribute_handler(obj_class_name)
-      generate_attribute_handler(RailsConnector::ObjClass.find_by_name(obj_class_name))
+      generate_attribute_handler(RailsConnector::Meta::EagerLoader.instance.obj_class(obj_class_name))
     end
 
     protected
@@ -55,7 +55,7 @@ module Reactor
     end
 
     def generate_attribute_handlers
-      RailsConnector::ObjClass.all.each do |obj_class|
+      RailsConnector::Meta::EagerLoader.instance.obj_classes.each do |_, obj_class|
         # Rails.logger.debug "Reactor::AttributeHandlers: preparing obj class #{obj_class.name}"
         generate_attribute_handler(obj_class) if obj_class.name =~ /^[A-Z]/
       end

data/lib/reactor/cm/obj_class.rb

@@ -58,7 +58,12 @@ module Reactor
         result = [result] unless result.kind_of?(Array)
         result.map do |dictitem|
           key = dictitem.children.detect {|c| c.name == 'key'}.text
-          value = dictitem.children.detect {|c| c.name == 'value'}.text
+          raw_value = dictitem.children.detect {|c| c.name == 'value'}
+          if raw_value.children.detect {|c| c.kind_of?(::REXML::Text) }
+            value = raw_value.text
+          else
+            value = raw_value.children.map {|c| c.text }
+          end
           {key => value}
         end.inject({}, &:merge)
       end
@@ -86,7 +91,15 @@ module Reactor
                       xml.text!(key.to_s)
                     end
                     xml.tag!('value') do
-                      xml.text!(value.to_s)
+                      if value.kind_of?(Array)
+                        value.each do |item|
+                          xml.tag!('listitem') do
+                            xml.text!(item.to_s)
+                          end
+                        end
+                      else
+                        xml.text!(value.to_s)
+                      end
                     end
                   end
                 end

data/lib/reactor/configuration.rb

@@ -3,6 +3,9 @@ module Reactor
   class Configuration
     class << self
       attr_accessor :xml_access
+      attr_accessor :sanitize_obj_name
     end
+
+    self.sanitize_obj_name = true
   end
 end

data/lib/reactor/persistence.rb

@@ -481,12 +481,16 @@ module Reactor
     end
     module ClassMethods
       def sanitize_name(old_name)
-        character_map = {'ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'ß' => 'ss', 'Ä' => 'Ae', 'Ö' => 'Oe', 'Ü' => 'Ue'}
-        new_name = old_name.gsub(/[^-$a-zA-Z0-9]/) {|char| character_map[char] || '_'}.
-                    gsub(/__+/,'_').
-                    gsub(/^_+/,'').
-                    gsub(/_+$/,'')
-        new_name
+        if Reactor::Configuration.sanitize_obj_name
+          character_map = {'ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'ß' => 'ss', 'Ä' => 'Ae', 'Ö' => 'Oe', 'Ü' => 'Ue'}
+          new_name = old_name.gsub(/[^-$a-zA-Z0-9]/) {|char| character_map[char] || '_'}.
+            gsub(/__+/,'_').
+            gsub(/^_+/,'').
+            gsub(/_+$/,'')
+          new_name
+        else
+          old_name
+        end
       end
 
       if Reactor.rails4_x?

data/lib/reactor/session.rb

@@ -10,7 +10,14 @@ class Reactor::Session
   include Observable
 
   def self.instance
-    self.new
+    self.for(Reactor::Configuration.xml_access[:username])
+  end
+
+  def self.for(user_name)
+    self.new.tap do |instance|
+      instance.instance_variable_set(:@user_name, user_name)
+      instance.send(:proper_notify_observers, user_name, false)
+    end
   end
 
   def marshal_dump

data/lib/reactor/sudo.rb

@@ -2,11 +2,12 @@
 module Reactor
   module Sudo
     def self.su(other_user_name, &block)
-      current_user_name = Reactor::Session.instance.user_name
-      Reactor::Session.instance.user_name = other_user_name
+      rsession           = Reactor::Session.instance
+      current_user_name  = rsession.user_name
+      rsession.user_name = other_user_name
       yield
     ensure
-      Reactor::Session.instance.user_name = current_user_name || 'root'
+      rsession.user_name = current_user_name || 'root'
     end
   end
 end

data/lib/reactor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.14.0.beta2
+  version: 1.15.0.beta1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/models/rails_connector/blob_mapping.rb
 - app/models/rails_connector/channel.rb
 - app/models/rails_connector/content.rb
-- app/models/rails_connector/meta/eager_loader.rb
 - app/models/rails_connector/obj_class.rb
 - app/models/rails_connector/obj_class_attr.rb
 - app/models/rails_connector/object_with_meta_data.rb
@@ -115,6 +114,7 @@ files:
 - lib/generators/cm/migration/migration_generator.rb
 - lib/generators/cm/migration/templates/template.rb
 - lib/infopark_reactor.rb
+- lib/rails_connector/meta/eager_loader.rb
 - lib/reactor/already_released.rb
 - lib/reactor/attributes.rb
 - lib/reactor/attributes/date_serializer.rb

data/app/models/rails_connector/meta/eager_loader.rb

@@ -1,41 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'singleton'
-
-module RailsConnector
-  module Meta
-    class EagerLoader
-      include Singleton
-      def initialize
-        # Rails.logger.debug "EagerLoader: I am eager to start working"
-        @obj_classes = {}
-        # Rails 3.1 contains a bug that screws attribute loading
-        # attributes are set to assigned classes
-        if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 1
-          RailsConnector::ObjClass.all.each do |obj_class|
-            obj_class.custom_attributes
-            @obj_classes[obj_class.name] = obj_class
-          end
-        else
-          RailsConnector::ObjClass.includes(:custom_attributes_raw).all.each do |obj_class|
-            @obj_classes[obj_class.name] = obj_class
-          end
-        end
-      end
-
-      def obj_class(name)
-        name = name.to_s
-        if !@obj_classes.fetch(name, nil).nil?
-          # puts "EagerLoader: I've already loaded it: #{name}"
-          @obj_classes[name]
-        else
-          # puts "EagerLoader: NO HAVE: #{name}"
-          @obj_classes[name] ||= RailsConnector::ObjClass.find_by_obj_class_name(name)
-        end
-      end
-
-      def forget_obj_class(name)
-        @obj_classes.delete(name.to_s)
-      end
-    end
-  end
-end