contentful_redis 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857d3794b9bb00ab99eabfe2d64f95ba6948ff91
-  data.tar.gz: 3720c767ba68698997c89f877356011a144391a6
+  metadata.gz: 62a28f375b611866f2162e41ce48de3153c1c518
+  data.tar.gz: 895170f66e0f439d888a23af31936eae7a1b6657
 SHA512:
-  metadata.gz: db7d42e5a30c46d4355350d4529eba47e92d8fc1554a694cb17b9f4860d27bf232429308f7022a453a3769ce3d0ac2dd40b5b15650087b6f269c319fd9bcac22
-  data.tar.gz: b5c378a0b0699cfca7f669383238246e7782a838c5538e84121fcd598789a9815fcfc8854b1e8492d6d6b10ec62910cdf9e772f1746dc379bd1baddb2b233883
+  metadata.gz: aa9329a954e232b52f95055fcb78bb54c5e52c62586e87fce92a2dba57b498e5a72697c59b294960221f3337c74a55409b4932ee9fdd016d5f5a54a31b4f0bed
+  data.tar.gz: a4a9588e5ffe49506e59cb5d51a4c0fa0ca198b426a11f5a4ca1cf6eee1df44e4cf33d77e95d53ac9485dd28845feb5ee04398922911ae55c0c9f722920ff9ea

data/.rubocop.yml

@@ -19,7 +19,7 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 Metrics/AbcSize:
-  Max: 25
+  Max: 28
 Style/SymbolArray:
   Enabled: false
 Style/WordArray:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contentful_redis (0.0.2)
+    contentful_redis (0.1.0)
       faraday
       redis-store
 
@@ -42,8 +42,8 @@ GEM
     public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (12.3.1)
-    redis (4.0.2)
-    redis-store (1.5.0)
+    redis (4.0.3)
+    redis-store (1.6.0)
       redis (>= 2.2, < 5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/README.md

@@ -180,6 +180,19 @@ These attributes are defined in the class declaration as `define_searchable_fiel
   Contentful::Page.find_by(slug: 'about-us') 
 ```
 
+Deleting an entry is done by calling destroy on a ContentfulRedis model object or destroy by passing id. This will delete all the redis keys, find and search keys for the entry.
+
+```ruby
+  Contentful::Page.destroy('<contentful_uid>')
+```
+
+or
+
+```ruby
+  page = Contentful::Page.find('<contentful_uid>')
+  page.destroy
+```
+
 ### Content model overriding
 
 Classes should match their content model name, however, if they don't you can override the classes `#name` method.

data/contentful-redis.gemspec

@@ -7,7 +7,7 @@ require 'contentful_redis'
 Gem::Specification.new do |spec|
   spec.name          = 'contentful_redis'
   spec.version       = ContentfulRedis::VERSION
-  spec.authors       = ['DanHenton']
+  spec.authors       = ['DanHenton', 'Edwin Rozario']
   spec.email         = ['Dan.Henton@gmail.com']
 
   spec.summary       = 'Contentful api wrapper which caches responses from contentful'

data/lib/contentful_redis.rb

@@ -6,7 +6,7 @@ require_relative 'contentful_redis/model_base'
 # Dir["#{Dir.pwd}/lib/contentful_redis/**/*.rb"].each { |f| require f }
 
 module ContentfulRedis
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.1.0'.freeze
 
   class << self
     attr_writer :configuration

data/lib/contentful_redis/model_base.rb

@@ -9,8 +9,12 @@ require_relative 'class_finder'
 # Base class for contentful redis intergation.
 module ContentfulRedis
   class ModelBase
+    attr_accessor :id
+
     class << self
       def find(id, env = nil)
+        raise ContentfulRedis::Error::ArgumentError, 'Expected Contentful model ID' unless id.is_a?(String)
+
         parameters = { 'sys.id': id, content_type: content_model }
 
         new(ContentfulRedis::Request.new(space, parameters, :get, request_env(env)).call)
@@ -36,14 +40,7 @@ module ContentfulRedis
       end
 
       def destroy(id, env = nil)
-        keys = []
-        keys << ContentfulRedis::KeyManager.content_model_key(space, request_env(env), 'sys.id': id, content_type: content_model)
-
-        searchable_fields.each do |field|
-          keys << ContentfulRedis::KeyManager.attribute_index(self, field)
-        end
-
-        ContentfulRedis.redis.del(*keys)
+        find(id, env).destroy
       end
 
       def space
@@ -72,8 +69,7 @@ module ContentfulRedis
     end
 
     def initialize(model)
-      instance_variable_set(:@id, model['items'].first.dig('sys', 'id'))
-      self.class.send(:attr_reader, :id)
+      @id = model['items'].first.dig('sys', 'id')
 
       entries = entries_as_objects(model)
 
@@ -87,18 +83,42 @@ module ContentfulRedis
                   value
                 end
 
-        instance_variable_set("@#{key.underscore}", value)
+        instance_variable_set("@#{key.underscore}", value) unless value.nil?
       end
 
       create_searchable_attribute_links if self.class.searchable_fields.any?
     end
 
+    def destroy
+      keys = [
+        ContentfulRedis::KeyManager.content_model_key(
+          self.class.space,
+          endpoint,
+          'sys.id': id,
+          content_type: self.class.content_model,
+          include: 1
+        )
+      ]
+
+      self.class.send(:searchable_fields).each do |field|
+        keys << ContentfulRedis::KeyManager.attribute_index(self.class, send(field.to_sym))
+      end
+
+      ContentfulRedis.redis.del(*keys)
+    end
+
     def content_type
       self.class.name.demodulize.underscore
     end
 
     private
 
+    def endpoint
+      env = self.class.send(:request_env, nil)
+
+      env.to_s.downcase == 'published' ? 'cdn' : 'preview'
+    end
+
     def entries_as_objects(model)
       entries = model.dig('includes', 'Entry')
 
@@ -108,24 +128,25 @@ module ContentfulRedis
         type = entry.dig('sys', 'contentType', 'sys', 'id')
         id = entry.dig('sys', 'id')
 
-        hash[id] = ContentfulRedis::ClassFinder.search(type).find(id)
-      end
+        # Catch references to deleted or archived content.
+        begin
+          hash[id] = ContentfulRedis::ClassFinder.search(type).find(id)
+        rescue ContentfulRedis::Error::RecordNotFound => _e
+          next
+        end
+      end.compact
     end
 
     def extract_object_from_hash(model, value, entries)
       entry_id = value.dig('sys', 'id')
 
       assets = model.dig('includes', 'Asset')
-      asset = if !assets.nil? && assets.is_a?(Array)
-                model.dig('includes', 'Asset').first
-              end
+      asset = assets.first if !assets.nil? && assets.is_a?(Array)
 
       if entries.key?(entry_id)
         entries[entry_id]
       elsif !asset.nil?
         ContentfulRedis::Asset.new(asset)
-      else
-        value
       end
     end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: contentful_redis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - DanHenton
+- Edwin Rozario
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday