infopark_cloud_connector 6.9.2.1.125136549 → 6.9.3.1.36404185

data/lib/assets/stylesheets/infopark_editing.css

@@ -434,6 +434,7 @@ html.ip_bottombar_on {
   display: block;
   float: left;
   position: relative;
+  cursor: pointer;
 }
 .ip_topbar .ip_button_bar.ip_app {
   width: 100px;
@@ -585,6 +586,44 @@ html.ip_bottombar_on {
 .ip_topbar .ip_first_level .ip_button_bar.ip_no_hover:hover .ip_product_name:after {
   display: none;
 }
+.ip_topbar .ip_first_level .ip_saving_state_bar {
+  height: 35px;
+  padding: 5px 10px 5px 35px;
+  color: #fff;
+  text-shadow: 0 1px 1px #333;
+  font-size: 11px;
+  font-weight: bold;
+  min-width: 95px;
+  display: block;
+  float: right;
+  position: relative;
+  -webkit-box-shadow: 0 -3px 3px #3e5b87 inset;
+  -moz-box-shadow: 0 -3px 3px #3e5b87 inset;
+  box-shadow: 0 -3px 3px #3e5b87 inset;
+  background-color: #586e94;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#8094bb), color-stop(55%, #60769b), to(#365077));
+  background-image: -webkit-linear-gradient(#8094bb, #60769b 55%, #365077);
+  background-image: -moz-linear-gradient(top, #8094bb, #60769b 55%, #365077);
+  background-image: -o-linear-gradient(#8094bb, #60769b 55%, #365077);
+  background-image: linear-gradient(#8094bb, #60769b 55%, #365077);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8094bb', endColorstr='#ff365077', GradientType=0);
+}
+.ip_topbar .ip_first_level .ip_saving_state_bar .ip_icon {
+  color: #fff;
+  text-shadow: 0 1px 1px #333;
+  font-size: 11px;
+  position: absolute;
+  top: 13px;
+  left: 10px;
+}
+.ip_topbar .ip_first_level .ip_saving_state_bar .ip_button_label span {
+  height: 35px;
+  display: table-cell;
+  font-size: 10px;
+  vertical-align: middle;
+  line-height: 14px;
+}
 .ip_topbar_dark .ip_topbar .ip_first_level,
 .ip_topbar.ip_dark .ip_first_level {
   height: 45px;
@@ -1498,7 +1537,7 @@ a.ip_button:active {
 .ip_modal_small {
   position: fixed;
   left: 50%;
-  top: -400%;
+  top: -100%;
   z-index: 1000;
   overflow: auto;
   border: 1px solid #fff;
@@ -1590,7 +1629,7 @@ a.ip_button:active {
 .ip_modal_big {
   position: fixed;
   left: 50%;
-  top: -400%;
+  top: -100%;
   z-index: 1000;
   overflow: auto;
   border: 1px solid #fff;
@@ -1610,6 +1649,7 @@ a.ip_button:active {
   transition: top 0.25s ease-in;
 }
 .ip_modal_big.ip_show {
+  visibility: visible;
   top: 50%;
   z-index: 333333;
 }
@@ -1700,6 +1740,26 @@ a.ip_button:active {
 .ip_modal_big .ip_modal_footer:after {
   clear: both;
 }
+.ip_modal_header .ip_saving_state_bar {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  padding: 3px 7px;
+}
+.ip_modal_header .ip_saving_state_bar .ip_icon {
+  color: #666;
+  text-shadow: 0 1px 1px #fff;
+  font-size: 9px;
+  margin: 0 7px 0 0;
+}
+.ip_modal_header .ip_saving_state_bar span {
+  display: inline-block;
+  color: #666;
+  font-size: 11px;
+  font-weight: bold;
+  vertical-align: middle;
+  line-height: 14px;
+}
 .ip_modal_big .ip_modal_header_tab_container {
   margin: 0 -10px -8px -10px;
   *zoom: 1;
@@ -1937,8 +1997,17 @@ a.ip_button:active {
   .ip_bottombar .ip_button_label {
     display: none;
   }
+  .ip_topbar .ip_first_level .ip_saving_state_bar {
+    min-width: 0;
+  }
+  .ip_topbar .ip_first_level .ip_saving_state_bar .ip_button_label {
+    display: block;
+  }
 }
 @media (max-width: 480px) {
+  .ip_topbar .ip_first_level .ip_saving_state_bar .ip_button_label {
+    display: none;
+  }
   .ip_modal_small {
     width: 90%;
     margin: -30% 0 0 -45%;

data/lib/rails_connector/basic_obj.rb

@@ -144,12 +144,28 @@ module RailsConnector
       end
     end
 
-    def to_param
-      id
+    # Hook method to control which page classes should be avaiable for a page with given path.
+    # Override it to allow only certain classes or none.
+    # Must return either {NilClass}, or {Array}.
+    #
+    # Be aware that the given argument is a parent path.
+    # E.g. when creating a page with path +/products/shoes+ then the argument will be +/products+.
+    #
+    # If {NilClass} is returned, then all possible classes will be available.
+    # By default {NilClass} is returned.
+    #
+    # If {Array} is returned, then it should include desired class names.
+    # Each class name must be either a {String} or a {Symbol}.
+    # Only this class names will be available. Order of the class names will be preserved.
+    #
+    # @param [String] parent_path Path of the parent obj
+    # @return [NilClass, Array<Symbol, String>]
+    # @api public
+    def self.valid_page_classes_beneath(parent_path)
     end
 
-    def self.configure_for_content(mode)
-      # this method exists only for compatibility with the fiona connector.
+    def to_param
+      id
     end
 
     # A CMS administrator can specify the <tt>obj_class</tt> for a given CMS object.
@@ -686,6 +702,28 @@ module RailsConnector
       @widget_container ||= self.class.find(parent_path.split('/').last)
     end
 
+    # Hook method to control which widget classes should be avaiable for this page.
+    # Override it to allow only certain classes or none.
+    # Must return either {NilClass}, or {Array}.
+    #
+    # If {NilClass} is returned, then all widget classes will be available for this page.
+    # By default {NilClass} is returned.
+    #
+    # If {Array} is returned, then it should include desired class names.
+    # Each class name must be either a {String} or a {Symbol}.
+    # Only this class names will be available for this page.
+    # Order of the class names will be preserved.
+    #
+    # @param [String] field_name Name of the widget field.
+    # @return [NilClass, Array<Symbol, String>]
+    # @api public
+    def valid_widget_classes_for(field_name)
+    end
+
+    def edit_view_path
+      "#{obj_class.underscore}/edit"
+    end
+
     private
 
     attr_accessor :data_from_cms
@@ -708,14 +746,16 @@ module RailsConnector
 
     def prepare_attribute_value(attribute_value, attribute_type)
       case attribute_type
-      when "markdown"
-        StringTagging.tag_as_markdown(attribute_value, self)
       when "html"
         StringTagging.tag_as_html(attribute_value, self)
       when "date"
         DateAttribute.parse(attribute_value) if attribute_value
       when "linklist"
         LinkList.new(attribute_value)
+      when "reference"
+        self.class.find([attribute_value]).first
+      when "referencelist"
+        self.class.find(attribute_value).compact
       else
         attribute_value
       end

data/lib/rails_connector/cms_rest_api.rb

@@ -3,8 +3,7 @@ require 'active_support/all'
 
 module RailsConnector
 
-  # Provides a simple wrapper for the CMS Rest API
-  # using the credentials from {RailsConnector::Configuration.cms_api_options}.
+  # Provides a simple wrapper for the CMS Rest API.
   #
   # @example Request the published workspace:
   #   RailsConnector::CmsRestApi.get('workspaces/published')
@@ -29,8 +28,27 @@ module RailsConnector
   #   RailsConnector::CmsRestApi.task_unaware_request(:put, 'workspace/rtc/publish', nil)
   #
   class CmsRestApi
+    class Configuration
+      attr_accessor :url
+      attr_accessor :login
+      attr_accessor :api_key
+      attr_accessor :http_host
+      attr_accessor :tenant_name
+
+      def url
+        if @url.nil?
+          raise RailsConnectorError,
+            'CmsRestApi configuration key "url" is missing. '\
+            'Set "RailsConnector::Configuration.cms_url = <url>"'
+        end
 
-    cattr_accessor :credentials
+        @url
+      end
+    end
+
+    cattr_accessor :configuration do
+      Configuration.new
+    end
 
     def self.get(resource_path, payload = nil, options = nil)
       request_cms_api(:get, resource_path, payload, options)
@@ -53,12 +71,6 @@ module RailsConnector
       response_for_request_cms_api(method, resource_path, payload)
     end
 
-    # @param [Hash] value
-    # @return [void]
-    def self.credentials=(value)
-      @@credentials = value.symbolize_keys
-    end
-
     class << self
 
       private
@@ -114,18 +126,18 @@ module RailsConnector
           :content_type => :json,
           :accept => :json,
         }
-        headers[:host] = credentials[:http_host] if credentials[:http_host].present?
+        headers[:host] = configuration.http_host if configuration.http_host.present?
 
         {
-          :user => credentials[:login],
-          :password => credentials[:api_key],
+          :user => configuration.login,
+          :password => configuration.api_key,
           :headers => headers,
         }
       end
 
       def url(resource_path)
-        "#{credentials[:url]}/#{resource_path}"
+        "#{configuration.url}/#{resource_path}"
       end
     end
   end
-end
+end

data/lib/rails_connector/configuration.rb

@@ -0,0 +1,199 @@
+require "rails_connector/blob"
+
+module RailsConnector
+
+  # @api public
+  class Configuration
+    #
+    # Default path of a CA certification file in PEM format.
+    #
+    # @api public
+    DEFAULT_CA_FILE = File.expand_path('../../../config/ca-bundle.crt', __FILE__)
+
+    class << self
+
+      # Determine if current visitor is permitted to edit content.
+      attr_accessor :editing_auth_callback
+
+      # Configure a callback to be invoked when the rails connector determines,
+      # if current visitor is permitted to edit content.
+      # Default is <code>false</code>.
+      #
+      # Example Usage:
+      #     RailsConnector::Configuation.editing_auth do |env|
+      #       request = Rack::Request.new(env)
+      #       # return truey if current visitor is permitted to edit content, falsy otherwise
+      #     end
+      # @api public
+      def editing_auth(&block)
+        if block.respond_to?(:arity) && block.arity == 1
+          self.editing_auth_callback = block
+        else
+          raise ArgumentError, 'editing_auth should have only one attribute!'
+        end
+      end
+
+      # TODO: Legacy compatiblity. Remove when DisplayHelper gets removed.
+      def editor_interface_enabled?
+        false
+      end
+
+      # The +RailsConnector+ makes heavy use of filesystem caching.
+      # Use this method to configure the directory that should be used to store cached data.
+      # By default, +RAILS_ROOT/tmp/cache+ will be used.
+      # @param path [String] Path to directory that should be used to store cached data.
+      # @example Configure +RailsConnector+ to store it's cache under +/tmp/my_cache+.
+      #     RailsConnector::Configuration.cache_path = '/tmp/my_cache'
+      # @api public
+      def cache_path=(path)
+        CmsCacheStorage.backend_cache = ActiveSupport::Cache::FileStore.new(path)
+      end
+
+      # Gets path of a CA certification file in PEM format.
+      # @api public
+      attr_reader :ca_file
+
+      # Sets path of a CA certification file in PEM format.
+      # The file can contain several CA certificates.
+      # Certifications will be used for endpoint peer verification of various Infopark services
+      # e.g. Content Read Service.
+      # @api public
+      def ca_file=(path)
+        File.read(path) if path # Try to read the given file and fail if it doesn't exist or is not readable.
+        @ca_file = path
+      end
+
+      # Configuration for Content Read Service API.
+      # @api public
+      def content_service_url
+        content_service.url
+      end
+
+      # Set url configuration for Content Read Service API.
+      # @api public
+      def content_service_url=(value)
+        content_service.url = value
+      end
+
+      # Configuration for Content Read Service API.
+      # @api public
+      def content_service_login
+        content_service.login
+      end
+
+      # Set login configuration for Content Read Service API.
+      # @api public
+      def content_service_login=(value)
+        content_service.login = value
+      end
+
+      # Configuration for Content Read Service API.
+      # @api public
+      def content_service_api_key
+        content_service.api_key
+      end
+
+      # Set API key configuration for Content Read Service API.
+      # @api public
+      def content_service_api_key=(value)
+        content_service.api_key = value
+      end
+
+      # Url configuration for CMS Rest API.
+      # @api public
+      def cms_url
+        cms_api.url
+      end
+
+      # Set url configuration for CMS Rest API.
+      # @api public
+      def cms_url=(value)
+        cms_api.url = value
+      end
+
+      # Login configuration for CMS Rest API.
+      # @api public
+      def cms_login
+        cms_api.login
+      end
+
+      # Set login configuration for CMS Rest API.
+      # @api public
+      def cms_login=(value)
+        cms_api.login = value
+      end
+
+      # API key configuration for CMS Rest API.
+      # @api public
+      def cms_api_key
+        cms_api.api_key
+      end
+
+      # Set API key configuration for CMS Rest API.
+      # @api public
+      def cms_api_key=(value)
+        cms_api.api_key = value
+      end
+
+      def after_initialize
+        enable_authentication
+      end
+
+      def to_prepare
+        unless Rails.configuration.cache_classes
+          after_initialize
+          NamedLink.reset_cache
+          BasicObj.reset_type_cache
+          ::ApplicationController.__send__(:helper, :cms)
+        end
+      end
+
+      def configure_cms_database
+      end
+
+      attr_accessor :choose_homepage_callback
+
+      # Configure a callback to be invoked when the rails connector delivers the homepage.
+      # The given callback will receive the rack env
+      # and must return an Obj to be used as the homepage.
+      # If no callback is configured, Obj.homepage will be used as the default.
+      # @api public
+      def choose_homepage(&block)
+        self.choose_homepage_callback = block
+      end
+
+      def cms_routes(*args)
+        raise <<-EOS.gsub(/\s+/, ' ')
+        Calling RailsConnector::Configuration.cms_routes is not needed anymore.
+        Please remove it from config/routes.rb
+        EOS
+      end
+
+      def use_x_sendfile=(value)
+        raise 'Configuration.use_x_sendfile is now available as Rails configuration:'\
+              ' config.action_dispatch.x_sendfile_header = "X-Sendfile"'
+      end
+
+      private
+
+      def content_service
+        RailsConnector::ContentService.configuration
+      end
+
+      def cms_api
+        RailsConnector::CmsRestApi.configuration
+      end
+
+      def enable_authentication
+        ::ApplicationController.__send__(:include, RailsConnector::Authenticable)
+      end
+    end
+
+    # defaults
+    self.ca_file = DEFAULT_CA_FILE
+    self.editing_auth{ |env| false }
+  end
+
+  class ConfigurationError < StandardError
+  end
+end

data/lib/rails_connector/content_service.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module RailsConnector
 class ContentService
   DEFAULT_PROTOCOL = 'https'.freeze
@@ -16,6 +18,27 @@ class ContentService
     Timeout::Error,
   ].freeze
 
+  class Configuration
+    attr_accessor :url
+    attr_accessor :login
+    attr_accessor :api_key
+    attr_accessor :http_host
+
+    def url
+      if @url.nil?
+        raise RailsConnectorError,
+          'ContentService configuration key "url" is missing. '\
+          'Set "RailsConnector::Configuration.content_service_url = <url>"'
+      end
+
+      @url
+    end
+  end
+
+  cattr_accessor :configuration do
+    Configuration.new
+  end
+
   class RateLimitExceeded < StandardError
     def initialize(retry_after)
       @retry_after = retry_after
@@ -94,7 +117,7 @@ class ContentService
 
     def build_request(path, payload)
       request = Net::HTTP::Post.new("#{uri.path}/#{path}".squeeze('/'), request_headers)
-      request.basic_auth(config['login'], config['api_key'])
+      request.basic_auth(configuration.login, configuration.api_key)
       request.body = MultiJson.dump(payload)
       request
     end
@@ -112,7 +135,7 @@ class ContentService
     end
 
     def uri
-      url = config['url']
+      url = configuration.url
       url = "#{DEFAULT_PROTOCOL}://#{url}" unless url.match /^http/
       URI.parse(url)
     end
@@ -123,16 +146,12 @@ class ContentService
         'Accept' => 'application/json',
         'User-Agent' => user_agent,
       }
-      if http_host = config['http_host']
-        headers['Host'] = http_host
+      if configuration.http_host
+        headers['Host'] = configuration.http_host
       end
       headers
     end
 
-    def config
-      RailsConnector::Configuration.content_service
-    end
-
     def user_agent
       @user_agent ||= (
         gem_info = Gem.loaded_specs["infopark_cloud_connector"]

data/lib/rails_connector/link.rb

@@ -62,14 +62,6 @@ module RailsConnector
       @link_data[:tag_name]
     end
 
-    def markdown_type
-      @link_data[:markdown_type]
-    end
-
-    def markdown?
-      'markdown' == @link_data[:source_format]
-    end
-
     # Returns the file extension (e.g. zip, pdf) of this link's (internal or external) target.
     # Returns an empty string if the file extension is can not be determined.
     # @api public

data/lib/rails_connector/obj_data_from_hash.rb

@@ -1,12 +1,13 @@
 module RailsConnector
 
   class ObjDataFromHash < ObjData
-    def initialize(hash)
+    def initialize(hash, type_hash = {})
       @hash = hash.stringify_keys
+      @type_hash = type_hash.stringify_keys
     end
 
     def value_and_type_of(attribute_name)
-      [@hash[attribute_name], nil]
+      [@hash[attribute_name], @type_hash[attribute_name]]
     end
 
     def has_custom_attribute?(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.9.2.1.125136549
+  version: 6.9.3.1.36404185
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -77,12 +77,14 @@ files:
 - app/controllers/rails_connector/workspaces_controller.rb
 - app/helpers/rails_connector/cms_asset_helper.rb
 - app/helpers/rails_connector/cms_tag_helper.rb
+- app/helpers/rails_connector/display_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
 - app/views/rails_connector/objs/show.html.erb
+- config/ca-bundle.crt
 - config/locales/de.rails_connector.models.yml
 - config/locales/en.rails_connector.models.yml
 - config/routes.rb
@@ -111,6 +113,7 @@ files:
 - lib/rails_connector/cms_backend.rb
 - lib/rails_connector/cms_cache_storage.rb
 - lib/rails_connector/cms_rest_api.rb
+- lib/rails_connector/configuration.rb
 - lib/rails_connector/content_conversion.rb
 - lib/rails_connector/content_service.rb
 - lib/rails_connector/content_state.rb
@@ -154,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 117017377
+      hash: 973791727
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: