contentful_rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f17d46dad767afc329cec1d2b6dac3edf06cdd1
-  data.tar.gz: 4f234bc62f1f847a330be9e7c805a3cf84fa01d8
+  metadata.gz: 287f62b00e44548213d22bc2bd365a1f961324a6
+  data.tar.gz: 280b863df836812bb18113e5ecab529f060c7007
 SHA512:
-  metadata.gz: 7e9b5df096a58ed1fb80c03609509f7939601cd2f41d00adf53c69037989f364b5234e79dba31faca26fecda011913f43acb88ddbdf95831604a04485f049d91
-  data.tar.gz: dd9bfcbc384b5e767799f0c63425fc0bba7a0d1b05b0c28c3b4bf24c0c5daf6548a13cb76e2d4a01448699b6c8755577b0d32a9c882a931bb8f84b7ecf184d86
+  metadata.gz: 6d19254615f19e2d81439f30d165c4d78a444d8dfaa9c93e66652b9b6b4c9818656db82f43712a8440966d30ad602e0ca531e05a2939dc101f4124674ded03cb
+  data.tar.gz: 40857c4ba6cb0565dab16183d8c57d27556a3d0ae6233cd5b2e50da6618466c46e99395767a4b3a6912ed86c13c2f3020a94f2fde7bb696884e1a149ea229cdf

data/app/controllers/contentful_rails/webhooks_controller.rb

@@ -1,10 +1,16 @@
 class ContentfulRails::WebhooksController < ActionController::Base
+  protect_from_forgery with: :exception
+
   if ContentfulRails.configuration.authenticate_webhooks
     http_basic_authenticate_with  name: ContentfulRails.configuration.webhooks_username,
                                   password: ContentfulRails.configuration.webhooks_password
   end
-
-  skip_before_filter :verify_authenticity_token, :only => [:create]
+  params = [:verify_authenticity_token, {:only => [:create], raise: false}]
+  if Rails::VERSION::MAJOR > 4 
+    skip_before_action *params
+  else
+    skip_before_filter *params
+  end
 
   #this is where we receive a webhook, via a POST
   def create
@@ -39,4 +45,4 @@ class ContentfulRails::WebhooksController < ActionController::Base
 
 
 
-end
+end

data/lib/contentful_rails/caching/timestamps.rb

@@ -4,12 +4,8 @@ module ContentfulRails
     # to check the cache for its timestamp before making an expensive API call.
     # Also includes a module method to remove an existing timestamp.
     module Timestamps
-      def self.included(base)
+      def self.prepended(base)
         base.extend ClassMethods
-        base.class_eval do
-          alias_method_chain :updated_at, :caching
-          alias_method_chain :cache_key, :preview
-        end
       end
 
       module ClassMethods
@@ -26,31 +22,28 @@ module ContentfulRails
         end
       end
 
+      def timestamp_cache_key
+        self.class.timestamp_cache_key(id)
+      end
+
 
-      # A replacement method for updated_at(), called when this module is included in ContentfulModel::Base
-      def updated_at_with_caching
+      def updated_at
         if ContentfulRails.configuration.perform_caching && !ContentfulModel.use_preview_api
           Rails.cache.fetch(self.timestamp_cache_key) do
-            updated_at_without_caching
+            super
           end
         else
-          updated_at_without_caching
+          super
         end
       end
 
-      def timestamp_cache_key
-        self.class.timestamp_cache_key(id)
-      end
-
-      def cache_key_with_preview
+      def cache_key
         if ContentfulModel.use_preview_api
-          "preview/#{cache_key_without_preview}"
+          "preview/#{super}"
         else
-          cache_key_without_preview
+          super
         end
       end
-
-
     end
   end
 end

data/lib/contentful_rails/engine.rb

@@ -23,8 +23,10 @@ module ContentfulRails
     #Iterate through all models which inherit from ContentfulModel::Base
     #and add an entry mapping for them, so calls to the Contentful API return
     #the appropriate classes
+    #If eager_load_entry_mapping is false, engine assumes entry mapping is set manually by
+    #ContentfulRails.contentful_options[:entry_mapping] (passed through to Contentful.entry_mapping config)
     initializer "add_entry_mappings", after: :configure_contentful  do
-      if defined?(ContentfulModel)
+      if defined?(ContentfulModel) && ContentfulRails.configuration.eager_load_entry_mapping
         Rails.application.eager_load!
         ContentfulModel::Base.descendents.each do |klass|
           klass.send(:add_entry_mapping)
@@ -48,8 +50,19 @@ module ContentfulRails
       end
     end
 
+    initializer "prepend_timestamps_module", after: :subscribe_to_webhook_events do
+      if defined?(::ContentfulModel)
+        ContentfulModel::Base.send(:prepend, ContentfulRails::Caching::Timestamps)
+      end
+    end
+
     initializer "add_contentful_mime_type" do
-      Mime::Type.register "application/json", :json, ["application/vnd.contentful.management.v1+json"]
+      content_type = "application/vnd.contentful.management.v1+json"
+      Mime::Type.register content_type, :contentful_json, [content_type]
+      default_parsers = Rails::VERSION::MAJOR > 4 ? ActionDispatch::Http::Parameters::DEFAULT_PARSERS : ActionDispatch::ParamsParser::DEFAULT_PARSERS
+      default_parsers[Mime::Type.lookup(content_type)] = lambda do |body|
+        JSON.parse(body)
+      end
     end
 
     initializer "add_preview_support" do
@@ -57,12 +70,5 @@ module ContentfulRails
         include ContentfulRails::Preview
       end
     end
-
-    config.to_prepare do
-      if defined?(::ContentfulModel)
-        ContentfulModel::Base.send(:include, ContentfulRails::Caching::Timestamps)
-      end
-    end
-
   end
 end

data/lib/contentful_rails/version.rb

@@ -1,3 +1,3 @@
 module ContentfulRails
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/contentful_rails.rb

@@ -34,12 +34,14 @@ module ContentfulRails
                   :preview_username,
                   :preview_password,
                   :preview_domain,
-                  :enable_preview_domain
+                  :enable_preview_domain,
+                  :eager_load_entry_mapping
 
     def initialize
       @authenticate = true
       @slug_delimiter = "-"
       @perform_caching = Rails.configuration.action_controller.perform_caching
+      @eager_load_entry_mapping = true
       @contentful_options = {}
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Error Creative Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful_model