testcloud_devices_ruby 0.0.0.5 → 0.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10adc55bb58e27978441a2ad206c02e13a1625a9
-  data.tar.gz: cbc209601c26cb52172f2d58c90f2ea65dd0abb7
+  metadata.gz: 97d56cd8397ff4a549daa2d977cbe8a306e6b7db
+  data.tar.gz: 1888da4b7f79fb09ecf933bed1312229821d21c4
 SHA512:
-  metadata.gz: 127e358a92ef23983be3ace1f5dc6ddbcb94e3faee2b44056e4a0070587dfae7b05151c92f902c98d17a43cb231a54901cd2799653cf2ddf8121a48471a15fa1
-  data.tar.gz: 2a3d91794e6e9a4ac9a980e90151e0f8c538ff4fc35e20d27b9bc4f95c09caccc989823fb0ea9b218b0dbc5cc8841150ac83ee7029611e5995d8a8fbf2fc7cb7
+  metadata.gz: c24f24e09aa083a7d905f623ecc166153968e43c068ae7f79f03540c94118a012cb5474f4343a9ef9b3395ff374c4e038cae53d47d7bf1e215a2b6232c5be8a6
+  data.tar.gz: f7a63c03a10dc14c7ee0d6fb194b16343ec00bec24c517a27148bb120353d2fc12baa3e278595c5a2c70b3e91c69bde85b004989ab383360c8a8246c30280b40

data/lib/testcloud/devices/client.rb

@@ -1,68 +1,42 @@
-require 'forwardable'
 module Testcloud
   module Devices
     class Client
       include HTTParty
-      extend Forwardable
+      include Testcloud::Devices::Resources
 
-      DEFAULT_URL   ||= 'https://stan.testcloud.io'
       API_TOKEN_KEY ||= 'X-Testcloud-Devices-Token'
 
       attr_accessor :type, :category, :api_token, :raw_response, :response
-      def_delegators :raw_response, :ok?, :success?, :code
+
+      delegate :ok?,        to: :raw_response
+      delegate :success?,   to: :raw_response
+      delegate :code,       to: :raw_response
+      delegate :config,     to: 'Testcloud::Devices::Client'
 
       class << self
+        attr_reader :config
         def setup(&block)
-          yield(self)
-        end
-
-        def api_token=(value)
-          @api_token = value
-        end
-
-        def api_token
-          @api_token
-        end
-
-        def url
-          @url
-        end
-
-        def url=(value)
-          @url = value
+          @config = Testcloud::Devices::Config.new
+          yield(@config)
         end
       end
 
       def initialize(options = {})
         @type, @category = options[:type], options[:category]
         self.class.debug_output if options[:debug]
-        self.class.base_uri(options[:url] || self.class.url || DEFAULT_URL)
-        self.class.api_token = options[:api_token] if options[:api_token]
-      end
-
-      def types
-        @raw_response = self.class.get('/devices/types', access_headers)
-        @response = Response.new(@raw_response).keys
-      end
-
-      def categories
-        @raw_response = self.class.get("/devices/#{type.pluralize}/categories", access_headers)
-        @response = Response.new(@raw_response).keys
-      end
-
-      def validate(data = {})
-        @raw_response = self.class.post("/devices/#{type}/#{category}", access_headers.merge(body: data.to_json))
-        @response = Response.new(@raw_response)
+        self.class.base_uri(options[:url] || config.url || Testcloud::Devices::Config::DEFAULT_URL)
+        config.api_token = options[:api_token] if options[:api_token]
       end
 
-      def form_data
-        @raw_response = self.class.get("/devices/#{type}/#{category}/form_data", access_headers)
-        @response = Response.new(@raw_response)
+      def errors?
+        return true if raw_response.code >= 300
+        return true if response.has_key?(:errors)
+        false
       end
 
       private
         def access_headers
-          @access_headers ||= { headers: { API_TOKEN_KEY => self.class.api_token, 'Content-Type' => 'application/json' } }
+          @access_headers ||= { headers: { API_TOKEN_KEY => config.api_token, 'Content-Type' => 'application/json' } }
         end
 
     end

data/lib/testcloud/devices/config.rb

@@ -0,0 +1,8 @@
+module Testcloud
+  module Devices
+    class Config
+      DEFAULT_URL   ||= 'https://stan.testcloud.io'
+      attr_accessor :api_token, :url
+    end
+  end
+end

data/lib/testcloud/devices/resources.rb

@@ -0,0 +1,42 @@
+module Testcloud
+  module Devices
+    module Resources
+      extend ActiveSupport::Concern
+
+      included do
+
+        # Return all available device types
+        def types
+          @raw_response = self.class.get('/devices/types', access_headers)
+          @response = Response.new(@raw_response).keys
+        end
+
+        # Return all available categories for a given device type
+        def categories
+          @raw_response = self.class.get("/devices/#{type.pluralize}/categories", access_headers)
+          @response = Response.new(@raw_response).keys
+        end
+
+        # Takes device parameters, validates them, and returns the correct device hash
+        # an 'errors' key is always present if anything goes wrong.
+        def validate(data = {})
+          @raw_response = self.class.post("/devices/#{type}/#{category}", access_headers.merge(body: data.to_json))
+          @response = Response.new(@raw_response)
+        end
+
+        # Get form data for a type and category (such as os, os_version, vendor, device models)
+        def form_data
+          @raw_response = self.class.get("/devices/#{type}/#{category}/form_data", access_headers)
+          @response = Response.new(@raw_response)
+        end
+
+        # Submit a device that's missing from the database
+        def report_missing_device(data = {})
+          @raw_response = self.class.post("/devices/report_missing", access_headers.merge(body: data.to_json))
+          @response = Response.new(@raw_response)
+        end
+
+      end
+    end
+  end
+end

data/lib/testcloud/devices/ruby/version.rb

@@ -10,7 +10,7 @@ module Testcloud
         MAJOR = 0
         MINOR = 0
         PATCH = 0
-        PRE   = 5
+        PRE   = 6
         STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze
       end
 

data/lib/testcloud/devices.rb

@@ -1,10 +1,13 @@
 require 'httparty'
 require 'hashie'
 require 'active_support/inflector'
+require 'active_support/core_ext/module'
 
 module Testcloud
   module Devices
     autoload :Client, 'testcloud/devices/client'
+    autoload :Config, 'testcloud/devices/config'
     autoload :Response, 'testcloud/devices/response'
+    autoload :Resources, 'testcloud/devices/resources'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcloud_devices_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.0.5
+  version: 0.0.0.6
 platform: ruby
 authors:
 - John Faucett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,8 @@ extra_rdoc_files: []
 files:
 - lib/testcloud/devices.rb
 - lib/testcloud/devices/client.rb
+- lib/testcloud/devices/config.rb
+- lib/testcloud/devices/resources.rb
 - lib/testcloud/devices/response.rb
 - lib/testcloud/devices/ruby.rb
 - lib/testcloud/devices/ruby/version.rb