infopark_cloud_connector 6.9.4 → 6.9.5

data/lib/rails_connector/link.rb

@@ -6,9 +6,17 @@ module RailsConnector
 
     extend ActiveModel::Naming
 
-    def initialize(link_data, destination_object = nil)
-      @link_data = link_data.symbolize_keys
-      @destination_object = destination_object
+    # Create a new link obj
+    # @api public
+    # @param [Hash] link_data
+    # @option link_data [String] url
+    # @option link_data [RailsConnector::BasicObj] obj
+    # @option link_data [String] title
+    # @option link_data [String] query
+    # @option link_data [String] target
+    # @option link_data [String] fragment
+    def initialize(link_data)
+      @link_data = link_data.with_indifferent_access
     end
 
     # The link's external url. Only available for external links.
@@ -19,12 +27,41 @@ module RailsConnector
       @link_data[:url]
     end
 
+    # Set the link's external url. This will lead to an external link.
+    # @api public
+    # @param value [String] the url of the link
+    def url=(value)
+      @link_data[:url] = value
+    end
+
+    # Returns the (+Obj+) this link is referencing. May be nil if the
+    # link is external.
+    # @api public
+    def obj
+      @link_data[:obj]
+    end
+
+    # Set the (+Obj+) this link is referencing. May be nil if the
+    # link is external.
+    # @api public
+    # @param value [RailsConnector::BasicObj] the obj this link should be referencing
+    def obj=(value)
+      @link_data[:obj] = value
+    end
+
     # The link's title.
     # @api public
     def title
       @link_data[:title]
     end
 
+    # Set the link's title.
+    # @api public
+    # @param value [String] the link's title
+    def title=(value)
+      @link_data[:title] = value
+    end
+
     # Returns the link's query string as in "index.html?query_string".
     # See RFC3986 for details (http://www.ietf.org/rfc/rfc3986.txt).
     # @api public
@@ -32,12 +69,12 @@ module RailsConnector
       @link_data[:query]
     end
 
-    # Depricated: use Link#query instead.
-    # Returns the link's query string as in "index.html?query_string".
+    # Set the link's query string as in "index.html?query_string".
     # See RFC3986 for details (http://www.ietf.org/rfc/rfc3986.txt).
     # @api public
-    def search
-      query
+    # @param value [String] the query string of the link
+    def query=(value)
+      @link_data[:query] = value
     end
 
     # Returns the link's anchor as in "index.html#anchor".
@@ -47,6 +84,14 @@ module RailsConnector
       @link_data[:fragment]
     end
 
+    # Set the link's anchor as in "index.html#anchor".
+    # See RFC3986 for details (http://www.ietf.org/rfc/rfc3986.txt).
+    # @api public
+    # @param value [String] the anchor or fragement of the link
+    def fragment=(value)
+      @link_data[:fragment] = value
+    end
+
     # Returns the browser window or browser frame to be used as a target for this link.
     # Example: Links that should be opened in a new window will return "_blank" as their target.
     # @api public
@@ -54,6 +99,14 @@ module RailsConnector
       @link_data[:target]
     end
 
+    # Set the browser window or browser frame to be used as a target for this link.
+    # Example: Links that should be opened in a new window will return "_blank" as their target.
+    # @api public
+    # @param value [String] the target of the link
+    def target=(value)
+      @link_data[:target] = value
+    end
+
     def id
       @link_data[:link_id]
     end
@@ -62,12 +115,16 @@ module RailsConnector
       @link_data[:tag_name]
     end
 
+    def tag_name=(value)
+      @link_data[:tag_name] = value
+    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
     def file_extension
       if internal?
-        destination_object ? destination_object.file_extension : ""
+        obj ? obj.file_extension : ""
       else
         path = URI.parse(url).path rescue nil
         path.blank? ? "" : File.extname(path)[1..-1] || ""
@@ -76,8 +133,10 @@ module RailsConnector
 
     # Returns the id of the Links' destination_object.
     # @api public
+    # @deprecated use {#obj}.id instead
     def destination_object_id
-      destination
+      deprecation_warning(:destination_object_id, 'obj.id')
+      obj.id
     end
 
     # Returns the title of this Link if it is set.
@@ -86,7 +145,7 @@ module RailsConnector
     # @api public
     def display_title
       dt = title
-      dt = destination_object.display_title if dt.blank? && !external?
+      dt = obj.display_title if dt.blank? && !external?
       dt = url if dt.blank?
       dt
     end
@@ -107,7 +166,7 @@ module RailsConnector
     # An external Link is always active.
     # @api public
     def active?
-      external? || (destination_object && destination_object.active?)
+      external? || (obj && obj.active?)
     end
 
     def external_prefix?
@@ -121,20 +180,46 @@ module RailsConnector
     # Returns the destination object (+Obj+) of this Link. May be nil if the
     # link is external or internal without an existing destination object.
     # @api public
+    # @deprecated use {#obj} instead
     def destination_object
-      @destination_object ||= Obj.find(destination) if resolved_internal?
-    rescue RailsConnector::ResourceNotFound
-      nil
+      deprecation_warning(:destination_object, :obj)
+      obj
+    end
+
+    def html_attribute_snippet
+      parts = []
+      parts << %{alt="#{title}"} if tag_name == 'img' || tag_name == 'input'
+      parts << %{title="#{title}"} if (tag_name == 'a' || tag_name == 'link') && title.present?
+      parts << %{target="#{target}"} if target.present?
+      parts.join(' ')
+    end
+
+    def query_and_fragment
+      str = ''
+      str << "?#{query}" if query.present?
+      str << "##{fragment}" if fragment.present?
+      str
+    end
+
+    def internal_url
+      "objid:#{obj.id}"
+    end
+
+    def external_url
+      external_prefix? ? url.gsub(/external:/, '').strip : url
     end
 
     private
 
     def resolved_internal?
-      internal? && !destination.nil?
+      internal? && !obj.nil?
     end
 
-    def destination
-      @link_data[:destination]
+    def deprecation_warning(method, alternative)
+      ActiveSupport::Deprecation.warn(
+        "[DEPRECATION] The medod #{method} will be removed from the RailsConnector. Please use #{alternative} instead"
+      )
     end
+
   end
 end

data/lib/rails_connector/link_resolvable.rb

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

data/lib/rails_connector/migrations/migrator.rb

@@ -4,10 +4,10 @@ module RailsConnector
       attr_reader :migrations
       attr_reader :workspace_lock
 
-      def initialize
+      def initialize(migration_store=nil, workspace_lock=nil)
         @migrations = determine_migrations
-        @migration_store = MigrationStore.instance
-        @workspace_lock = WorkspaceLock.instance
+        @migration_store = migration_store || MigrationStore.instance
+        @workspace_lock = workspace_lock || WorkspaceLock.instance
 
         validate
       end
@@ -21,6 +21,10 @@ module RailsConnector
         end
       end
 
+      def needs_migration?
+        runnable.present?
+      end
+
       def publish
         remove_workspace_with do
           CmsRestApi.put("workspaces/#{workspace.id}/publish", {})
@@ -122,4 +126,4 @@ module RailsConnector
       end
     end
   end
-end
+end

data/lib/rails_connector/migrations/workspace_lock.rb

@@ -7,8 +7,9 @@ module RailsConnector
 
       def validate(workspace)
         unless exists? && workspace.revision_id == File.read(filename)
-          raise RailsConnectorError.new("Migration Workspace already exists. Please make sure to \
-            publish or discard any changes in the '#{workspace.id}' workspace.")
+          raise RailsConnectorError.new("There is a migration in progress right now. \
+            Please try again after the migration working copy '#{workspace.id}' has \
+            been published or removed.")
         end
       end
 

data/lib/rails_connector/named_link.rb

@@ -24,7 +24,7 @@ module RailsConnector
           related_links.
           flatten(1).
           each_with_object({}) do |link_obj, temp|
-            temp[link_obj.title] = link_obj.destination_object
+            temp[link_obj.title] = link_obj.obj
           end
       end
 

data/lib/rails_connector/obj_data_from_service.rb

@@ -6,6 +6,8 @@ module RailsConnector
     end
 
     def value_and_type_of(attribute_name)
+      return value_and_type_of_widget_pool if attribute_name == BasicObj::WIDGET_POOL_ATTRIBUTE_NAME
+
       value_and_type = @data[attribute_name]
 
       if value_and_type.blank?
@@ -28,6 +30,22 @@ module RailsConnector
 
     private
 
+    def value_and_type_of_widget_pool
+      [value_of_widget_pool, nil]
+    end
+
+    def value_of_widget_pool
+      raw_value_of_widget_pool.dup.tap do |hash|
+        hash.each_pair do |widget_id, raw_widget_data|
+          hash[widget_id] = self.class.new(raw_widget_data)
+        end
+      end
+    end
+
+    def raw_value_of_widget_pool
+      @data[BasicObj::WIDGET_POOL_ATTRIBUTE_NAME].first
+    end
+
     def is_custom_attribute?(attribute_name)
       !attribute_name.starts_with?('_')
     end

data/lib/rails_connector/string_tagging.rb

@@ -0,0 +1,29 @@
+module RailsConnector
+
+  # adds flavour to strings
+  module StringTagging
+
+    # html flavour
+    def self.tag_as_html(string, source)
+      unless string.blank?
+        class << string
+          include RailsConnector::HtmlString
+        end
+        string.source = source
+      end
+      string
+    end
+
+    # markdown flavour
+    def self.tag_as_markdown(string, source)
+      unless string.blank?
+        class << string
+          include RailsConnector::MarkdownString
+        end
+        string.source = source
+      end
+      string
+    end
+  end
+
+end

data/lib/rails_connector/type_computer.rb

@@ -0,0 +1,30 @@
+module RailsConnector
+
+class TypeComputer
+  def initialize(base_class, fallback_class)
+    @base_class, @fallback_class = base_class, fallback_class
+    @type_cache = {}
+  end
+
+  def compute_type(obj_class)
+    @type_cache.fetch(obj_class) { calculate_type(obj_class) }
+  end
+
+  private
+
+  def calculate_type(obj_class)
+    load_class(obj_class) || @fallback_class
+  end
+
+  def load_class(obj_class)
+    klass = obj_class.constantize
+    klass if inherits_from_base?(klass)
+  rescue NameError
+  end
+
+  def inherits_from_base?(klass)
+    klass.ancestors.include?(@base_class) && klass != @base_class
+  end
+end
+
+end

data/lib/widget.rb

@@ -0,0 +1,3 @@
+# Empty implementation for Widget.
+# Only unsed in case the app does not define Widget itself.
+::Widget = Class.new(::RailsConnector::BasicWidget)

metadata

@@ -1,20 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.9.4
-  prerelease: 
+  version: 6.9.5
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC45LjIuMg==
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC45LjIuMg==
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +85,22 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: !binary |-
+          MS41LjY=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: !binary |-
+          MS41LjY=
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +108,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,24 +122,44 @@ extra_rdoc_files: []
 files:
 - .yardopts
 - README
+- app/controllers/cms_controller.rb
 - app/controllers/rails_connector/blobs_controller.rb
+- app/controllers/rails_connector/default_cms_controller.rb
 - app/controllers/rails_connector/objs_controller.rb
 - app/controllers/rails_connector/tasks_controller.rb
 - app/controllers/rails_connector/webservice_controller.rb
 - app/controllers/rails_connector/widget_renderer.rb
 - app/controllers/rails_connector/workspaces_controller.rb
+- app/helpers/cms_helper.rb
+- app/helpers/cms_routing_helper.rb
 - app/helpers/rails_connector/cms_asset_helper.rb
 - app/helpers/rails_connector/cms_tag_helper.rb
+- app/helpers/rails_connector/default_cms_helper.rb
+- app/helpers/rails_connector/default_cms_routing_helper.rb
 - app/helpers/rails_connector/display_helper.rb
 - app/helpers/rails_connector/editing_helper.rb
+- app/helpers/rails_connector/layout_helper.rb
 - app/helpers/rails_connector/marker_helper.rb
+- app/helpers/rails_connector/table_of_contents_helper.rb
 - app/helpers/rails_connector/widget_helper.rb
+- app/models/named_link.rb
+- app/views/cms/_index.html.erb
+- app/views/cms/index.html.erb
+- app/views/errors/403_forbidden.html.erb
+- app/views/errors/410_gone.html.erb
 - 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/cms_routes.rb
+- config/locales/de.rails_connector.errors.yml
+- config/locales/de.rails_connector.lib.yml
 - config/locales/de.rails_connector.models.yml
+- config/locales/de.rails_connector.views.yml
+- config/locales/en.rails_connector.errors.yml
+- config/locales/en.rails_connector.lib.yml
 - config/locales/en.rails_connector.models.yml
+- config/locales/en.rails_connector.views.yml
 - config/routes.rb
 - lib/assets/fonts/infopark_icons-webfont.eot
 - lib/assets/fonts/infopark_icons-webfont.ttf
@@ -102,17 +175,25 @@ files:
 - lib/generators/cms/migration/migration_generator.rb
 - lib/generators/cms/migration/templates/migration.rb
 - lib/infopark_cloud_connector.rb
+- lib/obj.rb
 - lib/rails_connector/access_denied.rb
+- lib/rails_connector/attribute_content.rb
+- lib/rails_connector/authenticable.rb
 - lib/rails_connector/backend_not_available.rb
 - lib/rails_connector/basic_obj.rb
+- lib/rails_connector/basic_widget.rb
 - lib/rails_connector/blob.rb
 - lib/rails_connector/cache.rb
 - lib/rails_connector/cache_middleware.rb
 - lib/rails_connector/client_error.rb
 - lib/rails_connector/cloud_engine.rb
+- lib/rails_connector/cms_accessible.rb
 - lib/rails_connector/cms_backend.rb
 - lib/rails_connector/cms_cache_storage.rb
+- lib/rails_connector/cms_dispatch_controller.rb
+- lib/rails_connector/cms_env.rb
 - lib/rails_connector/cms_rest_api.rb
+- lib/rails_connector/cms_test_request.rb
 - lib/rails_connector/configuration.rb
 - lib/rails_connector/content_conversion.rb
 - lib/rails_connector/content_service.rb
@@ -120,9 +201,14 @@ files:
 - lib/rails_connector/content_state_caching.rb
 - lib/rails_connector/content_state_visitor.rb
 - lib/rails_connector/controller_runtime.rb
+- lib/rails_connector/core_extensions.rb
+- lib/rails_connector/core_extensions/time.rb
 - lib/rails_connector/date_attribute.rb
+- lib/rails_connector/engine.rb
 - 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/log_subscriber.rb
 - lib/rails_connector/migration.rb
 - lib/rails_connector/migrations.rb
@@ -139,36 +225,35 @@ 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/string_tagging.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/migration.rake
+- lib/widget.rb
 homepage: http://www.infopark.de
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -496420947
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Infopark Cloud Connector
 test_files: []
 has_rdoc: yard