buttercms-ruby 2.2 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f315c57a5804e6b7817e7f840f85e406ccccd73021ebdfbb5e84e9fad8ea7475
-  data.tar.gz: aa26b058d512ebf1ff34aa5edef920517a8ba893a775949c1c61b173dc9421a1
+  metadata.gz: 66bbe24c7759a4bbf8c026d8f70f42888e71ef2733cfcc0d02917c0e4049231b
+  data.tar.gz: 2bcbeb00f46e7f8e5039528a7c4cda0d84c12eb26b8af4bfcc40495c83ba4783
 SHA512:
-  metadata.gz: b28741a244c0b3ca0e05adc58518754b65fe6d5713ccb6bd22b1948064db992cc894e0fb9b2e1e38df83fc76e996e2aa0cee3f8badc6dd226406fcfc2548610b
-  data.tar.gz: ac4decef965cc92fadf790ebbb3925a676e3874434c8b192f58f5286aaa10e53dd91d4d74ad6fe28a40fd7c9d5eddc05624719a136fa7167c98847f3d45313ec
+  metadata.gz: eb1dab8986628b6a84233d826e1116f2dad712715c0cfd068e796f7ce1b6f8b124bdbe3324e444f3a9ecea33025a1ba22892cf283ebaabcaba3b052c73bc94e2
+  data.tar.gz: 7b3345cad1de8da899afa6e4cd14acc7e3d0bc09f5a19c6a0798ed7b21fd86ef55d8a08b239811cb1c0a6728e05318605aebcee74ee03ee860accce13d67330a

data/README.md

@@ -134,6 +134,9 @@ ButterCMS::data_store = :yaml, "/File/Path/For/buttercms.store"
 # Use Redis
 ButterCMS::data_store = :redis, ENV['REDIS_URL']
 
+# Use Redis over ssl store
+ButterCMS.data_store = :redis_ssl, ENV["REDIS_URL"], { ca_file: "/path/to/ca.crt" }
+
 # Set logger (optional)
 ButterCMS::logger = MyLogger.new
 ```

data/lib/buttercms/data_store_adapters/redis_ssl.rb

@@ -0,0 +1,27 @@
+begin
+  require 'redis'
+rescue LoadError
+  puts "WARNING: redis >= 3.0.0 is required to use the redis data store."
+  raise
+end
+
+module ButterCMS
+  module DataStoreAdapters
+    class RedisSSL
+      def initialize(options)
+        redis_url = options.first
+        ssl_params = options.second && Hash[options.second]
+
+        @redis = ::Redis.new(url: redis_url, ssl_params:)
+      end
+
+      def set(key, value)
+        @redis.set(key, value)
+      end
+
+      def get(key)
+        @redis.get(key)
+      end
+    end
+  end
+end

data/lib/buttercms/errors.rb

@@ -6,6 +6,9 @@ module ButterCMS
   # NotFound is raised when a resource cannot be found
   class NotFound < Error
   end
+
+  class Unauthorized < Error
+  end
   
   class BadRequest < Error
   end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module ButterCMS
-  VERSION = '2.2'
+  VERSION = '2.4'
 end

data/lib/buttercms-ruby.rb

@@ -59,6 +59,9 @@ module ButterCMS
     when :redis
       require_relative 'buttercms/data_store_adapters/redis'
       @data_store = ButterCMS::DataStoreAdapters::Redis.new(options)
+    when :redis_ssl
+      require_relative 'buttercms/data_store_adapters/redis_ssl'
+      @data_store = ButterCMS::DataStoreAdapters::RedisSSL.new(options)
     else
       raise ArgumentError.new "Invalid ButterCMS data store #{strategy}"
     end
@@ -92,6 +95,8 @@ module ButterCMS
     case response
     when Net::HTTPNotFound
       raise ::ButterCMS::NotFound, JSON.parse(response.body)["detail"]
+    when Net::HTTPUnauthorized
+      raise ::ButterCMS::Unauthorized, JSON.parse(response.body)['detail']
     end
 
     response.body
@@ -130,14 +135,14 @@ module ButterCMS
 
     return JSON.parse(result)
   end
-  
+
   def self.write_request(path, options = {})
     raise ArgumentError.new "Please set your write API token" unless write_api_token
     result = write_api_request(path, options)
 
     return JSON.parse(result)
   end
-  
+
   def self.write_api_request(path, options = {})
     query = options.dup
     token_for_request = query.delete(:auth_token) || write_api_token
@@ -175,9 +180,9 @@ module ButterCMS
 
     response.body
   end
-  
+
   private
-  
+
   def self.http_options
     {
       open_timeout: open_timeout || 2.0,

data/spec/lib/butter-ruby_spec.rb

@@ -50,5 +50,18 @@ describe ButterCMS do
 
       expect(request).to have_been_made
     end
+
+    it "raises Unauthorized on 401" do
+      allow(ButterCMS).to receive(:api_token).and_return("test")
+
+      request = stub_request(:get, %r{/posts/slug/})
+        .with(query: { auth_token: "test" })
+        .to_return(status: 401, body: '{"detail":"Invalid token."}')
+
+      expect { ButterCMS.request("/posts/slug/") }
+        .to raise_error(ButterCMS::Unauthorized)
+
+      expect(request).to have_been_made
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buttercms-ruby
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.4'
 platform: ruby
 authors:
 - ButterCMS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,6 +60,7 @@ files:
 - lib/buttercms/category.rb
 - lib/buttercms/content.rb
 - lib/buttercms/data_store_adapters/redis.rb
+- lib/buttercms/data_store_adapters/redis_ssl.rb
 - lib/buttercms/data_store_adapters/yaml.rb
 - lib/buttercms/errors.rb
 - lib/buttercms/feed.rb
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby API client for ButterCMS