dawn-api 0.9.0 → 0.10.1

data/lib/dawn/api/{drain.rb → models/drain.rb}

@@ -13,68 +13,51 @@ module Dawn
       @data = data
     end
 
-    def app_id
-      data["app_id"]
-    end
+    data_key :id
+    data_key :created_at
+    data_key :updated_at
+    data_key :url
+    data_key :app_id, "app/id"
 
     def app
       @app ||= App.find(id: app_id)
     end
 
-    def id
-      data["id"]
-    end
-
-    def url
-      data["url"]
-    end
-
     def refresh
-      @data = json_request(
-        expects: 200,
-        method: :get,
+      @data = get(
         path: "/drains/#{id}",
         query: options
       )["drain"]
     end
 
-    def update(options={})
-      request(
-        expects: 200,
-        method: :post,
-        path: "/drains/#{id}",
-        body: options.to_json
-      )
-    end
-
-    def destroy(options={})
-      request(
-        expects: 200,
-        method: :delete,
-        path: "/drains/#{id}",
-        query: options
-      )
+    def destroy(options)
+      Drain.destroy(options.merge(id: id))
     end
 
     def self.all(options={})
-      json_request(
-        expects: 200,
-        method: :get,
+      get(
         path: "/drains",
         query: options
       ).map { |hsh| new hsh["drain"] }
     end
 
     def self.find(options={})
-      id = options.delete(:id)
+      id = id_param(options)
 
-      new json_request(
-        expects: 200,
-        method: :get,
+      new get(
         path: "/drains/#{id}",
         query: options
       )["drain"]
     end
 
+    def self.destroy(options={})
+      id = id_param(options)
+
+      delete(
+        path: "/drains/#{id}",
+        query: options
+      )
+    end
+
   end
 end

data/lib/dawn/api/models/gear.rb

@@ -0,0 +1,79 @@
+require 'dawn/api/base_api'
+
+module Dawn
+  class Gear
+
+    include BaseApi
+
+    attr_reader :data
+    attr_writer :app
+
+    def initialize(data)
+      @app = nil
+      @data = data
+    end
+
+    data_key :id
+    data_key :created_at
+    data_key :updated_at
+    data_key :name
+    data_key :uptime
+    data_key :proctype
+    data_key :number
+    data_key :app_id, "app/id"
+
+    def app
+      @app ||= App.find(id: app_id)
+    end
+
+    def refresh
+      @data = get(
+        path: "/gears/#{id}",
+        query: options
+      )["gear"]
+    end
+
+    def restart(options={})
+      self.class.restart(options.merge(id: id))
+    end
+
+    def destroy(options)
+      self.class.destroy(options.merge(id: id))
+    end
+
+    def self.all(options={})
+      get(
+        path: "/gears",
+        query: options
+      ).map { |d| new d["gear"] }
+    end
+
+    def self.find(options)
+      id = id_param(options)
+
+      new get(
+        path: "/gears/#{id}",
+        query: options
+      )["gear"]
+    end
+
+    def self.restart(options={})
+      self.class.restart(options.merge(id: id))
+
+      post(
+        path: "/gears/#{id}/restart",
+        query: options
+      )
+    end
+
+    def self.destroy(options)
+      id = id_param(options)
+
+      delete(
+        path: "/gears/#{id}",
+        query: options
+      )
+    end
+
+  end
+end

data/lib/dawn/api/models/key.rb

@@ -0,0 +1,63 @@
+require 'dawn/api/base_api'
+
+module Dawn
+  class Key
+
+    include BaseApi
+
+    attr_reader :data
+
+    def initialize(data)
+      @data = data
+    end
+
+    data_key :id
+    data_key :created_at
+    data_key :updated_at
+    data_key :fingerprint
+    data_key :key
+
+    def destroy(options={})
+      self.class.destroy(options.merge(id: id))
+    end
+
+    def self.create(options={})
+      options.fetch(:key)
+
+      new post(
+        path: '/account/keys',
+        body: options.to_json
+      )["key"]
+    end
+
+    def self.all(options={})
+      get(
+        path: '/account/keys',
+        query: options
+      ).map { |hsh| new hsh["key"] }
+    end
+
+    def self.find(options={})
+      id = id_param(options)
+
+      new get(
+        path: "/account/keys/#{id}",
+        query: options
+      )["key"]
+    end
+
+    def self.destroy(options={})
+      id = id_param(options)
+
+      delete(
+        path: "/account/keys/#{id}",
+        query: options
+      )
+    end
+
+    class << self
+      private :new
+    end
+
+  end
+end

data/lib/dawn/api/{login.rb → models/login.rb}

@@ -6,13 +6,11 @@ module Dawn
     include BaseApi
 
     def self.login(options={})
-      json_request(
-        expects: 200,
-        method: :post,
+      post(
         path: '/login',
         body: options.to_json
       )
     end
 
   end
-end
+end

data/lib/dawn/api/models/release.rb

@@ -0,0 +1,52 @@
+require 'dawn/api/base_api'
+
+module Dawn
+  class Release
+
+    include BaseApi
+
+    attr_reader :data
+    attr_writer :app
+
+    def initialize(data)
+      @app = nil
+      @data = data
+    end
+
+    data_key :id
+    data_key :created_at
+    data_key :updated_at
+    data_key :image
+    data_key :app_id, "app/id"
+
+    def app
+      @app ||= App.find(id: app_id)
+    end
+
+    def refresh
+      @data = request(
+        expects: 200,
+        method: :get,
+        path: "/releases/#{id}",
+        query: options
+      )["release"]
+    end
+
+    def self.all(options={})
+      get(
+        path: "/releases",
+        query: options
+      ).map { |hsh| new hsh["release"] }
+    end
+
+    def self.find(options={})
+      id = id_param(options)
+
+      new get(
+        path: "/releases/#{id}",
+        query: options
+      )["release"]
+    end
+
+  end
+end

data/lib/dawn/api/models.rb

@@ -0,0 +1,8 @@
+require 'dawn/api/authenticate'
+require 'dawn/api/models/account'
+require 'dawn/api/models/app'
+require 'dawn/api/models/domain'
+require 'dawn/api/models/drain'
+require 'dawn/api/models/gear'
+require 'dawn/api/models/key'
+require 'dawn/api/models/login'

data/lib/dawn/api/safe/base_api.rb

@@ -0,0 +1,9 @@
+require "dawn/api/safe/safe_extension"
+
+module Dawn
+  module BaseApi
+    module RequestExtension
+      include Dawn::SafeExtension
+    end
+  end
+end

data/lib/dawn/api/safe/safe_extension.rb

@@ -0,0 +1,28 @@
+module Dawn
+  module SafeExtension
+    class SafeContext
+      attr_accessor :last_exception
+
+      def initialize(obj)
+        @obj = obj
+        @last_exception = nil
+      end
+
+      def method_missing(sym, *args, &block)
+        if @obj.respond_to?(sym)
+          begin
+            @obj.send sym, *args, &block
+          rescue => ex
+            self.last_exception = ex
+          end
+        else
+          @obj.method_missing sym, *args, &block
+        end
+      end
+    end
+
+    def safe
+      SafeContext.new(self)
+    end
+  end
+end

data/lib/dawn/api/safe.rb

@@ -0,0 +1,2 @@
+require "dawn/api/safe/base_api"
+require "dawn/api"

data/lib/dawn/api/version.rb

@@ -2,10 +2,10 @@ module Dawn
   module API
     module Version
       MAJOR = 0
-      MINOR = 9
-      PATCH = 0
+      MINOR = 10
+      PATCH = 1
       BUILD = nil
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".").freeze
+      STRING = [[MAJOR, MINOR, PATCH].compact.join("."), BUILD].compact.join("-").freeze
     end
     # backward compatibility
     VERSION = Version::STRING

data/lib/dawn/api.rb

@@ -2,9 +2,5 @@ require 'json'
 
 require 'dawn/api/version'
 require 'dawn/api/authenticate'
-require 'dawn/api/app'
-require 'dawn/api/domain'
-require 'dawn/api/drain'
-require 'dawn/api/gear'
-require 'dawn/api/key'
-require 'dawn/api/login'
+require 'dawn/api/models'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dawn-api
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Blaž Hrastnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -73,20 +73,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
 - lib/dawn/api.rb
-- lib/dawn/api/app.rb
-- lib/dawn/api/app/domains.rb
-- lib/dawn/api/app/drains.rb
-- lib/dawn/api/app/env.rb
-- lib/dawn/api/app/gears.rb
 - lib/dawn/api/authenticate.rb
 - lib/dawn/api/base_api.rb
-- lib/dawn/api/domain.rb
-- lib/dawn/api/drain.rb
-- lib/dawn/api/gear.rb
 - lib/dawn/api/hosts.rb
-- lib/dawn/api/key.rb
-- lib/dawn/api/login.rb
+- lib/dawn/api/models.rb
+- lib/dawn/api/models/account.rb
+- lib/dawn/api/models/app.rb
+- lib/dawn/api/models/app/domains.rb
+- lib/dawn/api/models/app/drains.rb
+- lib/dawn/api/models/app/env.rb
+- lib/dawn/api/models/app/gears.rb
+- lib/dawn/api/models/app/releases.rb
+- lib/dawn/api/models/domain.rb
+- lib/dawn/api/models/drain.rb
+- lib/dawn/api/models/gear.rb
+- lib/dawn/api/models/key.rb
+- lib/dawn/api/models/login.rb
+- lib/dawn/api/models/release.rb
+- lib/dawn/api/safe.rb
+- lib/dawn/api/safe/base_api.rb
+- lib/dawn/api/safe/safe_extension.rb
 - lib/dawn/api/version.rb
 homepage: https://github.com/dawn/dawn-api
 licenses:

data/lib/dawn/api/app.rb

@@ -1,131 +0,0 @@
-require 'dawn/api/hosts'
-require 'dawn/api/base_api'
-require 'dawn/api/app/env'
-require 'dawn/api/app/gears'
-require 'dawn/api/app/drains'
-require 'dawn/api/app/domains'
-
-module Dawn
-  class App
-
-    include BaseApi
-
-    attr_reader :data
-    attr_reader :env
-
-    def initialize(hsh)
-      @data = hsh
-      @env = Env.new(self, @data.delete("env"))
-    end
-
-    def name
-      data["name"]
-    end
-
-    def id
-      data["id"]
-    end
-
-    def formation
-      data["formation"]
-    end
-
-    def git
-      data["git"]
-    end
-
-    def restart(options={})
-      request(
-        expects: 200,
-        method: :delete,
-        path: "/apps/#{id}/gears",
-        query: options
-      )
-    end
-
-    def gears
-      @gears ||= Gears.new self
-    end
-
-    def drains
-      @drains ||= Drains.new self
-    end
-
-    def domains
-      @domains ||= Domains.new self
-    end
-
-    def logs(options={})
-      url = json_request(
-        expects: 200,
-        method: :get,
-        path: "/apps/#{id}/logs",
-        query: options
-      )["logs"]
-      "http://#{Dawn.log_host}#{url}"
-    end
-
-    def update(options={})
-      data.merge!(json_request(
-        expects: 200,
-        method: :patch,
-        path: "/apps/#{id}",
-        body: { name: name }.merge(options).to_json
-      )["app"])
-    end
-
-    def scale(options={})
-      request(
-        expects: 200,
-        method: :post,
-        path: "/apps/#{id}/scale",
-        body: options.to_json
-      )
-    end
-
-    def destroy(options={})
-      request(
-        expects: 200,
-        method: :delete,
-        path: "/apps/#{id}",
-        query: options
-      )
-    end
-
-    def self.all(options={})
-      json_request(
-        expects: 200,
-        method: :get,
-        path: "/apps",
-        query: options
-      ).map { |hsh| new(hsh["app"]) }
-    end
-
-    def self.create(options)
-      new json_request(
-        expects: 200,
-        method: :post,
-        path: '/apps',
-        body: options.to_json
-      )["app"]
-    end
-
-    def self.find(options)
-      path = options[:id] ? "/apps/#{options.delete(:id)}" : "/apps"
-      hsh = json_request(
-        expects: 200,
-        method: :get,
-        path: path,
-        query: options
-      )
-      hsh = hsh.first if hsh.is_a?(Array)
-      hsh && new(hsh["app"])
-    end
-
-    def self.destroy(options)
-      app = find options
-      app.destroy if app
-    end
-
-  end
-end

data/lib/dawn/api/domain.rb

@@ -1,80 +0,0 @@
-require 'dawn/api/base_api'
-
-module Dawn
-  class Domain
-
-    include BaseApi
-
-    attr_reader :data
-    attr_writer :app
-
-    def initialize(data)
-      @app = nil
-      @data = data
-    end
-
-    def app_id
-      data["app_id"]
-    end
-
-    def app
-      @app ||= App.find(id: app_id)
-    end
-
-    def id
-      data["id"]
-    end
-
-    def url
-      data["url"]
-    end
-
-    def refresh
-      @data = json_request(
-        expects: 200,
-        method: :get,
-        path: "/domains/#{id}",
-        query: options
-      )["domain"]
-    end
-
-    def update(options={})
-      request(
-        expects: 200,
-        method: :post,
-        path: "/domains/#{id}",
-        body: options.to_json
-      )
-    end
-
-    def destroy(options={})
-      request(
-        expects: 200,
-        method: :delete,
-        path: "/domains/#{id}",
-        query: options
-      )
-    end
-
-    def self.all(options={})
-      json_request(
-        expects: 200,
-        method: :get,
-        path: "/domains",
-        query: options
-      ).map { |hsh| new hsh["domain"] }
-    end
-
-    def self.find(options)
-      id = options.delete(:id)
-
-      new json_request(
-        expects: 200,
-        method: :get,
-        path: "/domains/#{id}",
-        query: options
-      )["domain"]
-    end
-
-  end
-end