collins_client 0.2.11 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 16ab54b81d038f140c59584b761713f4d771c21b
-  data.tar.gz: 0c377aa52c3a063a6e08535372e9acfb14bddc4c
+  metadata.gz: 42f443869d38df5e776cc352fbd070a6c987b182
+  data.tar.gz: 2706390265c708a02a1d7f911fc8d370000fa842
 SHA512: 
-  metadata.gz: 2716ad0b825440c3a212850f9951cb5e67eef0950db86ab251cbbb2ad3c61610e050d6dcdd24a9b9e257ec3c12e2cddf44ce8e98738b1a7ca4150228b05f1c30
-  data.tar.gz: 085a10106bd8c24202858a3bdbc0e0ab492313b56d87d54c07956301d8be3676054545a75f18a610dee4e33283ddb243c667956d8b051eae80f64b28fa9dafba
+  metadata.gz: 1c4a51bc5f16121738a5d89d69d8a5f77cc9a23563eb0159b87f82bf3d03ecd668a26417abde9ecc611979cc35b7faf9797bcb9a2e868fde95743e145bee1204
+  data.tar.gz: a236080e09f67961e04d842e73af11a8d20495ef5d2eb9707439cd42f0dd9f62e5937e1d48e4988e98f2506890599c7493d1ccdb99475ec1c16697e43ed7e48e

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'httparty',      '~> 0.8.3'
 

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.3.2)
     crack (0.3.1)

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.15

data/collins_client.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
   s.version = File.read 'VERSION'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Blake Matheny", "Gabe Conradi"]
-  s.date = "2014-08-08"
+  s.authors = ["Blake Matheny", "Gabe Conradi", "Will Richard"]
+  s.date = "2015-03-17"
   s.description = "Provides ruby support for interacting with the Collins API"
-  s.email = ["bmatheny@tumblr.com","gabe@tumblr.com"]
+  s.email = ["accounts@tumblr.com","gabe@tumblr.com","will@tumblr.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]

data/lib/collins/api/asset.rb

@@ -123,6 +123,40 @@ module Collins; module Api
       end
     end
 
+    # Count number of assets matching the specified criteria
+    #
+    # @param [Hash] options Query options (same as in the "find" method)
+    # @return integer The number of assets matching the query
+    # @raise [UnexpectedResponseError] If the HTTP response code is not a 200
+    def count options = {}
+      # create a copy so that we do not modify the original options array
+      options = options.dup
+
+      if options.include? :size or options.include? :page
+        raise ExpectationFailedError.new "Do not specify 'size' or 'page' options when counting assets"
+      else
+        options[:size] = 1
+        options[:page] = 0
+      end
+
+      query = asset_hash_to_find_query options
+      params = query.to_a.map do |param|
+        key, val = param
+        if val.is_a?(Array)
+          val.map{|v| "#{key}=#{asset_escape_attribute(v)}"}.join("&")
+        else
+          "#{key}=#{asset_escape_attribute(val)}"
+        end
+      end.reject{|s| s.empty?}
+
+      logger.debug("Counting assets using params #{params.inspect}")
+      http_get("/api/assets", params) do |response|
+        parse_response response, :expects => 200, :as => :data do |json|
+          json["Pagination"]["TotalResults"].to_i
+        end
+      end
+    end
+
     private
     def asset_escape_attribute value
       URI.escape(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))

data/lib/collins/api/logging.rb

@@ -58,7 +58,7 @@ module Collins; module Api
     # @param [String,Collins::Asset] asset_or_tag
     # @param [String] message
     # @param [Severity] level severity level to use
-    # @return [Boolean] true if logged successfully
+    # @return [OpenStruct] The log struct created
     # @raise [Collins::ExpectationFailed] the specified level was invalid
     # @raise [Collins::RequestError,Collins::UnexpectedResponseError] if the asset or message invalid
     def log! asset_or_tag, message, level = nil
@@ -70,7 +70,9 @@ module Collins; module Api
       parameters = select_non_empty_parameters parameters
       logger.debug("Logging to #{asset.tag} with parameters #{parameters.inspect}")
       http_put("/api/asset/#{asset.tag}/log", parameters, asset.location) do |response|
-        parse_response response, :as => :status, :expects => 201
+        parse_response response, :as => :paginated, :expects => 201 do |json|
+          OpenStruct.new(symbolize_hash(json))
+        end
       end
     end
 
@@ -84,7 +86,7 @@ module Collins; module Api
     # @option options [Fixnum] :size (25) Number of results to retrieve
     # @option options [String] :sort (DESC) Sort ordering for results
     # @option options [String] :filter Semicolon separated list of severity levels to include or exclude
-    # @option options [String] :all_tag If specified, an asset tag is this value, proxy to the all_logs method
+    # @option options [String] :all_tag If specified, and asset tag is set to :all_tag, proxy to the all_logs method
     # @note To exclude a level via a filter it must be prepended with a `!`
     # @return [Array<OpenStruct>] Array of log objects
     # @raise [Collins::UnexpectedResponseError] on a non-200 response
@@ -136,6 +138,19 @@ module Collins; module Api
       end
     end
 
+    # Get a log, given its id
+    # @param [Int] id The log id to retrieve
+    # @return [OpenStruct] The log openstruct
+    # @raise [Collins::UnexpectedResponseError] on a non-200 response
+    def get_log id
+      logger.debug("Fetching log #{id}")
+      http_get("/api/log/#{id}") do |response|
+        parse_response response, :as => :paginated, :default => nil, :raise => strict?, :expects => 200 do |json|
+          OpenStruct.new(symbolize_hash(json))
+        end
+      end
+    end
+
     private
     def log_level_from_string level
       return nil if (level.nil? || level.empty?)

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: collins_client
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.15
 platform: ruby
 authors: 
 - Blake Matheny
 - Gabe Conradi
+- Will Richard
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2014-08-08 00:00:00 Z
+date: 2015-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -24,8 +25,9 @@ dependencies:
   version_requirements: *id001
 description: Provides ruby support for interacting with the Collins API
 email: 
-- bmatheny@tumblr.com
+- accounts@tumblr.com
 - gabe@tumblr.com
+- will@tumblr.com
 executables: []
 
 extensions: []
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 3
 summary: Client library for Collins API