collins_client 0.2.10 → 0.2.11

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 16ab54b81d038f140c59584b761713f4d771c21b
+  data.tar.gz: 0c377aa52c3a063a6e08535372e9acfb14bddc4c
+SHA512: 
+  metadata.gz: 2716ad0b825440c3a212850f9951cb5e67eef0950db86ab251cbbb2ad3c61610e050d6dcdd24a9b9e257ec3c12e2cddf44ce8e98738b1a7ca4150228b05f1c30
+  data.tar.gz: 085a10106bd8c24202858a3bdbc0e0ab492313b56d87d54c07956301d8be3676054545a75f18a610dee4e33283ddb243c667956d8b051eae80f64b28fa9dafba

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/collins_client.gemspec

@@ -5,18 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = "collins_client"
-  s.version = "0.2.10"
+  s.version = File.read 'VERSION'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Blake Matheny"]
-  s.date = "2012-12-17"
+  s.authors = ["Blake Matheny", "Gabe Conradi"]
+  s.date = "2014-08-08"
   s.description = "Provides ruby support for interacting with the Collins API"
-  s.email = "bmatheny@tumblr.com"
+  s.email = ["bmatheny@tumblr.com","gabe@tumblr.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".rbenv-version",
     "Gemfile",
     "Gemfile.lock",
     "README.md",
@@ -28,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/collins/api/admin.rb",
     "lib/collins/api/asset.rb",
     "lib/collins/api/asset_state.rb",
+    "lib/collins/api/asset_type.rb",
     "lib/collins/api/attributes.rb",
     "lib/collins/api/ip_address.rb",
     "lib/collins/api/logging.rb",
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "lib/collins/asset.rb",
     "lib/collins/asset_client.rb",
     "lib/collins/asset_find.rb",
+    "lib/collins/asset_type.rb",
     "lib/collins/asset_update.rb",
     "lib/collins/client.rb",
     "lib/collins/errors.rb",

data/lib/collins/api.rb

@@ -1,6 +1,7 @@
 require 'collins/api/admin'
 require 'collins/api/asset'
 require 'collins/api/asset_state'
+require 'collins/api/asset_type'
 require 'collins/api/attributes'
 require 'collins/api/ip_address'
 require 'collins/api/logging'
@@ -104,6 +105,7 @@ module Collins
     include Collins::Api::Admin
     include Collins::Api::Asset
     include Collins::Api::AssetState
+    include Collins::Api::AssetType
     include Collins::Api::Attributes
     include Collins::Api::IpAddress
     include Collins::Api::Logging

data/lib/collins/api/asset_state.rb

@@ -12,16 +12,25 @@ module Collins; module Api
         :description => description,
         :status => status
       }
+
       if not ::Collins::Api::AssetState.state_test then
         parameters = select_non_empty_parameters parameters
       end
+
       logger.debug("Creating state with name #{name}")
       http_put("/api/state/#{name}", parameters) do |r|
         parse_response r, :expects => 201, :as => :status, :raise => strict?, :default => false
       end
     end
-    def state_delete! name
-      name = validate_state_name name
+
+    def state_delete! state
+      name = validate_state_name case state.class
+      when ::Collins::AssetState
+        state.name
+      else
+        state
+      end
+
       logger.debug("Deleting state with name #{name}")
       http_delete("/api/state/#{name}") do |r|
         parse_response r, :expects => 202, :as => :data, :raise => strict?, :default => 0 do |js|
@@ -29,8 +38,15 @@ module Collins; module Api
         end
       end
     end
-    def state_update! name, options = {}
-      name = validate_state_name name
+
+    def state_update! state, options = {}
+      name = validate_state_name case state.class
+      when ::Collins::AssetState
+        state.name
+      else
+        state
+      end
+
       parameters = {
         :label => options[:label],
         :description => options[:description],
@@ -45,6 +61,7 @@ module Collins; module Api
         parse_response r, :expects => 200, :as => :status, :raise => strict?, :default => false
       end
     end
+
     def state_get name
       name = validate_state_name name
       logger.debug("Fetching state with name #{name}")
@@ -55,6 +72,7 @@ module Collins; module Api
         end
       end
     end
+
     def state_get_all
       http_get("/api/states") do |r|
         parse_response r, :expects => 200, :as => :data, :default => [], :raise => false do |js|

data/lib/collins/api/asset_type.rb

@@ -0,0 +1,98 @@
+require 'collins/asset_type'
+module Collins; module Api
+
+  module AssetType
+    def asset_type_test; @asset_type_test end
+    def asset_type_test= v; @asset_type_test = v end
+    module_function :asset_type_test, :asset_type_test=
+
+    def asset_type_create! name, label
+      name = validate_name name
+      parameters = { :label => label }
+
+      if not ::Collins::Api::AssetType.asset_type_test then
+        parameters = select_non_empty_parameters parameters
+      end
+
+      logger.debug("Creating asset type with name #{name}")
+      http_put("/api/assettype/#{name}", parameters) do |r|
+        parse_response r, :expects => 201, :as => :status, :raise => strict?, :default => false
+      end
+    end
+
+    def asset_type_delete! atype
+      name = validate_name case atype.class
+      when ::Collins::AssetType
+        atype.name
+      else
+        atype
+      end
+
+      logger.debug("Deleting asset type with name #{name}")
+      http_delete("/api/assettype/#{name}") do |r|
+        parse_response r, :expects => 202, :as => :data, :raise => strict?, :default => 0 do |js|
+          js["DELETED"].to_s.to_i
+        end
+      end
+    end
+
+    def asset_type_update! atype, options = {}
+      name = validate_name case atype.class
+      when ::Collins::AssetType
+        atype.name
+      else
+        atype
+      end
+
+      parameters = {
+        :name => options[:name],
+        :label => options[:label]
+      }
+      if not ::Collins::Api::AssetType.asset_type_test then
+        parameters = select_non_empty_parameters parameters
+      end
+      logger.debug("Updating asset type with name #{name} params #{parameters}")
+      http_post("/api/assettype/#{name}", parameters) do |r|
+        parse_response r, :expects => 200, :as => :status, :raise => strict?, :default => false
+      end
+    end
+
+    def asset_type_get name
+      name = validate_name name
+      logger.debug("Fetching asset type with name #{name}")
+      http_get("/api/assettype/#{name}") do |r|
+        empty = ::Collins::AssetType.new({})
+        parse_response r, :expects => 200, :as => :data, :default => empty, :raise => false do |js|
+          ::Collins::AssetType.from_json(js)
+        end
+      end
+    end
+
+    def asset_type_get_all
+      http_get("/api/assettypes") do |r|
+        parse_response r, :expects => 200, :as => :data, :default => [], :raise => false do |js|
+          js.map do |atype|
+            ::Collins::AssetType.from_json(atype)
+          end
+        end
+      end
+    end
+
+    private
+    def validate_name name
+      if ::Collins::Api::AssetType.asset_type_test then
+        return name
+      end
+      name_opt = ::Collins::Option(name).map {|x| x.to_s.strip}.filter_not {|x| x.empty?}.filter {|x|
+        x.size > 1 && x.size <= 32
+      }
+      if name_opt.empty? then
+        raise ::Collins::ExpectationFailedError.new("name must be between 2 and 32 characters")
+      else
+        name_opt.get
+      end
+    end
+
+  end # end module AssetType
+
+end; end

data/lib/collins/asset_type.rb

@@ -0,0 +1,37 @@
+require 'ostruct'
+
+module Collins
+  class AssetType
+    include Collins::Util
+
+    attr_accessor :id, :label, :name
+
+    def self.from_json json
+      Collins::AssetType.new json
+    end
+
+    def initialize opts = {}
+      hash = symbolize_hash(opts).inject({}) do |result, (k,v)|
+        key = k.to_s.downcase.to_sym
+        result[key] = v
+        result
+      end
+      @id = hash[:id].to_s.to_i
+      @label = hash[:label].to_s
+      @name = hash[:name].to_s
+    end
+
+    def empty?
+      @id == 0
+    end
+
+    def to_s
+      if empty? then
+        "AssetType(None)"
+      else
+        "AssetType(id = #{id}, name = '#{name}', label = '#{label}')"
+      end
+    end
+
+  end
+end

metadata

@@ -1,40 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: collins_client
-version: !ruby/object:Gem::Version
-  version: 0.2.10
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.2.11
 platform: ruby
-authors:
+authors: 
 - Blake Matheny
+- Gabe Conradi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-08-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.8.3
+  type: :runtime
+  version_requirements: *id001
 description: Provides ruby support for interacting with the Collins API
-email: bmatheny@tumblr.com
+email: 
+- bmatheny@tumblr.com
+- gabe@tumblr.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
-- .rbenv-version
+files: 
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -46,6 +44,7 @@ files:
 - lib/collins/api/admin.rb
 - lib/collins/api/asset.rb
 - lib/collins/api/asset_state.rb
+- lib/collins/api/asset_type.rb
 - lib/collins/api/attributes.rb
 - lib/collins/api/ip_address.rb
 - lib/collins/api/logging.rb
@@ -59,6 +58,7 @@ files:
 - lib/collins/asset.rb
 - lib/collins/asset_client.rb
 - lib/collins/asset_find.rb
+- lib/collins/asset_type.rb
 - lib/collins/asset_update.rb
 - lib/collins/client.rb
 - lib/collins/errors.rb
@@ -73,31 +73,30 @@ files:
 - lib/collins/util.rb
 - lib/collins_client.rb
 homepage: https://github.com/tumblr/collins/tree/master/support/ruby/collins-client
-licenses:
+licenses: 
 - APL 2.0
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2685565510305324275
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id002 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 3
 summary: Client library for Collins API
 test_files: []
+

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.2-p290