infopark_cloud_connector 6.8.3.174.51542603 → 6.9.0.3.197272233

data/lib/generators/cms/migration/migration_generator.rb

@@ -4,12 +4,18 @@ module Cms
 
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :path,
+      type: :string,
+      default: 'cms/migrate',
+      desc: 'Relative path to Rails.root where to place the migration file. Defaults to "cms/migrate".',
+      banner: 'PATH'
+
     def self.next_migration_number(dirname)
       Time.now.utc.strftime('%Y%m%d%H%M%S')
     end
 
     def create_migration_file
-      migration_template('migration.rb', "cms/migrate/#{file_name}")
+      migration_template('migration.rb', "#{options[:path]}/#{file_name}")
     end
   end
 end

data/lib/rails_connector/backend_not_available.rb

@@ -3,6 +3,10 @@ module RailsConnector
   class BackendNotAvailable < StandardError
     attr_reader :http_code
 
+    def self.from_socket_error(socket_error)
+      new(socket_error.message, 503)
+    end
+
     def initialize(message, http_code)
       @http_code = http_code
       super(message)

data/lib/rails_connector/basic_obj.rb

@@ -666,6 +666,29 @@ module RailsConnector
       data_from_cms.has_custom_attribute?(name.to_s)
     end
 
+    def widgets(attribute_name)
+      unless (type_of_attribute(attribute_name) == 'widget')
+        raise "Not a widget field: #{attribute_name}."
+      end
+
+      widgets = read_attribute(attribute_name.to_s, false)
+
+      return [] unless widgets.present?
+
+      output_objs = []
+      (widgets['layout'] || []).each do |widget_hash|
+        begin
+          widget_obj = self.class.find(widget_hash['widget'])
+        rescue RailsConnector::ResourceNotFound => e
+        end
+        if widget_obj.present? && widget_obj.path.start_with?("/_widgets/#{id}/")
+          output_objs << widget_obj
+        end
+      end
+
+      output_objs
+    end
+
     private
 
     attr_accessor :data_from_cms
@@ -675,7 +698,10 @@ module RailsConnector
       @attribute_cache = {}
     end
 
-    def read_attribute(attribute_name)
+    def read_attribute(attribute_name, skip_widgets = true)
+      if skip_widgets && (type_of_attribute(attribute_name) == 'widget')
+        raise "Field #{attribute_name} not (yet) available, since it's a widget"
+      end
       @attribute_cache.fetch(attribute_name) do
         (raw_value, attribute_type) = data_from_cms.value_and_type_of(attribute_name)
         @attribute_cache[attribute_name] =

data/lib/rails_connector/cloud_engine.rb

@@ -4,6 +4,18 @@ module ::RailsConnector
       # Specify which file should be precompiled for packaging
       app.config.assets.precompile += %w( infopark_editing.js infopark_editing.css )
     end
+
+    initializer "rails issue 4911 workaround" do
+      if Rails.version < '4'
+        max_size = [ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE, 228].min
+        silence_warnings { ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE = max_size }
+      end
+    end
+
+    initializer "widgets.attach_router" do |app|
+      ::RailsConnector::WidgetRenderer.class_eval do
+        include app.routes.url_helpers
+      end
+    end
   end
 end
-

data/lib/rails_connector/cms_api_search_request.rb

@@ -3,7 +3,6 @@ module RailsConnector
   # This class provides a basic implementation for accessing the search using the cms api.
   # It can be activated by making it the superclass of SearchRequest.
   # It should be customized by subclassing.
-  # @api public
   class CmsApiSearchRequest
 
     # Takes +query_string+ and +options+ for accessing Cms Api Search.
@@ -12,14 +11,12 @@ module RailsConnector
     #
     # <tt>:limit</tt>:: The maximum number of hits
     # <tt>:offset</tt>:: The search offset
-    # @api public
     def initialize(query_string, options = {})
       @query_string = query_string
       @options = options
     end
 
     # Accesses Cms Api Search using #query and fetches search hits.
-    # @api public
     def fetch_hits
       search_enum = search_results
 

data/lib/rails_connector/cms_backend.rb

@@ -82,17 +82,26 @@ module RailsConnector
     end
 
     def find_workspace_data_by_id(id)
-      from_content_state_id = ContentStateCaching.find_content_state_id(id)
+      workspace_data_from_cache = WorkspaceDataFromService.find_from_cache(id)
+      from_content_state_id = workspace_data_from_cache.try(:content_state_id)
+
       request_params = {:workspace_id => id}
       request_params[:content_state_id] = from_content_state_id if from_content_state_id
-      raw_data = ContentService.query('workspaces/query', request_params)
+
+      raw_data = if id == 'published' && workspace_data_from_cache
+        begin
+          ContentService.query('workspaces/query', request_params, timeout: 1)
+        rescue BackendNotAvailable => e
+          warn_backend_not_available(id, from_content_state_id, e.message)
+          return workspace_data_from_cache
+        end
+      else
+        ContentService.query('workspaces/query', request_params)
+      end
+
       if raw_workspace_data = raw_data['workspace']
         workspace_data = WorkspaceDataFromService.new(raw_workspace_data)
-        if from_content_state_id != workspace_data.content_state_id
-          ContentStateCaching.store_content_state(workspace_data)
-          ContentStateCaching.store_content_state_id(workspace_data.id,
-              workspace_data.content_state_id)
-        end
+        workspace_data.store_in_cache if from_content_state_id != workspace_data.content_state_id
         workspace_data
       end
     end
@@ -198,6 +207,15 @@ module RailsConnector
       raise ArgumentError, "invalid index name '#{index}'" unless VALID_INDEX_NAMES.include?(index)
     end
 
+    def warn_backend_not_available(workspace_id, content_state_id, error_message)
+      message = <<-EOS
+        Couldn't connect to content service for workspace with id=#{workspace_id} and content_state_id=#{content_state_id}.
+        #{error_message}
+        Serving from cache.
+      EOS
+      Rails.logger.warn(message)
+    end
+
   end
 
 end

data/lib/rails_connector/cms_cache_storage.rb

@@ -15,12 +15,12 @@ module CmsCacheStorage
       end
     end
 
-    def read_workspace_content_state_id(workspace_id)
-      cache.read("workspace/#{workspace_id}/content_state")
+    def read_workspace_data(workspace_id)
+      cache.read("workspace/#{workspace_id}")
     end
 
-    def write_workspace_content_state_id(workspace_id, content_state_id)
-      cache.write("workspace/#{workspace_id}/content_state", content_state_id)
+    def write_workspace_data(workspace_id, workspace_data)
+      cache.write("workspace/#{workspace_id}", workspace_data)
     end
 
     def read_content_state(content_state_id)

data/lib/rails_connector/content_service.rb

@@ -1,8 +1,20 @@
 module RailsConnector
 class ContentService
   DEFAULT_PROTOCOL = 'https'.freeze
-  SOCKET_ERRORS = [EOFError, IOError, Errno::ECONNABORTED, Errno::ECONNRESET,
-      Errno::EPIPE, Errno::EINVAL].freeze
+  DEFAULT_TIMEOUT = 10.freeze
+
+  SOCKET_ERRORS = [
+    EOFError,
+    Errno::ECONNABORTED,
+    Errno::ECONNREFUSED,
+    Errno::ECONNRESET,
+    Errno::EINVAL,
+    Errno::EPIPE,
+    Errno::ETIMEDOUT,
+    IOError,
+    SocketError,
+    Timeout::Error,
+  ].freeze
 
   class RateLimitExceeded < StandardError
     def initialize(retry_after)
@@ -33,15 +45,16 @@ class ContentService
   class << self
     @next_request_not_before = nil
 
-    def query(path, payload)
+    def query(path, payload, options={})
+      timeout = options.fetch(:timeout, DEFAULT_TIMEOUT)
       retry_once_on_socket_error do
         retry_until_timeout_on_rate_limit_exceeded do
-          ConnectionManager.ensure_started(uri)
+          ConnectionManager.ensure_started(uri, timeout)
           request = build_request(path, payload)
           if @next_request_not_before && @next_request_not_before > (now = Time.now)
             sleep @next_request_not_before - now
           end
-          handle_response(ConnectionManager.connection.request(request))
+          handle_response(ConnectionManager.connection(timeout).request(request))
         end
       end
     end
@@ -57,8 +70,8 @@ class ContentService
       retried = false
       begin
         yield
-      rescue *SOCKET_ERRORS
-        raise if retried
+      rescue *SOCKET_ERRORS => e
+        raise BackendNotAvailable.from_socket_error(e) if retried
         ConnectionManager.ensure_finished
         retried = true
         retry
@@ -129,7 +142,8 @@ class ContentService
   end
 
   module ConnectionManager
-    def self.connection
+    def self.connection(timeout=DEFAULT_TIMEOUT)
+      configure_timeout(@connection, timeout) if @connection
       @connection
     end
 
@@ -137,7 +151,7 @@ class ContentService
       @connection = conn
     end
 
-    def self.ensure_started(uri)
+    def self.ensure_started(uri, timeout=DEFAULT_TIMEOUT)
       return if @connection && @connection.started?
       conn = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'
@@ -145,7 +159,10 @@ class ContentService
         conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
         conn.ca_file = RailsConnector::Configuration.ca_file
       end
-      retry_twice_on_socket_error { conn.start }
+      configure_timeout(conn, timeout)
+      retry_twice_on_socket_error do
+        conn.start
+      end
       @connection = conn
     end
 
@@ -161,12 +178,19 @@ class ContentService
         attempt = 0
         begin
           yield
-        rescue *ContentService::SOCKET_ERRORS
-          raise if attempt == 2
+        rescue *ContentService::SOCKET_ERRORS => e
+          raise BackendNotAvailable.from_socket_error(e) if attempt == 2
           attempt += 1
           retry
         end
       end
+
+      def configure_timeout(connection, timeout)
+        connection.open_timeout = timeout
+        connection.read_timeout = timeout
+        connection.ssl_timeout = timeout
+      end
+
     end
   end
 end

data/lib/rails_connector/content_state_caching.rb

@@ -14,24 +14,6 @@ module ContentStateCaching
     # to the current content state's cache. Default depth is 5.
     attr_accessor :cache_replication_depth
 
-    # Creates a new content state for given workspace with given ancetor and returns it.
-    def store_content_state(workspace_data)
-      ContentState.create(content_state_id: workspace_data.to_content_state_id,
-          changes: workspace_data.changes,
-          from_content_state_id: workspace_data.from_content_state_id)
-    end
-
-    # Fetches last known content state id for a given workspace id.
-    # Returns nil if there is no content state for that workspace.
-    def find_content_state_id(workspace_id)
-      CmsCacheStorage.read_workspace_content_state_id(workspace_id)
-    end
-
-    # Stores current content state id for workspace with given id.
-    def store_content_state_id(workspace_id, content_state_id)
-      CmsCacheStorage.write_workspace_content_state_id(workspace_id, content_state_id)
-    end
-
     # Updates caches with data from given workspace.
     # Should be called every time a new OBJ data has been fetched.
     def store_obj_data(workspace_data, index, key, data)

data/lib/rails_connector/default_search_request.rb

@@ -1,7 +1,6 @@
 module RailsConnector
   # This class provides a default implementation for accessing the search server.
   # It is used by {DefaultSearchController}.
-  # @api public
   class DefaultSearchRequest < CmsApiSearchRequest
   end
 end

data/lib/rails_connector/migrations/migrator.rb

@@ -92,7 +92,10 @@ module RailsConnector
       end
 
       def migrations_paths
-        ["#{Rails.root}/cms/migrate"]
+        Dir.glob([
+          Rails.root + 'cms/migrate',
+          Rails.root + 'app/widgets/**/migrate/',
+        ])
       end
 
       def runnable

data/lib/rails_connector/widget_renderer.rb

@@ -0,0 +1,41 @@
+module RailsConnector
+
+class WidgetRenderer < AbstractController::Base
+  include AbstractController::Rendering
+  include AbstractController::Helpers
+
+  helper :cms, "rails_connector/widget"
+
+  self.view_paths = [File.join('app', 'widgets')]
+
+  def initialize(request)
+    @_request = request
+  end
+
+  def show(widget, obj, widget_field_name, container)
+    @widget = widget
+    @obj = obj
+    @widget_field_name = widget_field_name
+    @container = container
+
+    render_to_string "#{widget.obj_class.underscore}/show"
+  end
+
+  def thumbnail(widget_dir)
+    begin
+      render_to_string "#{widget_dir}/thumbnail"
+    rescue ActionView::MissingTemplate => e
+      view_context.widget_thumbnail(
+        widget_dir.titleize,
+        'thumbnail.html.erb does not existing. Please provide one.',
+        view_context.image_tag('180x120.gif')
+      )
+    end
+  end
+
+  def request
+    @_request
+  end
+end
+
+end # module RailsConnector

data/lib/rails_connector/workspace.rb

@@ -41,6 +41,10 @@ class Workspace
     @workspace_data.revision_id
   end
 
+  def title
+    @workspace_data.title
+  end
+
   def data
     @workspace_data
   end

data/lib/rails_connector/workspace_data_from_service.rb

@@ -1,6 +1,14 @@
 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)
+    end
+  end
+
   def initialize(data)
     @data = data
   end
@@ -13,6 +21,10 @@ class WorkspaceDataFromService
     @data["id"]
   end
 
+  def title
+    @data["title"]
+  end
+
   # remove this method after DynamoCmsBackend has been removed from the Cloud Connector
   def content_cache_id=(id)
     # ignore, since not using content caches
@@ -41,6 +53,29 @@ class WorkspaceDataFromService
   def to_content_state_id
     diff && diff['to_content_state_id']
   end
+
+  # Serializes and stores a workspace data in cache storage.
+  # Also creates an appropriate content state if needed.
+  def store_in_cache
+    create_content_state if content_state_id
+    CmsCacheStorage.write_workspace_data(id, to_hash)
+  end
+
+  private
+
+  def to_hash
+    {
+      'id' => id,
+      'revision_id' => revision_id,
+      'title' => title,
+      'content_state_id' => content_state_id,
+    }
+  end
+
+  def create_content_state
+    ContentState.create(content_state_id: to_content_state_id, changes: changes,
+        from_content_state_id: from_content_state_id)
+  end
 end
 
 end # module RailsConnector

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.3.174.51542603
+  version: 6.9.0.3.197272233
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -73,10 +73,15 @@ files:
 - app/helpers/rails_connector/cms_tag_helper.rb
 - app/helpers/rails_connector/editing_helper.rb
 - app/helpers/rails_connector/marker_helper.rb
+- app/helpers/rails_connector/widget_helper.rb
+- app/views/rails_connector/_editing_javascript.html.erb
+- app/views/rails_connector/objs/create_widget.html.erb
 - config/routes.rb
 - lib/assets/fonts/infopark_icons-webfont.eot
 - lib/assets/fonts/infopark_icons-webfont.ttf
 - lib/assets/fonts/infopark_icons-webfont.woff
+- lib/assets/images/180x120.gif
+- lib/assets/images/irongrip.png
 - lib/assets/javascripts/infopark_editing.js
 - lib/assets/stylesheets/infopark_editing.css
 - lib/generators/cms/migration/USAGE
@@ -122,6 +127,7 @@ files:
 - lib/rails_connector/obj_data_from_service.rb
 - lib/rails_connector/obj_search_enumerator.rb
 - lib/rails_connector/rack_middlewares.rb
+- lib/rails_connector/widget_renderer.rb
 - lib/rails_connector/workspace.rb
 - lib/rails_connector/workspace_data_from_service.rb
 - lib/rails_connector/workspace_selection_middleware.rb
@@ -140,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 676465587
+      hash: 779053553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: