Merge 65746c2 into 8c5cd55

watermarkchurch · Mar 27, 2020 · d0e3fd6 · d0e3fd6
2 parents 8c5cd55 + 65746c2
commit d0e3fd6
Show file tree

Hide file tree

Showing 34 changed files with 569 additions and 1,013 deletions.
diff --git a/wcc-contentful-app/lib/generators/wcc/templates/wcc_contentful.rb b/wcc-contentful-app/lib/generators/wcc/templates/wcc_contentful.rb
@@ -7,7 +7,7 @@
   # Optional
   config.management_token = # Contentful API management token
   config.default_locale = # Set default locale, if left blank this is 'en-US'
-  config.content_delivery = # :direct, :eager_sync, or :lazy_sync
+  config.store = # :direct, :eager_sync, or :lazy_sync
 end
 
 # Download content types, build models, and sync content

diff --git a/wcc-contentful-app/lib/wcc/contentful/app.rb b/wcc-contentful-app/lib/wcc/contentful/app.rb
@@ -5,7 +5,6 @@
 require_relative './app/rails'
 require_relative './app/exceptions'
 require_relative './app/configuration'
-require_relative './app/middleware/publish_at'
 
 module WCC::Contentful::App
   class << self
@@ -29,13 +28,6 @@ def self.configure
 
     configuration.validate!
 
-    # Inject additional configuration into WCC::Contentful
-    WCC::Contentful.configure do |config|
-      unless config.middleware.any? { |x| x.is_a? WCC::Contentful::App::Middleware::PublishAt }
-        config.middleware << WCC::Contentful::App::Middleware::PublishAt
-      end
-    end
-
     configuration
   end
 

diff --git a/wcc-contentful-app/lib/wcc/contentful/app/middleware/publish_at.rb b/wcc-contentful-app/lib/wcc/contentful/app/middleware/publish_at.rb
diff --git a/wcc-contentful-app/spec/dummy/config/initializers/wcc_contentful.rb b/wcc-contentful-app/spec/dummy/config/initializers/wcc_contentful.rb
@@ -16,8 +16,7 @@
 
   # Optional
   # config.management_token = # Contentful API management token
-  # config.content_delivery = # :direct, :eager_sync, or :lazy_sync
-  # config.sync_store = # :memory, :postgres, or a custom implementation
+  # config.store = # :direct, :eager_sync, or :lazy_sync
 
   config.update_schema_file = :never
 end