infopark_fiona7 0.30.0.2 → 0.70.0.1

data/lib/fiona7/version_helper.rb

@@ -5,79 +5,60 @@ require 'digest/sha1'
 
 module Fiona7
   class VersionHelper
+    attr_reader :revision_id, :content_state_id, :base_revision_id, :base_content_state_id
     def initialize(workspace_id)
       @workspace_id = workspace_id.to_sym
-    end
-
-    def revision_id
-      if @workspace_id == :published
-        published_revision_id
-      else
-        rtc_revision_id
-      end
-    end
-
-    def content_state_id
       if @workspace_id == :published
-        published_content_state_id
+        @revision_id =
+          @content_state_id =
+          @base_revision_id =
+          @base_content_state_id = published_revision_id
       else
-        rtc_content_state_id
+        @revision_id = 
+          @content_state_id = rtc_revision_id
+        @base_revision_id =
+          @base_content_state_id = "f" * 40 #published_revision_id
       end
     end
 
-    def base_revision_id
-      published_revision_id
-    end
-
-    def base_content_state_id
-      published_content_state_id
-    end
-
     protected
     def published_revision_id
+      return @published_revision_id if @published_revision_id
       klass        = ReleasedObj
-      last_changed = klass.maximum(:last_changed)
-      obj_count    = klass.count
+      # only one query executed
+      query         = ReleasedObj.select('max(last_changed), count(*)').to_sql
+      last_changed, obj_count = *ReleasedObj.connection.execute(query).first
       revision_id  = Digest::SHA1.hexdigest("published:#{last_changed}:#{obj_count}").sub(/^./, 'f')
-
+      # tag the revision as published
       revision_id[0] = 'f'
-      revision_id
+
+      #begin 
+      #  raise
+      #rescue => e
+      #  Rails.logger.debug(e.backtrace.join("\n"))
+      #end
+
+      @published_revision_id = revision_id
     end
 
     def rtc_revision_id
+      return @rtc_revision_id if @rtc_revision_id
       klass       = EditedObj
-      changed     = klass.connection.execute("SELECT * from #{klass.table_name} WHERE last_changed = '#{klass.maximum(:last_changed)}' ORDER BY obj_id").to_json
-      obj_count   = klass.count
-      revision_id = Digest::SHA1.hexdigest("rtc:#{changed}:#{obj_count}")
-
-      revision_id[0] = 'b'
-      revision_id
-    end
 
-    def published_content_state_id
-      obj_class_names = RailsConnector::ObjClass.select([:obj_class_name, :is_enabled]).map {|o| "#{o.name}:#{o.is_enabled}"}.join("|")
-      attribute_names = RailsConnector::Attribute.select(:attribute_name).map(&:name).join("|")
-      attribute_joins = self.obj_class_attrs
-      Digest::SHA1.hexdigest("#{published_revision_id}:#{obj_class_names}:#{attribute_names}:#{attribute_joins}")
-    end
+      first_query = klass.select("obj_id, count(*), last_changed, attr_values").to_sql
+      # NOTE: the hidden assumption here is that no more than 23 object have been changed in the last second
+      second_query= klass.select("obj_id, is_released, last_changed, attr_values").order("last_changed DESC").limit(23).to_sql
+      union_query = "SELECT * FROM ( #{first_query} ) QUERY1 UNION ALL SELECT * FROM ( #{second_query} ) QUERY2"
+      # only one query executed
+      results     = EditedObj.connection.execute(union_query).to_a
+      obj_count   = results.shift[1]
+      changed     = results
 
-    def rtc_content_state_id
-      obj_class_names = RailsConnector::ObjClass.select([:obj_class_name, :is_enabled]).map {|o| "#{o.name}:#{o.is_enabled}"}.join("|")
-      attribute_names = RailsConnector::Attribute.select(:attribute_name).map(&:name).join("|")
-      attribute_joins = self.obj_class_attrs
-      Digest::SHA1.hexdigest("#{rtc_revision_id}:#{obj_class_names}:#{attribute_names}:#{attribute_joins}")
-    end
+      revision_id = Digest::SHA1.hexdigest("rtc:#{changed}:#{obj_count}")
 
-    def obj_class_attrs
-      if Fiona7.mode == :standalone
-        ''
-      elsif Fiona7.mode == :legacy
-        klass = ReleasedObj
-        table_name = "#{klass.table_name_prefix}obj_class_attrs"
-        klass.connection.execute("SELECT * from #{table_name}").to_a.map {|(id1,id2)| "#{id1}:#{id2}" }.join("|")
-      else
-        raise "Invalid Fiona7.mode = #{Fiona7.mode}"
-      end
+      # tag the revision as edited/rtc
+      revision_id[0] = 'b'
+      @rtc_revision_id = revision_id
     end
 
   end

data/lib/fiona7/widget_resolver.rb

@@ -15,7 +15,7 @@ module Fiona7
 
     def preload
       widget_id_to_object_id_map = Hash[
-        self.value.map {|link| [link.title, link.destination_object_id] }
+        self.value.map {|link| [link["title"], link["destination"]] }
       ]
       object_id_to_widget_instance_map = Hash[
         self.klass.where(obj_id: widget_id_to_object_id_map.values).map {|obj| [obj.id, obj] }

data/lib/tasks/fiona7_tasks.rake

@@ -1,13 +1,5 @@
 namespace :fiona7 do
   desc "Initialize Fiona7"
   task :initialize => :environment do
-    require "fiona7/initializer"
-
-    initializer = Fiona7::Initializer.new
-
-    initializer.sanity_check
-    initializer.classes_and_attributes
-    initializer.set_valid_sub_obj_classes
-    initializer.create_login_page
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.30.0.2
+  version: 0.70.0.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: scrivito
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.70.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.70.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,58 @@ dependencies:
   name: infopark_fiona_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1.beta2
 - !ruby/object:Gem::Dependency
   name: infopark_reactor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.0.beta1
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: scrivito-compatible interface for classic Fiona
 email:
 - tomasz.przedmojski@infopark.de
@@ -106,8 +134,10 @@ files:
 - app/assets/images/fiona7-logo.png
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
+- app/assets/javascripts/fiona7_ui.js
 - app/assets/stylesheets/fiona7-login.css.scss
 - app/assets/stylesheets/fiona7.css.scss
+- app/assets/stylesheets/fiona7_ui.css.scss
 - app/controllers/fiona7/blobs_controller.rb
 - app/controllers/fiona7/default_scrivito_cms_controller.rb
 - app/controllers/fiona7/release_controller.rb
@@ -125,6 +155,7 @@ files:
 - app/models/x_image.rb
 - app/views/fiona7_login_page/index.html.erb
 - app/views/layouts/fiona7_login_page_layout.html.erb
+- app/views/scrivito/ui/index.html.erb
 - config/locales/login.yml
 - config/locales/permissions.yml
 - config/routes.rb
@@ -141,18 +172,19 @@ files:
 - lib/fiona7/controllers/content_service/obj_controller.rb
 - lib/fiona7/controllers/content_service/workspace_controller.rb
 - lib/fiona7/controllers/rest_api/blob_controller.rb
-- lib/fiona7/controllers/rest_api/obj_class_controller.rb
 - lib/fiona7/controllers/rest_api/obj_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
 - lib/fiona7/engine.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
 - lib/fiona7/initializer.rb
-- lib/fiona7/json/obj_class_decorator.rb
 - lib/fiona7/json/obj_decorator.rb
+- lib/fiona7/json/reverse_obj_decorator.rb
 - lib/fiona7/json/typeless_obj_decorator.rb
 - lib/fiona7/json/widget_decorator.rb
 - lib/fiona7/link_converter/fiona_to_scrivito.rb
 - lib/fiona7/link_converter/scrivito_to_fiona.rb
+- lib/fiona7/middleware/server_detection_middleware.rb
+- lib/fiona7/middleware/table_switching_middleware.rb
 - lib/fiona7/mode_switch.rb
 - lib/fiona7/mode_switch/abstract_mode_switch.rb
 - lib/fiona7/mode_switch/cms_routes.rb
@@ -160,7 +192,6 @@ files:
 - lib/fiona7/mode_switch/cms_routes/scrivito_sdk.rb
 - lib/fiona7/mode_switch/cms_routes/scrivito_sdk_slave.rb
 - lib/fiona7/mode_switch/composite.rb
-- lib/fiona7/mode_switch/constants.rb
 - lib/fiona7/mode_switch/views.rb
 - lib/fiona7/naive_search_engine.rb
 - lib/fiona7/recursive_link_resolver.rb
@@ -168,23 +199,31 @@ files:
 - lib/fiona7/routers/rest_api.rb
 - lib/fiona7/routing_monkey_patch.rb
 - lib/fiona7/scrivito_patches/attribute_content.rb
+- lib/fiona7/scrivito_patches/attribute_serializer.rb
 - lib/fiona7/scrivito_patches/basic_obj.rb
 - lib/fiona7/scrivito_patches/basic_widget.rb
 - lib/fiona7/scrivito_patches/binary.rb
 - lib/fiona7/scrivito_patches/client_config.rb
+- lib/fiona7/scrivito_patches/cms_backend.rb
 - lib/fiona7/scrivito_patches/cms_dispatch_controller.rb
+- lib/fiona7/scrivito_patches/cms_field_tag.rb
 - lib/fiona7/scrivito_patches/cms_rest_api.rb
 - lib/fiona7/scrivito_patches/cms_routing.rb
 - lib/fiona7/scrivito_patches/controller_actions.rb
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/migrator.rb
 - lib/fiona7/scrivito_patches/obj_class.rb
+- lib/fiona7/scrivito_patches/objs_controller.rb
 - lib/fiona7/scrivito_patches/type_computer.rb
+- lib/fiona7/scrivito_patches/webservice_controller.rb
 - lib/fiona7/scrivito_patches/workspace.rb
 - lib/fiona7/scrivito_user.rb
 - lib/fiona7/search_engine.rb
+- lib/fiona7/shadow_classes.rb
+- lib/fiona7/table_switcher.rb
+- lib/fiona7/type_loader.rb
 - lib/fiona7/type_register.rb
-- lib/fiona7/type_register_mixin.rb
+- lib/fiona7/type_synchronizer.rb
 - lib/fiona7/version.rb
 - lib/fiona7/version_helper.rb
 - lib/fiona7/widget_resolver.rb

data/lib/fiona7/controllers/rest_api/obj_class_controller.rb

@@ -1,39 +0,0 @@
-require 'fiona7/builder/obj_class_builder'
-require 'fiona7/builder/obj_class_updater'
-require 'fiona7/json/obj_class_decorator'
-require 'fiona7/type_register'
-
-module Fiona7
-  module Controllers
-    module RestAPI
-      class ObjClassController
-        def all
-          # ObjClasses with X_ prefix are hidden, so is Root (temporarily)
-          cms_classes = RailsConnector::ObjClass.all.select {|o| o.name != 'Root' && o.name !~ /\AX_/ }.map {|cms_class| JSON::ObjClassDecorator.new(cms_class) }
-          return ::JSON.parse(::ActiveSupport::JSON.encode({results: cms_classes}))
-        end
-
-        def create(workspace_id, values)
-          raise "Unexpected workspace_id: #{workspace_id}" unless workspace_id.to_s == "rtc"
-          cms_class = JSON::ObjClassDecorator.new(Builder::ObjClassBuilder.new(values[:obj_class].dup).build)
-          return ::JSON.parse(::ActiveSupport::JSON.encode(cms_class))
-        end
-
-        def update(workspace_id, values)
-          raise "Unexpected workspace_id: #{workspace_id}" unless workspace_id.to_s == "rtc"
-          cms_class = JSON::ObjClassDecorator.new(Builder::ObjClassUpdater.new(values[:obj_class].dup).build)
-          # invalidate caches:
-          TypeRegister.instance.invalidate_cached_type(cms_class.name)
-          return ::JSON.parse(::ActiveSupport::JSON.encode(cms_class))
-        end
-
-        def fetch(workspace_id, name)
-          # TODO: assert workspace_id
-          cms_class = JSON::ObjClassDecorator.new(RailsConnector::ObjClass.find_by_obj_class_name(name))
-          return ::JSON.parse(::ActiveSupport::JSON.encode(cms_class))
-        end
-      end
-    end
-  end
-end
-

data/lib/fiona7/json/obj_class_decorator.rb

@@ -1,45 +0,0 @@
-require 'fiona7/type_register_mixin'
-
-module Fiona7
-  module JSON
-    class ObjClassDecorator
-      include TypeRegisterMixin
-
-      attr_reader :cms_class
-
-      def initialize(cms_class)
-        @cms_class = cms_class
-      end
-
-      def name
-        cms_class.name
-      end
-
-      def as_json(*options)
-        result = {
-          id: cms_class.name,
-          name: cms_class.name,
-          title: cms_class.title(:de),
-          #type: cms_class.obj_type,
-          is_active: cms_class.enabled?,
-          attributes: []
-        }
-        type_register.annotated_attributes(cms_class.name).each do |attribute|
-          virtual_name = attribute.virtual_name
-          virtual_type = attribute.virtual_type
-
-          attr_hash = {
-            name: virtual_name.to_s,
-            type: virtual_type.to_s
-          }
-
-          attr_hash[:values] = attribute.values if attribute.values
-
-          result[:attributes] << attr_hash
-        end
-
-        result.as_json(*options)
-      end
-    end
-  end
-end

data/lib/fiona7/mode_switch/constants.rb

@@ -1,86 +0,0 @@
-require 'fiona7/mode_switch/abstract_mode_switch'
-
-module Fiona7
-  module ModeSwitch
-    class Constants < AbstractModeSwitch
-      def standalone
-        self.common_const_manipulation
-        self.set_root_obj_to(::Scrivito::Obj)
-      end
-
-      def legacy
-        self.common_const_manipulation
-        self.set_root_obj_to(::RailsConnector::Obj)
-      end
-
-      protected
-      def set_rails_connector_obj
-        if self.obj_defined_in_app?
-          if self.rails_connector_app_obj?
-            ::RailsConnector.const_set('Obj', ::Object.const_get('Obj'))
-          else
-            ::RailsConnector.const_set('Obj', ::RailsConnector::AbstractObj)
-          end
-        else
-          ::RailsConnector.const_set('Obj', ::RailsConnector::AbstractObj)
-        end
-      end
-
-      def set_scrivito_obj
-        if self.obj_defined_in_app?
-          if self.scrivito_app_obj?
-            ::Scrivito.const_set('Obj', ::Object.const_get('Obj'))
-          elsif Fiona7.mode == :legacy && self.scrivito_legacy_app_obj?
-            # nop
-          else
-            ::Scrivito.const_set('Obj', Class.new(::Scrivito::BasicObj))
-          end
-        else
-          ::Scrivito.const_set('Obj', Class.new(::Scrivito::BasicObj))
-        end
-      end
-
-      def common_const_manipulation
-        self.reset_global_obj
-
-        self.set_rails_connector_obj
-        self.set_scrivito_obj
-      end
-
-      def reset_global_obj
-        return if self.obj_defined_in_app?
-
-        # load global obj
-        ::Object.const_get('Obj')
-        # since both want it, nobody gets it. (at first)
-        ::Object.send(:remove_const, 'Obj')
-      end
-
-      def set_root_obj_to(klass)
-        return if self.obj_defined_in_app?
-
-        ::Object.const_set('Obj', klass)
-      end
-
-      def obj_defined_in_app?
-        # NOTE: this is not bullet-proof but a good-enough heuristic
-        @obj_defined_in_app ||= ::File.exists?(self.app.paths["app/models"].first + "/obj.rb")
-      end
-
-      def rails_connector_app_obj?
-        obj_klass = ::Object.const_get('Obj')
-        obj_klass == ::RailsConnector::BasicObj || obj_klass < ::RailsConnector::BasicObj
-      end
-
-      def scrivito_app_obj?
-        obj_klass = ::Object.const_get('Obj')
-        obj_klass == ::Scrivito::BasicObj || obj_klass < ::Scrivito::BasicObj
-      end
-
-      def scrivito_legacy_app_obj?
-        obj_klass = ::Scrivito::Obj rescue Object
-        obj_klass == ::Scrivito::BasicObj || obj_klass < ::Scrivito::BasicObj
-      end
-    end
-  end
-end