infopark_cloud_connector 6.8.0.210.ed204b0 → 6.8.0.322.c003f11

data/lib/rails_connector/obj_data_from_database.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
   class ObjDataFromDatabase < ObjData

data/lib/rails_connector/obj_data_from_hash.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
   class ObjDataFromHash < ObjData

data/lib/rails_connector/obj_data_from_service.rb

@@ -23,13 +23,18 @@ module RailsConnector
     end
 
     def has_custom_attribute?(attribute_name)
-      !!@data[attribute_name]
+      is_custom_attribute?(attribute_name) && !!@data[attribute_name]
     end
 
     private
 
+    def is_custom_attribute?(attribute_name)
+      !attribute_name.starts_with?('_')
+    end
+
     internal_key_list = %w[
       last_changed
+      permalink
       sort_key1
       sort_key2
       sort_key3

data/lib/rails_connector/path_conversion.rb

@@ -1,6 +1,6 @@
 module RailsConnector
 
-  module PathConversion #:nodoc: all
+  module PathConversion
 
     def self.path_from_list(components)
       if components

data/lib/rails_connector/revision.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
   class Revision < CmsBaseModel

data/lib/rails_connector/s3_blob.rb

@@ -7,17 +7,6 @@ class S3Blob
       @s3_objects ||= bucket.objects
     end
 
-    def bucket
-      s3_api.buckets[bucket_name]
-    end
-
-    def s3_api
-      AWS::S3.new(
-        :access_key_id => access_key_id,
-        :secret_access_key => secret_access_key
-      )
-    end
-
     def bucket_url
       @cached_bucket_url ||= bucket.url
     end
@@ -27,6 +16,7 @@ class S3Blob
 
       # invalidate cache
       @cached_bucket_url = nil
+      @s3_objects = nil
     end
 
     def find(id)
@@ -37,6 +27,17 @@ class S3Blob
 
     attr_reader :spec
 
+    def s3_api
+      AWS::S3.new(
+        :access_key_id => access_key_id,
+        :secret_access_key => secret_access_key
+      )
+    end
+
+    def bucket
+      s3_api.buckets[bucket_name]
+    end
+
     def bucket_name
       spec[:bucket_name]
     end
@@ -58,7 +59,7 @@ class S3Blob
   end
 
   def s3_object
-    @s3_object = self.class.s3_objects[id]
+    @s3_object ||= self.class.s3_objects[id]
   end
 
   def url
@@ -71,6 +72,10 @@ class S3Blob
     "#{self.class.bucket_url}#{@id}"
   end
 
+  def meta_url
+    url
+  end
+
   def content_type
     s3_object.content_type
   end

data/lib/rails_connector/service_blob.rb

@@ -0,0 +1,48 @@
+module RailsConnector
+
+# TODO Caching:
+# unlimited urls: ewig
+# limited urls: zeitlimit - x (x fuer mindestverwendbarkeitszeit)
+class ServiceBlob
+
+  class << self
+
+    def configure(config)
+    end
+
+    def find(id)
+      new(id)
+    end
+
+  end
+
+  attr_reader :id
+
+  def initialize(id)
+    @id = id
+  end
+
+  def url
+    raw_data["url"]
+  end
+
+  def content_type
+    meta_data[:content_type]
+  end
+
+  def length
+    meta_data[:content_length].to_i
+  end
+
+  private
+
+  def raw_data
+    @raw_data ||= ContentService.query("blobs/query", :blob_ids => [id])["blobs"][id]
+  end
+
+  def meta_data
+    @meta_data ||= RestClient.head(raw_data["meta_url"]).headers
+  end
+end
+
+end

data/lib/rails_connector/service_cms_backend.rb

@@ -81,27 +81,32 @@ module RailsConnector
 
     def find_raw_data_from_database_by(workspace_data, index, keys)
       return [] if keys.blank?
-      @query_counter += 1
-      raw_data = ContentService.query(
-        "objs/query",
-        :queries => keys.map do |key|
-          { :type => index, :param => key }
-        end,
-        :workspace_id => workspace_data.id,
-        :revision_id => workspace_data.revision_id
-      )
-
-      objs = {}
-      raw_data["objs"].each do |obj|
-        objs[obj["_id"].first] = obj
-      end
+      instrumenter = ActiveSupport::Notifications.instrumenter
+      instrumenter.instrument(
+        "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
+      ) do
+        @query_counter += 1
+        raw_data = ContentService.query(
+          "objs/query",
+          :queries => keys.map do |key|
+            { :type => index, :param => key }
+          end,
+          :workspace_id => workspace_data.id,
+          :revision_id => workspace_data.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"]
+        raw_data["results"].map do |query|
+          query["refs"].map do |obj_ref|
+            id = obj_ref["id"]
 
-          # TODO fetch missing ObjData from Service
-          objs[id] or raise "Data for Obj with id #{id} missing!"
+            # TODO fetch missing ObjData from Service
+            objs[id] or raise "Data for Obj with id #{id} missing!"
+          end
         end
       end
     end

data/lib/rails_connector/version.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
 class Version

data/lib/rails_connector/workspace.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
 class Workspace

data/lib/rails_connector/workspace_data_from_database.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
 class WorkspaceDataFromDatabase < CmsBaseModel

data/lib/rails_connector/workspace_data_from_service.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
 class WorkspaceDataFromService

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -1,4 +1,3 @@
-#:enddoc:
 module RailsConnector
 
 class WorkspaceSelectionMiddleware

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -847135200
+  hash: 846608086
   prerelease: 10
   segments: 
   - 6
   - 8
   - 0
-  - 210
-  - ed
-  - 204
-  - b
-  - 0
-  version: 6.8.0.210.ed204b0
+  - 322
+  - c
+  - 3
+  - f
+  - 11
+  version: 6.8.0.322.c003f11
 platform: ruby
 authors: 
 - Infopark AG
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 +01:00
+date: 2012-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,17 +60,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -847135200
+        hash: 846608086
         segments: 
         - 6
         - 8
         - 0
-        - 210
-        - ed
-        - 204
-        - b
-        - 0
-        version: 6.8.0.210.ed204b0
+        - 322
+        - c
+        - 3
+        - f
+        - 11
+        version: 6.8.0.322.c003f11
   version_requirements: *id003
   name: kvom
   prerelease: false
@@ -81,9 +81,11 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- app/helpers/rails_connector/marker_helper.rb
+extra_rdoc_files: []
+
 files: 
+- .yardopts
+- README
 - app/helpers/rails_connector/marker_helper.rb
 - lib/infopark_cloud_connector.rb
 - lib/rails_connector/blob.rb
@@ -108,7 +110,6 @@ files:
 - lib/rails_connector/log_subscriber.rb
 - lib/rails_connector/named_link.rb
 - lib/rails_connector/obj.rb
-- lib/rails_connector/obj_body.rb
 - lib/rails_connector/obj_data.rb
 - lib/rails_connector/obj_data_from_database.rb
 - lib/rails_connector/obj_data_from_hash.rb
@@ -118,21 +119,20 @@ files:
 - lib/rails_connector/rack_middlewares.rb
 - lib/rails_connector/revision.rb
 - lib/rails_connector/s3_blob.rb
+- lib/rails_connector/service_blob.rb
 - lib/rails_connector/service_cms_backend.rb
 - lib/rails_connector/version.rb
 - lib/rails_connector/workspace.rb
 - lib/rails_connector/workspace_data_from_database.rb
 - lib/rails_connector/workspace_data_from_service.rb
 - lib/rails_connector/workspace_selection_middleware.rb
-has_rdoc: true
+has_rdoc: yard
 homepage: http://www.infopark.de
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-- --title
-- Infopark Cloud Connector
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/rails_connector/obj_body.rb

@@ -1,60 +0,0 @@
-module RailsConnector
-
-module ObjBody
-  # Returns the body (main content) of the Obj for non-binary Objs.
-  # Returns nil for binary Objs.
-  def body
-    if binary?
-      nil
-    else
-      StringTagging.tag_as_html(read_attribute('body'), self)
-    end
-  end
-
-  # for binary Objs body_length equals the file size
-  # for non-binary Objs body_length equals the number of characters in the body (main content)
-  def body_length
-    if binary?
-      blob = find_blob
-      blob ? blob.length : 0
-    else
-      (body || "").length
-    end
-  end
-
-  # returns an URL to retrieve the Obj's body for binary Objs.
-  # returns nil for non-binary Objs.
-  def body_data_url
-    if binary?
-      blob = find_blob
-      blob.url if blob
-    end
-  end
-
-  def body_data_path # :nodoc:
-    # not needed/supported when using cloud connector.
-    nil
-  end
-
-  # returns the content type of the Obj's body for binary Objs.
-  # returns nil for non-binary Objs.
-  def body_content_type
-    if binary?
-      blob = find_blob
-      if blob
-        blob.content_type
-      else
-        "application/octet-stream"
-      end
-    end
-  end
-
-  private
-
-  def find_blob
-    blob_spec = read_attribute('blob')
-    Blob.find(blob_spec["id"]) if blob_spec
-  end
-end
-
-end # module RailsConnector