infopark_cloud_connector 7.0.2 → 7.1.0

data/lib/rails_connector/workspace_data_from_service.rb

@@ -1,45 +1,42 @@
 module RailsConnector
 
 class WorkspaceDataFromService
-  # Fetches a workspace data previously store in cache storage.
-  # Returns nil if not found.
-  def self.find_from_cache(id)
-    if data = CmsCacheStorage.read_workspace_data(id)
-      new(data)
+  class << self
+    # Fetches a workspace data previously store in cache storage.
+    # Returns nil if not found.
+    def find_from_cache(id)
+      if data = CmsCacheStorage.read_workspace_data(id)
+        new(data)
+      end
     end
-  end
 
-  def initialize(data)
-    @data = data
-  end
+    private
 
-  def revision_id
-    @data["revision_id"]
-  end
-
-  def id
-    @data["id"]
-  end
-
-  def title
-    @data["title"]
+    def data_attr_reader(attr_name)
+      define_method(attr_name) { @data[attr_name.to_s] }
+    end
   end
 
-  # remove this method after DynamoCmsBackend has been removed from the Cloud Connector
-  def content_cache_id=(id)
-    # ignore, since not using content caches
-  end
+  data_attr_reader :id
+  data_attr_reader :title
+  data_attr_reader :revision_id
+  data_attr_reader :content_state_id
+  data_attr_reader :base_revision_id
+  data_attr_reader :base_content_state_id
+  data_attr_reader :diff
 
-  def content_state_id
-    @data['content_state_id']
+  def initialize(data)
+    @data = data
   end
 
   def content_state
     @content_state ||= ContentState.find_or_create(content_state_id) if content_state_id
   end
 
-  def diff
-    @data['diff']
+  def base_content_state
+    if base_content_state_id
+      @base_content_state ||= ContentState.find_or_create(base_content_state_id)
+    end
   end
 
   def changes
@@ -65,10 +62,12 @@ class WorkspaceDataFromService
 
   def to_hash
     {
-      'id' => id,
-      'revision_id' => revision_id,
-      'title' => title,
-      'content_state_id' => content_state_id,
+      'id'                    => id,
+      'revision_id'           => revision_id,
+      'title'                 => title,
+      'content_state_id'      => content_state_id,
+      'base_revision_id'      => base_revision_id,
+      'base_content_state_id' => base_content_state_id,
     }
   end
 

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -1,16 +1,74 @@
 module RailsConnector
 
 class WorkspaceSelectionMiddleware
-  CURRENT_WORKSPACE_SESSION_KEY = '_rc-ws'
-  CURRENT_WORKSPACE_PARAMS_KEY = '_rc-ws'
 
   def initialize(app)
     @app = app
   end
 
   def call(env)
-    handle_workspace_parameter(env)
-    workspace_id = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
+    handler = WorkspaceParameterHandler.new(env)
+    handler.handle_params
+    set_current_workspace(handler.workspace_id)
+
+    @app.call(env)
+  end
+
+  private
+
+  class WorkspaceParameterHandler < Struct.new(:env)
+    WS_KEYS = {
+      current: '_rc-ws',
+      compare: '_rc-compare-ws',
+      base: '_rc-compare-base',
+      reverse: '_rc-compare-reverse'
+    }.freeze
+
+    def handle_params
+      if params_workspace_id.present?
+        remember_compare_workspace_params
+      elsif params_workspace_id == '' # empty param means "forget it"
+        forget_compare_workspace_params
+      end
+    end
+
+    def workspace_id
+      session[WS_KEYS[:current]]
+    end
+
+    private
+
+    def params_workspace_id
+      params[WS_KEYS[:current]]
+    end
+
+    def remember_compare_workspace_params
+      WS_KEYS.each do |_, value|
+        session[value] = params[value]
+      end
+    end
+
+    def forget_compare_workspace_params
+      WS_KEYS.each do |_, value|
+        session.delete(value)
+      end
+    end
+
+    def params
+      request.params
+    end
+
+    def request
+      Rack::Request.new(env)
+    end
+
+    def session
+      @session ||= env[Rack::Session::Abstract::ENV_SESSION_KEY]
+    end
+
+  end
+
+  def set_current_workspace(workspace_id)
     Workspace.current = proc do
       if workspace_id
         begin
@@ -22,24 +80,8 @@ class WorkspaceSelectionMiddleware
         Workspace.default
       end
     end
-    @app.call(env)
   end
 
-  private
-
-  def handle_workspace_parameter(env)
-    workspace_id = Rack::Request.new(env).params[CURRENT_WORKSPACE_PARAMS_KEY]
-    return unless workspace_id
-    if workspace_id.present?
-      session(env)[CURRENT_WORKSPACE_SESSION_KEY] = workspace_id
-    else
-      session(env).delete(CURRENT_WORKSPACE_SESSION_KEY)
-    end
-  end
-
-  def session(env)
-    env[Rack::Session::Abstract::ENV_SESSION_KEY]
-  end
 end
 
 end # module RailsConnector

data/lib/tasks/cache.rake

@@ -0,0 +1,2 @@
+require_relative 'rails_connector/cache_garbage_collector_task'
+RailsConnector::CacheGarbageCollectorTask.new

data/lib/tasks/rails_connector/cache_garbage_collector_task.rb

@@ -0,0 +1,98 @@
+require 'rake'
+require 'rake/tasklib'
+
+module RailsConnector
+  # The CacheGarbageCollectorTask allows to remove old cache files from the Rails Connector cache
+  # storage path. By default, a maximum of +DEFAULT_MAX_FILE_INODES+ file inodes that were accessed
+  # lately are kept in the cache directory. All other files and empty directories are removed. Log
+  # output is written to the Rails environment log file.
+  #
+  # @example Running the garbage collector with default settings
+  #
+  #   bundle exec rake infopark:cache:gc
+  #
+  # @example Changing the maximum number of file inodes
+  #
+  #   bundle exec rake infopark:cache:gc MAX_FILE_INODES=5000
+  class CacheGarbageCollectorTask < ::Rake::TaskLib
+    DEFAULT_MAX_FILE_INODES = 100000
+
+    attr_accessor :max_file_inodes
+
+    def initialize
+      @max_file_inodes = (ENV['MAX_FILE_INODES'] || DEFAULT_MAX_FILE_INODES).to_i
+
+      namespace :infopark do
+        namespace :cache do
+          desc "Cap number of cache file inodes at #{@max_file_inodes}. Use MAX_FILE_INODES to specify the
+            maximum. (default: #{DEFAULT_MAX_FILE_INODES})"
+          task gc: :environment do
+            run_gc
+          end
+        end
+      end
+    end
+
+    private
+
+    def run_gc
+      announce "Cap number of cache file inodes at #{max_file_inodes} in #{cache_path}."
+
+      directories = []
+      file_inode_count = 0
+      delta_disk_space = 0
+      delta_count = 0
+
+      cache_entries.each do |cache_entry|
+        begin
+          stat = File.stat(cache_entry)
+
+          if stat.file?
+            file_inode_count += 1
+            next if file_inode_count <= max_file_inodes
+
+            File.delete(cache_entry)
+
+            delta_disk_space += stat.size
+            delta_count += 1
+          elsif stat.directory?
+            directories << cache_entry
+          end
+        rescue Errno::ENOENT
+        end
+      end
+
+      directories.sort.reverse_each do |dirname|
+        begin
+          Dir.rmdir(dirname)
+          delta_count += 1
+        rescue Errno::ENOTEMPTY, Errno::ENOENT
+        end
+      end
+
+      announce "Done. Removed #{delta_count} entries. Saved at least #{delta_disk_space} Bytes."
+    end
+
+    def cache_path
+      CmsCacheStorage.backend_cache.cache_path
+    end
+
+    def cache_entries
+      Dir["#{cache_path}/**/*"].sort_by do |file|
+        begin
+          -File.atime(file).to_i
+        rescue Errno::ENOENT
+          # If such file or directory does not exist, sort it as if the last
+          # access time is very long ago.
+          0
+        end
+      end
+    end
+
+    def announce(message)
+      message = "[#{Time.now.iso8601}] #{message}"
+
+      Rails.logger.info(message)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.0
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,16 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45LjIuMg==
+        version: 0.9.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45LjIuMg==
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -88,16 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41LjY=
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41LjY=
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -160,9 +156,9 @@ files:
 - lib/assets/fonts/infopark_icons-webfont.ttf
 - lib/assets/fonts/infopark_icons-webfont.woff
 - lib/assets/images/180x120.gif
-- lib/assets/images/ip_logo_app.png
-- lib/assets/images/ip_logo_app2x.png
-- lib/assets/images/irongrip.png
+- lib/assets/images/apple-touch-icon.jpg
+- lib/assets/images/favicon.ico
+- lib/assets/images/ip_logo.svg
 - lib/assets/images/rails_connector/image_placeholder.png
 - lib/assets/javascripts/infopark_editing.js
 - lib/assets/stylesheets/infopark_editing.css
@@ -173,7 +169,7 @@ files:
 - lib/obj.rb
 - lib/rails_connector/access_denied.rb
 - lib/rails_connector/attribute_content.rb
-- lib/rails_connector/backend_not_available.rb
+- lib/rails_connector/backend_error.rb
 - lib/rails_connector/basic_obj.rb
 - lib/rails_connector/basic_widget.rb
 - lib/rails_connector/blob.rb
@@ -187,7 +183,10 @@ files:
 - lib/rails_connector/cms_dispatch_controller.rb
 - lib/rails_connector/cms_env.rb
 - lib/rails_connector/cms_rest_api.rb
+- lib/rails_connector/cms_rest_api/attribute_serializer.rb
+- lib/rails_connector/cms_rest_api/blob_uploader.rb
 - lib/rails_connector/cms_test_request.rb
+- lib/rails_connector/communication_error.rb
 - lib/rails_connector/configuration.rb
 - lib/rails_connector/connection_manager.rb
 - lib/rails_connector/content_conversion.rb
@@ -204,7 +203,7 @@ files:
 - lib/rails_connector/errors.rb
 - lib/rails_connector/html_string.rb
 - lib/rails_connector/link.rb
-- lib/rails_connector/link_resolvable.rb
+- lib/rails_connector/link_parser.rb
 - lib/rails_connector/log_subscriber.rb
 - lib/rails_connector/migration.rb
 - lib/rails_connector/migrations.rb
@@ -216,17 +215,25 @@ files:
 - lib/rails_connector/migrations/workspace_lock.rb
 - lib/rails_connector/model_identity.rb
 - lib/rails_connector/named_link.rb
+- lib/rails_connector/network_error.rb
 - lib/rails_connector/obj_data.rb
 - lib/rails_connector/obj_data_from_hash.rb
 - lib/rails_connector/obj_data_from_service.rb
+- lib/rails_connector/obj_params_parser.rb
+- lib/rails_connector/obj_search_builder.rb
 - lib/rails_connector/obj_search_enumerator.rb
-- lib/rails_connector/rack_middlewares.rb
+- lib/rails_connector/rate_limit_exceeded.rb
+- lib/rails_connector/revision.rb
 - lib/rails_connector/string_tagging.rb
+- lib/rails_connector/text_link.rb
+- lib/rails_connector/text_link_conversion.rb
 - lib/rails_connector/type_computer.rb
 - lib/rails_connector/workspace.rb
 - lib/rails_connector/workspace_data_from_service.rb
 - lib/rails_connector/workspace_selection_middleware.rb
+- lib/tasks/cache.rake
 - lib/tasks/migration.rake
+- lib/tasks/rails_connector/cache_garbage_collector_task.rb
 - lib/widget.rb
 homepage: http://www.infopark.de
 licenses: []
@@ -247,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Infopark Cloud Connector

data/lib/rails_connector/link_resolvable.rb

@@ -1,9 +0,0 @@
-module RailsConnector
-
-  module LinkResolvable
-    attr_accessor :source
-
-  end
-
-
-end

data/lib/rails_connector/rack_middlewares.rb

@@ -1,6 +0,0 @@
-module RailsConnector
-  def self.rack_middlewares
-    ["RailsConnector::CacheMiddleware", "RailsConnector::WorkspaceSelectionMiddleware"]
-  end
-end
-