ey-core 3.6.4 → 3.6.5

data/lib/ey-core/requests/update_server.rb

@@ -1,29 +1,29 @@
-class Ey::Core::Client
-  class Real
-    def update_server(params={})
-      request(
-        :method => :put,
-        :path   => "/servers/#{params.fetch("id")}",
-        :body   => {"server" => params.fetch("server")},
-      )
-    end
-  end
-
-  class Mock
-    def update_server(params={})
-      server = find(:servers, params.fetch("id"))
-
-      server_params = Cistern::Hash.slice(
-        Cistern::Hash.stringify_keys(params["server"]),
-        "provisioned_at", "deprovisioned_at", "disappeared_at"
-      )
-
-      server.merge!("state" => params["server"]["status"]) if params["server"]["status"]
-      server.merge!(server_params.merge("updated_at" => Time.now))
-
-      response(
-        :body => { "server" => server },
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def update_server(params={})
+      request(
+        :method => :put,
+        :path   => "/servers/#{params.fetch("id")}",
+        :body   => {"server" => params.fetch("server")},
+      )
+    end
+  end
+
+  class Mock
+    def update_server(params={})
+      server = find(:servers, params.fetch("id"))
+
+      server_params = Cistern::Hash.slice(
+        Cistern::Hash.stringify_keys(params["server"]),
+        "provisioned_at", "deprovisioned_at", "disappeared_at"
+      )
+
+      server.merge!("state" => params["server"]["status"]) if params["server"]["status"]
+      server.merge!(server_params.merge("updated_at" => Time.now))
+
+      response(
+        :body => { "server" => server },
+      )
+    end
+  end
+end

data/lib/ey-core/requests/update_ssl_certificate.rb

@@ -1,25 +1,25 @@
-class Ey::Core::Client
-  class Real
-    def update_ssl_certificate(params={})
-      id = params.delete("id")
-
-      request(
-        :method => :put,
-        :path   => "/ssl_certificates/#{id}",
-        :body   => params,
-      )
-    end
-  end
-
-  class Mock
-    def update_ssl_certificate(params={})
-      ssl_certificate = self.find(:ssl_certificates, resource_identity(params))
-
-      ssl_certificate.merge!(params["ssl_certificate"])
-
-      response(
-        :body => {"ssl_certificate" => ssl_certificate}
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def update_ssl_certificate(params={})
+      id = params.delete("id")
+
+      request(
+        :method => :put,
+        :path   => "/ssl_certificates/#{id}",
+        :body   => params,
+      )
+    end
+  end
+
+  class Mock
+    def update_ssl_certificate(params={})
+      ssl_certificate = self.find(:ssl_certificates, resource_identity(params))
+
+      ssl_certificate.merge!(params["ssl_certificate"])
+
+      response(
+        :body => {"ssl_certificate" => ssl_certificate}
+      )
+    end
+  end
+end

data/lib/ey-core/requests/update_untracked_server.rb

@@ -1,24 +1,24 @@
-class Ey::Core::Client
-  class Real
-    def update_untracked_server(params={})
-      request(
-        :method => :put,
-        :path   => "/untracked-servers/#{params.delete("id")}",
-        :body   => params,
-      )
-    end
-  end
-
-  class Mock
-    def update_untracked_server(params={})
-      identity = resource_identity(params) || require_parameters(params["untracked_server"], "id")
-      server  = find(:untracked_servers, identity)
-
-      update_params = Cistern::Hash.slice(params["untracked_server"], "provisioner_id", "location", "state")
-
-      response(
-        :body => { "untracked_server" => server.merge!(update_params) },
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def update_untracked_server(params={})
+      request(
+        :method => :put,
+        :path   => "/untracked-servers/#{params.delete("id")}",
+        :body   => params,
+      )
+    end
+  end
+
+  class Mock
+    def update_untracked_server(params={})
+      identity = resource_identity(params) || require_parameters(params["untracked_server"], "id")
+      server  = find(:untracked_servers, identity)
+
+      update_params = Cistern::Hash.slice(params["untracked_server"], "provisioner_id", "location", "state")
+
+      response(
+        :body => { "untracked_server" => server.merge!(update_params) },
+      )
+    end
+  end
+end

data/lib/ey-core/requests/upload_file.rb

@@ -1,44 +1,44 @@
-class Ey::Core::Client
-  class Real
-    def upload_file(_params={})
-      params = Cistern::Hash.stringify_keys(_params)
-
-      mime_type  = params["mime_type"]
-      upload_url = params["upload_url"]
-
-      if string = params["body"]
-        request(
-          :method  => :put,
-          :headers => {"Content-Type" => mime_type},
-          :url     => upload_url,
-          :body    => string,
-        )
-      else
-        request(
-          :method  => :put,
-          :headers => {"Content-Type" => "multipart/form-data"},
-          :url     => upload_url,
-          :body    => Faraday::UploadIO.new(params.fetch("file"), mime_type),
-        )
-      end
-    end
-  end # Real
-
-  class Mock
-    def upload_file(_params={})
-      params = Cistern::Hash.stringify_keys(_params)
-      upload_url = params["upload_url"]
-
-      temp_file = Tempfile.new("ey-core")
-      temp_file.write(params["body"] || File.read(params.fetch("file")))
-      temp_file.close
-
-      self.data[:temp_files][upload_url] = temp_file.path
-
-      response(
-        :body   => "",
-        :status => 200,
-      )
-    end
-  end # Mock
-end # Ey::Core::Client
+class Ey::Core::Client
+  class Real
+    def upload_file(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+
+      mime_type  = params["mime_type"]
+      upload_url = params["upload_url"]
+
+      if string = params["body"]
+        request(
+          :method  => :put,
+          :headers => {"Content-Type" => mime_type},
+          :url     => upload_url,
+          :body    => string,
+        )
+      else
+        request(
+          :method  => :put,
+          :headers => {"Content-Type" => "multipart/form-data"},
+          :url     => upload_url,
+          :body    => Faraday::UploadIO.new(params.fetch("file"), mime_type),
+        )
+      end
+    end
+  end # Real
+
+  class Mock
+    def upload_file(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+      upload_url = params["upload_url"]
+
+      temp_file = Tempfile.new("ey-core")
+      temp_file.write(params["body"] || File.read(params.fetch("file")))
+      temp_file.close
+
+      self.data[:temp_files][upload_url] = temp_file.path
+
+      response(
+        :body   => "",
+        :status => 200,
+      )
+    end
+  end # Mock
+end # Ey::Core::Client

data/lib/ey-core/requests/upload_recipes_for_environment.rb

@@ -1,28 +1,28 @@
-class Ey::Core::Client
-  class Real
-    def upload_recipes_for_environment(params={})
-      file = params.delete("file")
-      id   = params.delete("id")
-      url  = params.delete("url")
-
-
-      request(
-        :body    => {"file" => Faraday::UploadIO.new(file, "application/x-gzip")},
-        :headers => {"Content-Type" => "multipart/form-data" },
-        :method  => :post,
-        :path    => "environments/#{id}/recipes",
-        :url     => url,
-      )
-    end
-  end
-
-  class Mock
-    def upload_recipes_for_environment(params={})
-      environment = find(:environments, resource_identity(params))
-      environment["custom_recipes"] = "https://#{self.uuid}.s3.amazonaws.com/#{self.uuid}?X-Amz-Expires=1800"
-      self.data[:environments][environment["id"]] = environment
-
-      response(status: 204)
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def upload_recipes_for_environment(params={})
+      file = params.delete("file")
+      id   = params.delete("id")
+      url  = params.delete("url")
+
+
+      request(
+        :body    => {"file" => Faraday::UploadIO.new(file, "application/x-gzip")},
+        :headers => {"Content-Type" => "multipart/form-data" },
+        :method  => :post,
+        :path    => "environments/#{id}/recipes",
+        :url     => url,
+      )
+    end
+  end
+
+  class Mock
+    def upload_recipes_for_environment(params={})
+      environment = find(:environments, resource_identity(params))
+      environment["custom_recipes"] = "https://#{self.uuid}.s3.amazonaws.com/#{self.uuid}?X-Amz-Expires=1800"
+      self.data[:environments][environment["id"]] = environment
+
+      response(status: 204)
+    end
+  end
+end

data/lib/ey-core/response.rb

@@ -1,59 +1,59 @@
-class Ey::Core::Response
-  class Error < StandardError
-    attr_reader :response
-
-    def initialize(response)
-      @response = response
-      super(
-        {
-          :status  => response.status,
-          :headers => response.headers,
-          :body    => response.body,
-          :request => response.request
-        }.inspect
-      )
-    end
-
-    def error_type
-      self.class.name.split(":").last
-    end
-  end
-
-  BadRequest        = Class.new(Error)
-  Conflict          = Class.new(Error)
-  NotFound          = Class.new(Error)
-  RateLimitExceeded = Class.new(Error)
-  Unauthorized      = Class.new(Error)
-  Unexpected        = Class.new(Error)
-  Unprocessable     = Class.new(Error)
-
-  EXCEPTION_MAPPING = {
-    400 => BadRequest,
-    401 => Unauthorized,
-    404 => NotFound,
-    409 => Conflict,
-    422 => Unprocessable,
-    429 => RateLimitExceeded,
-    500 => Unexpected,
-  }
-
-  attr_reader :headers, :status, :body, :request
-
-  def initialize(opts = {})
-    @status  = opts[:status]
-    @headers = opts[:headers]
-    @body    = opts[:body]
-    @request = opts[:request]
-  end
-
-  def successful?
-    self.status >= 200 && self.status <= 299 || self.status == 304
-  end
-
-  def raise!
-    if !successful?
-      raise (EXCEPTION_MAPPING[self.status] || Error).new(self)
-    else self
-    end
-  end
-end
+class Ey::Core::Response
+  class Error < StandardError
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+      super(
+        {
+          :status  => response.status,
+          :headers => response.headers,
+          :body    => response.body,
+          :request => response.request
+        }.inspect
+      )
+    end
+
+    def error_type
+      self.class.name.split(":").last
+    end
+  end
+
+  BadRequest        = Class.new(Error)
+  Conflict          = Class.new(Error)
+  NotFound          = Class.new(Error)
+  RateLimitExceeded = Class.new(Error)
+  Unauthorized      = Class.new(Error)
+  Unexpected        = Class.new(Error)
+  Unprocessable     = Class.new(Error)
+
+  EXCEPTION_MAPPING = {
+    400 => BadRequest,
+    401 => Unauthorized,
+    404 => NotFound,
+    409 => Conflict,
+    422 => Unprocessable,
+    429 => RateLimitExceeded,
+    500 => Unexpected,
+  }
+
+  attr_reader :headers, :status, :body, :request
+
+  def initialize(opts = {})
+    @status  = opts[:status]
+    @headers = opts[:headers]
+    @body    = opts[:body]
+    @request = opts[:request]
+  end
+
+  def successful?
+    self.status >= 200 && self.status <= 299 || self.status == 304
+  end
+
+  def raise!
+    if !successful?
+      raise (EXCEPTION_MAPPING[self.status] || Error).new(self)
+    else self
+    end
+  end
+end

data/lib/ey-core/response_cache.rb

@@ -1,29 +1,29 @@
-class Ey::Core::ResponseCache
-  def initialize(app, options = {}, &block)
-    @app = app
-    @cache = options.fetch(:cache, &block)
-    @cache_key_prefix = options.fetch(:cache_key_prefix, :ey_core)
-  end
-
-  def call(env)
-    # Only cache "safe" requests
-    return @app.call(env) unless [:get, :head].include?(env[:method])
-
-    cache_key = [ @cache_key_prefix, env[:url].to_s ]
-    cached = @cache.read(cache_key)
-
-    if cached
-      env[:request_headers]["If-None-Match"] ||= cached[:response_headers]["Etag"]
-    end
-
-    @app.call(env).on_complete do
-      if cached && env[:status] == 304
-        env[:body] = cached[:body]
-      end
-
-      if !cached && env[:response_headers]["Etag"]
-        @cache.write(cache_key, env)
-      end
-    end
-  end
-end
+class Ey::Core::ResponseCache
+  def initialize(app, options = {}, &block)
+    @app = app
+    @cache = options.fetch(:cache, &block)
+    @cache_key_prefix = options.fetch(:cache_key_prefix, :ey_core)
+  end
+
+  def call(env)
+    # Only cache "safe" requests
+    return @app.call(env) unless [:get, :head].include?(env[:method])
+
+    cache_key = [ @cache_key_prefix, env[:url].to_s ]
+    cached = @cache.read(cache_key)
+
+    if cached
+      env[:request_headers]["If-None-Match"] ||= cached[:response_headers]["Etag"]
+    end
+
+    @app.call(env).on_complete do
+      if cached && env[:status] == 304
+        env[:body] = cached[:body]
+      end
+
+      if !cached && env[:response_headers]["Etag"]
+        @cache.write(cache_key, env)
+      end
+    end
+  end
+end

data/lib/ey-core/subscribable.rb

@@ -1,60 +1,60 @@
-module Ey::Core::Subscribable
-  def self.included(klass)
-    klass.send(:attribute, :read_channel)
-  end
-
-  def read_channel_uri
-    self.read_channel && Addressable::URI.parse(self.read_channel)
-  end
-
-  def subscribe(&block)
-    return false unless read_channel_uri
-
-    gem 'faye', '~> 1.1'
-    require 'faye' # soft dependency
-
-    # Use the same env variable as faraday to activate debug output
-    Faye.logger = Logger.new(STDOUT, level: "DEBUG") if ENV["DEBUG"]
-
-    uri = read_channel_uri
-
-    resource = self
-
-    url          = uri.omit(:query).to_s
-    token        = uri.query_values["token"]
-    subscription = uri.query_values["subscription"]
-
-    EM.run do
-      client = Faye::Client.new(url)
-      client.set_header("Authorization", "Token #{token}")
-      next_ready_check = Time.now + 5
-      handle_output = Proc.new do |m|
-        next_ready_check = Time.now + 1
-        block.call(m)
-      end
-
-      deferred = client.subscribe(subscription) do |message|
-        handle_output.call(JSON.load(message))
-      end
-
-      deferred.callback do
-        handle_output.call({"meta" => true, "created_at" => Time.now,"message" => "log output stream connection established, waiting...\n"})
-      end
-
-      deferred.errback do |error|
-        handle_output.call({"meta" => true, "created_at" => Time.now, "message" => "failed to stream output: #{error.inspect}\n"})
-        EM.stop_event_loop
-      end
-
-      EventMachine::PeriodicTimer.new(1) do
-        if Time.now > next_ready_check
-          if resource.reload.ready?
-            handle_output.call({"meta" => true, "created_at" => Time.now, "message" => "#{resource} finished"})
-            EM.stop_event_loop
-          end
-          next_ready_check = Time.now + 5
-        end
-      end
-    end
-  end
-end
+module Ey::Core::Subscribable
+  def self.included(klass)
+    klass.send(:attribute, :read_channel)
+  end
+
+  def read_channel_uri
+    self.read_channel && Addressable::URI.parse(self.read_channel)
+  end
+
+  def subscribe(&block)
+    return false unless read_channel_uri
+
+    gem 'faye', '~> 1.1'
+    require 'faye' # soft dependency
+
+    # Use the same env variable as faraday to activate debug output
+    Faye.logger = Logger.new(STDOUT, level: "DEBUG") if ENV["DEBUG"]
+
+    uri = read_channel_uri
+
+    resource = self
+
+    url          = uri.omit(:query).to_s
+    token        = uri.query_values["token"]
+    subscription = uri.query_values["subscription"]
+
+    EM.run do
+      client = Faye::Client.new(url)
+      client.set_header("Authorization", "Token #{token}")
+      next_ready_check = Time.now + 5
+      handle_output = Proc.new do |m|
+        next_ready_check = Time.now + 1
+        block.call(m)
+      end
+
+      deferred = client.subscribe(subscription) do |message|
+        handle_output.call(JSON.load(message))
+      end
+
+      deferred.callback do
+        handle_output.call({"meta" => true, "created_at" => Time.now,"message" => "log output stream connection established, waiting...\n"})
+      end
+
+      deferred.errback do |error|
+        handle_output.call({"meta" => true, "created_at" => Time.now, "message" => "failed to stream output: #{error.inspect}\n"})
+        EM.stop_event_loop
+      end
+
+      EventMachine::PeriodicTimer.new(1) do
+        if Time.now > next_ready_check
+          if resource.reload.ready?
+            handle_output.call({"meta" => true, "created_at" => Time.now, "message" => "#{resource} finished"})
+            EM.stop_event_loop
+          end
+          next_ready_check = Time.now + 5
+        end
+      end
+    end
+  end
+end