infopark_cloud_connector 6.8.0.beta.200.869.9609b39 → 6.8.0.beta.200.883.f5f063b

data/lib/infopark_cloud_connector.rb

@@ -1,5 +1,4 @@
 require 'rails_connector/rack_middlewares'
-require 'rails_connector/couchdb_views_source_path'
 require 'rails_connector/core_extensions'
 require "rails_connector/errors"
 

data/lib/rails_connector/blob.rb

@@ -30,8 +30,6 @@ class Blob
         case config[:type]
         when "s3"
           S3Blob
-        when "couch"
-          CouchBlob
         else
           raise "Unsupported blob storage type #{config[:type]}"
         end

data/lib/rails_connector/chain.rb

@@ -49,11 +49,11 @@ class Chain
   # returns a hash of results from the query.
   # the keys are the criterion by which the query results are grouped (typically the OBJ ID).
   # the values are tuples where
-  # the first element denotes the diff type and
-  # the second the document rows as returned by couchdb.
-  def query(index, key, is_compound_index)
+  # - the first element denotes the diff type and
+  # - the second the document rows
+  def query(index, key)
     self.class.count_query
-    result_map = perform_queries(index, key, is_compound_index)
+    result_map = perform_queries(index, key)
     version_map = result_map.merge(result_map) do |ignore, results|
       results.map {|row| Version.new(row) }
     end
@@ -79,13 +79,12 @@ class Chain
     end
   end
 
-  def perform_queries(index, key, is_compound_index)
+  def perform_queries(index, key)
     result_map = {}
 
     query_options = {
       :hash_value => key,
     }
-    query_options[:range_value_extender] = "/" if is_compound_index
 
     if content_cache.present?
       result_map[:content_cache] = CmsBaseModel.query_index(:obj, index, query_options.merge({

data/lib/rails_connector/cms_base_model.rb

@@ -17,8 +17,6 @@ module RailsConnector
       def configure_database(connection_spec)
         @@cms_database_adapter =
             case connection_spec["type"]
-            when "couch"
-              Kvom::Adapter::CouchdbAdapter.new(connection_spec)
             when "dynamo"
               Kvom::Adapter::DynamodbAdapter.new(connection_spec)
             when "file"
@@ -31,21 +29,18 @@ module RailsConnector
       def query_index(model, index, params = {})
         hash_value = "#{model}/#{index}/#{params[:hash_value]}"
         range_value = params[:range_value] || ""
-        range_value_extender = params[:range_value_extender]
 
         # up to this point: backend independent
 
         # this may be backend dependent (suffix character)
-        if range_value_extender
-          start_key, end_key =
-              case range_value
-              when Range
-                [range_value.begin, range_value.end]
-              else
-                [range_value, range_value]
-              end
-          range_value = Range.new(start_key + range_value_extender, end_key + range_value_extender + "~")
-        end
+        start_key, end_key =
+            case range_value
+            when Range
+              [range_value.begin, range_value.end]
+            else
+              [range_value, range_value]
+            end
+        range_value = Range.new(start_key, end_key + "~")
 
         adapter.query(hash_value, range_value)
       end

data/lib/rails_connector/revision.rb

@@ -97,8 +97,6 @@ module RailsConnector
 
     private
 
-    COMPOUND_KEY_INDICES = [:ppath].freeze
-
     def self.persistent_cache
       Cache.new(:fallback_backend => Rails.cache, :cache_prefix => CACHE_PREFIX)
     end
@@ -110,7 +108,7 @@ module RailsConnector
         "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
       ) do
         keys.map do |key|
-          results = chain.query(index, key, COMPOUND_KEY_INDICES.include?(index))
+          results = chain.query(index, key)
           results.values.map { |row| extract_obj_data(row) }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 22460016053
+  hash: -54897454
   prerelease: 6
   segments: 
   - 6
@@ -9,11 +9,13 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 869
-  - 9609
+  - 883
+  - f
+  - 5
+  - f
+  - 63
   - b
-  - 39
-  version: 6.8.0.beta.200.869.9609b39
+  version: 6.8.0.beta.200.883.f5f063b
 platform: ruby
 authors: 
 - Infopark AG
@@ -21,11 +23,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 +02:00
+date: 2012-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,50 +35,52 @@ dependencies:
         hash: 23
         segments: 
         - 1
-        - 1
-        - 2
-        version: 1.1.2
-  prerelease: false
-  name: couchrest
+        - 3
+        - 6
+        version: 1.3.6
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: aws-sdk
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 1
-        - 3
         - 6
-        version: 1.3.6
-  prerelease: false
-  name: aws-sdk
+        version: "1.6"
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 22460016053
+        hash: -54897454
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 869
-        - 9609
+        - 883
+        - f
+        - 5
+        - f
+        - 63
         - b
-        - 39
-        version: 6.8.0.beta.200.869.9609b39
-  prerelease: false
-  name: kvom
+        version: 6.8.0.beta.200.883.f5f063b
   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: []
@@ -96,8 +99,6 @@ files:
 - lib/rails_connector/cms_base_model.rb
 - lib/rails_connector/content_cache.rb
 - lib/rails_connector/controller_runtime.rb
-- lib/rails_connector/couch_blob.rb
-- lib/rails_connector/couchdb_views_source_path.rb
 - lib/rails_connector/date_attribute.rb
 - lib/rails_connector/default_search_request.rb
 - lib/rails_connector/dict_storage.rb

data/lib/rails_connector/couch_blob.rb

@@ -1,38 +0,0 @@
-module RailsConnector
-
-class CouchBlob
-
-  def self.find(id, options)
-    ActiveSupport::Notifications.instrumenter.instrument("cms_load.rails_connector",
-      :name => "Blob Load", :index => "blobs", :keys => [options[:context]]
-    ) do
-      new(id, CmsBaseModel.adapter.blob_attachment(id))
-    end
-  end
-
-  def self.configure(spec)
-    # connection is taken from CmsBaseModel on demand
-  end
-
-  attr_reader :id, :attachment
-
-  def initialize(id, attachment)
-    @id = id
-    @attachment = attachment
-  end
-
-  def url
-    CmsBaseModel.adapter.blob_url(id)
-  end
-
-  def content_type
-    attachment["content_type"]
-  end
-
-  def length
-    attachment['length']
-  end
-
-end
-
-end # module RailsConnector

data/lib/rails_connector/couchdb_views_source_path.rb

@@ -1,7 +0,0 @@
-#:enddoc:
-module RailsConnector
-  # returns the filesystem path where the sources for the rails connector's couchdb views are stored.
-  def self.couchdb_views_source_path
-    File.expand_path("../../../db/views", __FILE__)
-  end
-end