infopark_cloud_connector 6.8.0.beta.200.809.bdfa8c3 → 6.8.0.beta.200.856.8c0fec5

data/lib/rails_connector/cms_base_model.rb

@@ -21,6 +21,8 @@ module RailsConnector
               Kvom::Adapter::CouchdbAdapter.new(connection_spec)
             when "dynamo"
               Kvom::Adapter::DynamodbAdapter.new(connection_spec)
+            when "file"
+              Kvom::Adapter::FilesystemAdapter.new(connection_spec)
             else
               raise "Unexpected database type #{connection_spec["type"]}"
             end

data/lib/rails_connector/revision.rb

@@ -13,12 +13,16 @@ module RailsConnector
     property :editable
 
     # Selects the revision with the given id as current revision
-    def self.current=(revision)
-      @current = revision
+    def self.current=(revision_or_proc)
+      @current = revision_or_proc
     end
 
     def self.current
-      @current || default
+      if @current.respond_to? :call
+        @current = @current.call
+      else
+        @current || default
+      end
     end
 
     def self.find_by_label(label_name)

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -11,8 +11,10 @@ class WorkspaceSelectionMiddleware
 
   def call(env)
     handle_workspace_parameter(env)
-    Revision.current = workspace_to_show(env)
-
+    preview_workspace = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
+    Revision.current = proc do
+      preview_workspace ? Revision.find(preview_workspace) : Revision.default
+    end
     @app.call(env)
   end
 
@@ -28,14 +30,6 @@ class WorkspaceSelectionMiddleware
     end
   end
 
-  def workspace_to_show(env)
-    if preview_workspace = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
-      Revision.find(preview_workspace)
-    else
-      Revision.default
-    end
-  end
-
   def session(env)
     env[Rack::Session::Abstract::ENV_SESSION_KEY]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 88245288957
+  hash: 990885735
   prerelease: 6
   segments: 
   - 6
@@ -9,12 +9,13 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 809
-  - bdfa
+  - 856
   - 8
   - c
-  - 3
-  version: 6.8.0.beta.200.809.bdfa8c3
+  - 0
+  - fec
+  - 5
+  version: 6.8.0.beta.200.856.8c0fec5
 platform: ruby
 authors: 
 - Infopark AG
@@ -22,11 +23,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 +02:00
+date: 2012-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -38,11 +38,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  prerelease: false
-  name: couchrest
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: couchrest
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -54,32 +54,34 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
-  prerelease: false
-  name: aws-sdk
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: aws-sdk
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 88245288957
+        hash: 990885735
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 809
-        - bdfa
+        - 856
         - 8
         - c
-        - 3
-        version: 6.8.0.beta.200.809.bdfa8c3
-  prerelease: false
-  name: kvom
+        - 0
+        - fec
+        - 5
+        version: 6.8.0.beta.200.856.8c0fec5
   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: []