infopark_cloud_connector 6.8.0.72.d18d096 → 6.8.0.110.6570b45

data/lib/rails_connector/cms_api_search_request.rb

@@ -54,7 +54,7 @@ module RailsConnector
     private
 
     def url
-      "#{@options[:url]}/revisions/#{Revision.current.id}/objs/search"
+      "#{@options[:url]}/revisions/#{Workspace.current.revision_id}/objs/search"
     end
 
     def query

data/lib/rails_connector/cms_backend.rb

@@ -3,7 +3,9 @@ module RailsConnector
   class CmsBackend
 
     def self.current
-      @current ||= DynamoCmsBackend.new
+      @current ||=
+        DynamoCmsBackend.new
+        # ServiceCmsBackend.new
     end
 
     def self.begin_caching
@@ -14,8 +16,8 @@ module RailsConnector
       current.end_caching
     end
 
-    def self.find_obj_data_by(revision, index, keys)
-      current.find_obj_data_by(revision, index, keys)
+    def self.find_obj_data_by(workspace, index, keys)
+      current.find_obj_data_by(workspace, index, keys)
     end
 
     def self.caching?

data/lib/rails_connector/connector_service.rb

@@ -0,0 +1,16 @@
+class ConnectorService
+
+  def self.query(path, payload)
+    MultiJson.load(RestClient::Request.execute(
+      :method => :post,
+      # FIXME
+      :url => "localhost:3001/#{path}",
+      :headers => {
+        :content_type => :json,
+        :accept => :json,
+      },
+      :payload => MultiJson.dump(payload)
+    ))
+  end
+
+end

data/lib/rails_connector/dynamo_cms_backend.rb

@@ -12,7 +12,8 @@ module RailsConnector
       @editable_cache = @read_only_cache = nil
     end
 
-    def find_obj_data_by(revision, index, keys)
+    def find_obj_data_by(workspace, index, keys)
+      revision = workspace.revision
       raw_data =
         if caching?
           find_obj_data_from_cache_or_database_by(revision, index, keys)

data/lib/rails_connector/obj.rb

@@ -99,7 +99,7 @@ module RailsConnector
     # accepts the name of an "obj_by" - view and a list of keys.
     # returns a list of lists of Objs: a list of Objs for each given keys.
     def self.find_objs_by(view, keys) # :nodoc:
-      CmsBackend.find_obj_data_by(Revision.current, view, keys).map do |list|
+      CmsBackend.find_obj_data_by(Workspace.current, view, keys).map do |list|
         list.map { |obj_data| Obj.instantiate(obj_data) }
       end
     end
@@ -434,7 +434,7 @@ module RailsConnector
     # Notice that the ruby class of this Obj instance will NOT change,
     # even if the obj_class in the database has changed.
     def reload
-      obj_data = CmsBackend.find_obj_data_by(Revision.current, :id, [id.to_s]).first.first
+      obj_data = CmsBackend.find_obj_data_by(Workspace.current, :id, [id.to_s]).first.first
       update_data(obj_data)
     end
 

data/lib/rails_connector/obj_data.rb

@@ -6,6 +6,10 @@ module RailsConnector
       value_and_type_of(attribute_name).first
     end
 
+    def type_of(attribute_name)
+      value_and_type_of(attribute_name).second
+    end
+
     def value_and_type_of(attribute_name)
       raise "implement in subclass"
     end
@@ -28,6 +32,8 @@ module RailsConnector
         "date"
       when "title"
         "html"
+      else
+        nil
       end
     end
 

data/lib/rails_connector/obj_data_from_service.rb

@@ -0,0 +1,50 @@
+module RailsConnector
+
+  class ObjDataFromService < ObjData
+    def initialize(data)
+      @data = data
+    end
+
+    def value_and_type_of(attribute_name)
+      value_and_type = @data[attribute_name]
+
+      if value_and_type.blank?
+        if INTERNAL_KEYS.include?(attribute_name)
+          type = type_of_internal(attribute_name)
+          [default_attribute_value(type), type]
+        else
+          raise "Illegal attribute name #{attribute_name}"
+        end
+      elsif value_and_type.length == 1
+        [value_and_type.first, type_of_internal(attribute_name)]
+      else
+        value_and_type
+      end
+    end
+
+    def has_custom_attribute?(attribute_name)
+      !!@data[attribute_name]
+    end
+
+    private
+
+    internal_key_list = %w[
+      last_changed
+      sort_key1
+      sort_key2
+      sort_key3
+      sort_order
+      sort_type1
+      sort_type2
+      sort_type3
+      suppress_export
+      text_links
+      valid_from
+      valid_until
+    ]
+
+    INTERNAL_KEYS = Set.new(internal_key_list.map { |name| "_#{name}" } )
+
+  end
+
+end

data/lib/rails_connector/revision.rb

@@ -10,17 +10,12 @@ module RailsConnector
     property :content_cache_id
     property :editable
 
-    # Selects the revision with the given id as current revision
     def self.current=(revision_or_proc)
-      @current = revision_or_proc
+      raise "Do not use Revision.current=, use Workspace.current= instead."
     end
 
     def self.current
-      if @current.respond_to? :call
-        @current = @current.call
-      else
-        @current || default
-      end
+      raise "Do not use Revision.current, use Workspace.current instead."
     end
 
     def self.find_by_label(label_name)
@@ -28,10 +23,6 @@ module RailsConnector
       find(workspace.revision_id)
     end
 
-    def self.default
-      find_by_label("published")
-    end
-
     def chain
       @chain ||= Chain.build_for(self, content_cache)
     end

data/lib/rails_connector/service_cms_backend.rb

@@ -0,0 +1,48 @@
+require 'rest_client'
+
+module RailsConnector
+
+  # connects the cloud connector to the connector service
+  class ServiceCmsBackend < CmsBackend
+
+    def begin_caching
+      # TODO
+    end
+
+    def end_caching
+      # TODO
+    end
+
+    def caching?
+      # TODO
+    end
+
+    def find_obj_data_by(workspace, index, keys)
+      raw_data = ConnectorService.query(
+        "objs/query",
+        :queries => keys.map do |key|
+          { :type => index, :param => key }
+        end,
+        :workspace => workspace.id,
+        :revision => workspace.revision.id
+      )
+
+      objs = {}
+      raw_data["objs"].each do |obj|
+        objs[obj["_id"].first] = obj
+      end
+
+      raw_data["results"].map do |query|
+        query["refs"].map do |obj_ref|
+          id = obj_ref["id"]
+
+          # TODO fetch missing ObjData from Service
+          raw_obj_data = objs[id] or raise "Data for Obj with id #{id} missing!"
+          ObjDataFromService.new(raw_obj_data)
+        end
+      end
+    end
+
+  end
+
+end

data/lib/rails_connector/workspace.rb

@@ -6,6 +6,30 @@ class Workspace < CmsBaseModel
 
   property :revision_id
 
+  def self.current=(workspace_or_proc)
+    @current = workspace_or_proc
+  end
+
+  def self.current
+    if @current.respond_to? :call
+      @current = @current.call
+    else
+      @current || default
+    end
+  end
+
+  def self.default
+    find("published")
+  end
+
+  def revision
+    @revision ||= Revision.find(revision_id)
+  end
+
+  def content_cache_id=(cc)
+    revision.content_cache_id = cc
+  end
+
 end
 
 end

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -2,8 +2,8 @@
 module RailsConnector
 
 class WorkspaceSelectionMiddleware
-  CURRENT_WORKSPACE_SESSION_KEY = "infopark_rails_connector-current_workspace_id"
-  CURRENT_WORKSPACE_PARAMS_KEY = "infopark_rails_connector-current_workspace_id"
+  CURRENT_WORKSPACE_SESSION_KEY = '_rc-ws'
+  CURRENT_WORKSPACE_PARAMS_KEY = '_rc-ws'
 
   def initialize(app)
     @app = app
@@ -11,9 +11,17 @@ class WorkspaceSelectionMiddleware
 
   def call(env)
     handle_workspace_parameter(env)
-    preview_workspace = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
-    Revision.current = proc do
-      preview_workspace ? Revision.find(preview_workspace) : Revision.default
+    workspace_id = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
+    Workspace.current = proc do
+      if workspace_id
+        begin
+          Workspace.find(workspace_id)
+        rescue Kvom::NotFound
+          Workspace.default
+        end
+      else
+        Workspace.default
+      end
     end
     @app.call(env)
   end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 300142121
-  prerelease: 9
+  hash: 910834687
+  prerelease: 14
   segments: 
   - 6
   - 8
   - 0
-  - 72
-  - d
-  - 18
-  - d
-  - 96
-  version: 6.8.0.72.d18d096
+  - 110
+  - 6570
+  - b
+  - 45
+  version: 6.8.0.110.6570b45
 platform: ruby
 authors: 
 - Infopark AG
@@ -20,11 +19,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 +02:00
+date: 2012-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,11 +34,11 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
-  name: aws-sdk
   version_requirements: *id001
+  name: aws-sdk
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,30 +49,30 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  name: rest-client
   version_requirements: *id002
+  name: rest-client
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 300142121
+        hash: 910834687
         segments: 
         - 6
         - 8
         - 0
-        - 72
-        - d
-        - 18
-        - d
-        - 96
-        version: 6.8.0.72.d18d096
-  name: kvom
+        - 110
+        - 6570
+        - b
+        - 45
+        version: 6.8.0.110.6570b45
   version_requirements: *id003
+  name: kvom
   prerelease: false
+  type: :runtime
 description: The Cloud Connector for Infopark CMS Fiona enables you to develop modern, dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS managed content.
 email: info@infopark.de
 executables: []
@@ -92,6 +90,7 @@ files:
 - lib/rails_connector/cms_api_search_request.rb
 - lib/rails_connector/cms_backend.rb
 - lib/rails_connector/cms_base_model.rb
+- lib/rails_connector/connector_service.rb
 - lib/rails_connector/content_cache.rb
 - lib/rails_connector/controller_runtime.rb
 - lib/rails_connector/date_attribute.rb
@@ -108,11 +107,13 @@ files:
 - lib/rails_connector/obj_data.rb
 - lib/rails_connector/obj_data_from_database.rb
 - lib/rails_connector/obj_data_from_hash.rb
+- lib/rails_connector/obj_data_from_service.rb
 - lib/rails_connector/path_conversion.rb
 - lib/rails_connector/permission.rb
 - lib/rails_connector/rack_middlewares.rb
 - lib/rails_connector/revision.rb
 - lib/rails_connector/s3_blob.rb
+- lib/rails_connector/service_cms_backend.rb
 - lib/rails_connector/version.rb
 - lib/rails_connector/workspace.rb
 - lib/rails_connector/workspace_selection_middleware.rb