infopark_rails_connector 6.8.3.115.227021242 → 6.8.3.174.51542603

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
-## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Alex_P___208/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
+## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Kostia__split_256/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Fri Mar  1 08:24:34 2013 UTC
+## Converted at: Tue Mar  5 15:39:05 2013 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/infopark_rails_connector.rb

@@ -2,6 +2,9 @@ require 'rails_connector/core_extensions'
 
 # @api public
 module ::RailsConnector
+  PLATFORM_CLOUD = :cloud.freeze
+  PLATFORM_FIONA = :fiona.freeze
+
   def self.load_platform_gem_if_present(name)
     if Gem.loaded_specs["infopark_#{name}_connector"]
       gem_name = "infopark_#{name}_connector"
@@ -20,10 +23,18 @@ module ::RailsConnector
   def self.platform
     @platform
   end
+
+  def self.platform_cloud?
+    @platform == PLATFORM_CLOUD
+  end
+
+  def self.platform_fiona?
+    @platform == PLATFORM_FIONA
+  end
 end
 
-RailsConnector::load_platform_gem_if_present(:cloud)
-RailsConnector::load_platform_gem_if_present(:fiona)
+RailsConnector::load_platform_gem_if_present(RailsConnector::PLATFORM_CLOUD)
+RailsConnector::load_platform_gem_if_present(RailsConnector::PLATFORM_FIONA)
 
 unless RailsConnector::platform
   raise "The infopark_rails_connector gem requires "\

data/lib/rails_connector/configuration.rb

@@ -1,6 +1,5 @@
 require "helpful_configuration"
-
-require "rails_connector/cms_base_model"
+require 'rails_connector/cms_base_model' if RailsConnector.platform_fiona?
 require "rails_connector/blob"
 
 module RailsConnector
@@ -42,12 +41,6 @@ module RailsConnector
       # @api public
       attr_writer :search_options
 
-      # Cache also editable workspaces.
-      # Editable workspaces will be cached until the cache is cleared manually.
-      # Should never be used in a production environment.
-      # @api public
-      attr_accessor :cache_editable_workspaces
-
       # Include ReCaptcha tags in user registration form and validate the captcha
       # when creating a new user registration (default: true).
       # @api public
@@ -184,7 +177,7 @@ module RailsConnector
       #   RailsConnector::Configuration.instance_name = 'internet'
       # @api public
       def instance_name=(name)
-        RailsConnector::CmsBaseModel.instance_name = name
+        RailsConnector::CmsBaseModel.instance_name = name if RailsConnector.platform_fiona?
       end
 
       def after_initialize
@@ -206,26 +199,10 @@ module RailsConnector
       end
 
       def configure_cms_database
-        if RailsConnector::CmsBaseModel.superclass.to_s == "ActiveRecord::Base"
-          CmsBaseModel.configure_database("cms")
-        else
-          if local_config_file.configured? 'content_service'
-            @content_service = local_config_file['content_service']
-            Blob.configure(:type => 'service')
-          else
-            CmsBaseModel.configure_database(local_config_file["cms_database"])
-            blob_storage_config = local_config_file["cms_blob_storage"]
-            Blob.configure(blob_storage_config)
-
-            dict_storage_config =
-                if blob_storage_config["type"] == "s3"
-                  cms_dict_storage = local_config_file.with_default({}, "cms_dict_storage")
-                  blob_storage_config.merge(cms_dict_storage)
-                else
-                  local_config_file["cms_dict_storage"]
-                end
-            DictStorage.configure(dict_storage_config)
-          end
+        if RailsConnector.platform_fiona?
+          RailsConnector::CmsBaseModel.configure_database("cms")
+        elsif local_config_file.configured?('content_service')
+          @content_service = local_config_file['content_service']
           RailsConnector::CmsRestApi.credentials = local_config_file["cms_api"].symbolize_keys
         end
       end
@@ -327,7 +304,6 @@ module RailsConnector
 
     # defaults
     self.auto_liquid_editmarkers = true
-    self.cache_editable_workspaces = false
     self.use_recaptcha_on_user_registration = true
     self.ca_file = DEFAULT_CA_FILE
     self.editing_auth{ |env| false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_rails_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.3.115.227021242
+  version: 6.8.3.174.51542603
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -331,7 +331,6 @@ files:
 - lib/rails_connector/engine.rb
 - lib/rails_connector/googlebot_checker.rb
 - lib/rails_connector/html_string.rb
-- lib/rails_connector/infopark_base.rb
 - lib/rails_connector/link_resolvable.rb
 - lib/rails_connector/liquid_support.rb
 - lib/rails_connector/liquid_support/field_value_drop.rb
@@ -363,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -826410701
+      hash: 797911731
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rails_connector/infopark_base.rb

@@ -1,2 +0,0 @@
-# legacy compatablity (CmsBaseModel used to be called InfoparkBase)
-::RailsConnector::InfoparkBase = ::RailsConnector::CmsBaseModel