cloudflair 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381b97720e882dc8ee8d05e5336f19839650f1df
-  data.tar.gz: b43756bfe13ca34d5a02d88d81431492a04a07b6
+  metadata.gz: 5544a93b5a42bf842ac8e55baa5d7fcb4bc19702
+  data.tar.gz: 7664480c03564666fb4ab299aa8c75a51357cddd
 SHA512:
-  metadata.gz: af84248ed5de70250c0283dec79973c0dc09004ded9e4caf83db88226701471931780f9682d43e33be719c917b01fd835014f6a8aa97f590b5c506ab88435a30
-  data.tar.gz: c7fd3d70509c80edb7a8204654d078ad4c067057b3b45813d50ec4d4efeb70a1860538abdef76d87ba0943de828f47911bc2a57bc5a86f6532f0e8d831bc3c44
+  metadata.gz: 48a1afcdf0395bf0fe4c71e298861ab67f2b1435dde27f8b4653f3bd53941a8720e3a4c52ffacfe9adafab3e0f0eb14f197479495b530dd4c91e2a1fb294f8e0
+  data.tar.gz: 13f6ad242a69ad4991ea15e39382c38e26b1e0f0219e4435025925ffaeff81d9e633b343ad87e75eb021394a296f7e8821f297c60450cd4b50430cc227146a2c

data/README.md

@@ -43,6 +43,8 @@ Cloudflair.configure do |config|
   # these are optional:
   config.cloudflare.api_base_url = 'https://your_cloudflare_mock.local'
   config.faraday.adapter = :your_preferred_faraday_adapter
+  # built-in options: :logger, :detailed_logger; default: nil
+  config.faraday.logger = :logger
 end
 ```
 

data/cloudflair.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '~> 0.9.0'
   spec.add_runtime_dependency 'faraday_middleware', '~> 0.10.0'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
+  spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/cloudflair/api/zone/purge_cache.rb

@@ -10,18 +10,26 @@ module Cloudflair
       @zone_id = zone_id
     end
 
-    def purge_all_files(purge_everything=false)
-      response connection.delete path, purge_everything: purge_everything
+    ##
+    # @param purge_everything must be set to true
+    def everything(purge_everything)
+      resp = connection.delete(path) { |req| req.body = { purge_everything: purge_everything } }
+      response resp
+      self
     end
 
     ##
     # @param [Hash] cache_identifier Consists of :files and :tags, which are String Arrays themselves. Sample: <code>{files: ['https://foo.bar/index.htmll'], tags: ['css','js']}
-    def purge(cache_identifier = {})
+    def selective(cache_identifier = {})
+      return self if cache_identifier.nil? || cache_identifier.empty?
 
+      resp = connection.delete(path) { |req| req.body = cache_identifier }
+      response resp
+      self
     end
 
-    def connection
-      Connection.new
+    def path
+      "zones/#{zone_id}/purge_cache"
     end
   end
 end

data/lib/cloudflair/api/zone/settings/development_mode.rb

@@ -7,15 +7,11 @@ module Cloudflair
     attr_accessor :zone_id
 
     patchable_fields :value
+    path 'zones/:zone_id/settings/development_mode'
 
     def initialize(zone_id)
       @zone_id = zone_id
     end
 
-    private
-
-    def path
-      "zones/#{zone_id}/settings/development_mode"
-    end
   end
 end

data/lib/cloudflair/api/zone.rb

@@ -1,11 +1,8 @@
 require 'cloudflair/api/zone/settings'
+require 'cloudflair/api/zone/purge_cache'
 require 'cloudflair/entity'
 
 module Cloudflair
-  def self.zone(zone_id)
-    Zone.new zone_id
-  end
-
   class Zone
     include Cloudflair::Entity
 
@@ -13,6 +10,7 @@ module Cloudflair
 
     patchable_fields :paused, :vanity_name_servers, :plan
     deletable true
+    path 'zones/:zone_id'
 
     def initialize(zone_id)
       @zone_id = zone_id
@@ -22,10 +20,8 @@ module Cloudflair
       @settings ||= Cloudflair::Settings.new zone_id
     end
 
-    private
-
-    def path
-      "zones/#{zone_id}"
+    def purge_cache
+      @purge_cache ||= Cloudflair::PurgeCache.new zone_id
     end
   end
 end

data/lib/cloudflair/api.rb

@@ -0,0 +1,7 @@
+require 'cloudflair/api/zone'
+
+module Cloudflair
+  def self.zone(zone_id)
+    Zone.new zone_id
+  end
+end

data/lib/cloudflair/communication.rb

@@ -5,6 +5,20 @@ require 'cloudflair/connection'
 module Cloudflair
   module Communication
     def response(response)
+      return nil if response.status == 304
+
+      http_error? response.status
+
+      parse response
+    end
+
+    def connection
+      Cloudflair::Connection.new
+    end
+
+    private
+
+    def parse(response)
       body = response.body
 
       unless body['success']
@@ -15,8 +29,29 @@ module Cloudflair
       body['result']
     end
 
-    def connection
-      Cloudflair::Connection.new
+    def http_error?(status)
+      case status
+      when 200..399 then
+        return
+      when 400 then
+        fail Cloudflair::CloudflairError, '400 Bad Request'
+      when 401 then
+        fail Cloudflair::CloudflairError, '401 Unauthorized'
+      when 403 then
+        fail Cloudflair::CloudflairError, '403 Forbidden'
+      when 429 then
+        fail Cloudflair::CloudflairError, '429 Too Many Requests'
+      when 405 then
+        fail Cloudflair::CloudflairError, '405 Method Not Allowed'
+      when 415 then
+        fail Cloudflair::CloudflairError, '415 Unsupported Media Type'
+      when 400..499 then
+        fail Cloudflair::CloudflairError, "#{status} Request Error"
+      when 500..599 then
+        fail Cloudflair::CloudflairError, "#{status} Remote Error"
+      else
+        fail Cloudflair::CloudflairError, "#{status} Unknown Error Code"
+      end
     end
   end
 end

data/lib/cloudflair/connection.rb

@@ -1,3 +1,7 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'faraday/detailed_logger'
+
 module Cloudflair
   class Connection
     def self.new
@@ -5,7 +9,7 @@ module Cloudflair
 
       Faraday.new(url: config.cloudflare.api_base_url, headers: headers) do |faraday|
         faraday.request :json
-        faraday.response :logger
+        faraday.response config.faraday.adapter if config.faraday.logger
         faraday.response :json, content_type: /\bjson$/
 
         faraday.adapter config.faraday.adapter || Faraday.default_adapter

data/lib/cloudflair/entity.rb

@@ -26,6 +26,14 @@ module Cloudflair
 
         @deletable = deletable
       end
+
+      def path(path = nil)
+        return @path if @path
+
+        fail ArgumentError, 'path is not defined' if path.nil?
+
+        @path = path
+      end
     end
 
     def revert
@@ -132,6 +140,17 @@ module Cloudflair
       self.class.deletable
     end
 
+    def path
+      return @path if @path
+
+      path = self.class.path
+      interpreted_path = path.clone
+      path.scan /:([a-zA-Z_][a-zA-Z0-9_]+[!?=]?)/ do |match, *|
+        interpreted_path.gsub! ":#{match}", send(match).to_s
+      end
+      @path = interpreted_path
+    end
+
     def dirty
       @dirty ||= {}
     end

data/lib/cloudflair/version.rb

@@ -1,3 +1,3 @@
 module Cloudflair
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/cloudflair.rb

@@ -1,6 +1,4 @@
-require 'cloudflair/api/zone'
-require 'cloudflair/communication'
-require 'cloudflair/connection'
+require 'cloudflair/api'
 require 'cloudflair/version'
 require 'dry-configurable'
 
@@ -15,8 +13,11 @@ require 'dry-configurable'
 #   config.cloudflare.auth.user_service_key = 'YOUR_USER_SERVICE_KEY'
 #
 #   # these are optional:
+#
 #   config.cloudflare.api_base_url = 'https://your_cloudflare_mock.local'
 #   config.faraday.adapter = :your_preferred_faraday_adapter
+#   # built-in options: :logger, :detailed_logger; default: nil
+#   config.faraday.logger = :logger
 # end
 # </code>
 module Cloudflair
@@ -34,5 +35,6 @@ module Cloudflair
 
   setting :faraday do
     setting :adapter, :net_http
+    setting :logger
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflair
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christian Mäder
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: faraday-detailed_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,7 @@ files:
 - bin/setup
 - cloudflair.gemspec
 - lib/cloudflair.rb
+- lib/cloudflair/api.rb
 - lib/cloudflair/api/zone.rb
 - lib/cloudflair/api/zone/purge_cache.rb
 - lib/cloudflair/api/zone/settings.rb