collins_client 0.2.7 → 0.2.9

data/README.md

@@ -14,7 +14,7 @@ First install rvm
 
 Install the collins gem and use it
 
-    $ gem install --source=http://repo.tumblr.net:9929/ collins_client
+    $ gem install collins_client
 
 Remember, if you don't have 1.9.3 set as the default, before you use collins you'll need to do `rvm use 1.9.3`.
 

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.9

data/collins_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "collins_client"
-  s.version = "0.2.7"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Matheny"]
-  s.date = "2012-10-31"
+  s.date = "2012-11-19"
   s.description = "Provides ruby support for interacting with the Collins API"
   s.email = "bmatheny@tumblr.com"
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/tumblr/collins/tree/master/support/ruby/collins-client"
   s.licenses = ["APL 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Client library for Collins API"
 
   if s.respond_to? :specification_version then

data/lib/collins/api/asset.rb

@@ -81,7 +81,7 @@ module Collins; module Api
     def find options = {}
       solrquery = options.delete(:query)
       if solrquery != nil then
-        return search solrquery, options[:size], options.sort
+        return search solrquery, (options[:size] || 50), (options[:sort] || "ASC"), "tag", options
       end
       use_api_version "1.1"
       query = asset_hash_to_find_query options
@@ -101,7 +101,7 @@ module Collins; module Api
       end
     end
 
-    def search query, size = 50, sort = "ASC", sort_field = "tag"
+    def search query, size = 50, sort = "ASC", sort_field = "tag", options = {}
       use_api_version "1.2"
       if query.start_with? "\"" and query.end_with? "\"" then
         query = query[1..-2]
@@ -112,7 +112,17 @@ module Collins; module Api
         :sort => sort,
         :sort_field => sort_field
       }
-      logger.debug("perform asset search using query #{query}")
+      query = asset_hash_to_find_query options.merge(params)
+      params = query.to_a.map do |(key,val)|
+        if val.is_a?(Array) then
+          val.map{|v| "#{key}=#{asset_escape_attribute(v)}"}.join("&")
+        elsif val.nil? then
+          ""
+        else
+          "#{key}=#{asset_escape_attribute(val)}"
+        end
+      end.reject{|s| s.empty?}
+      logger.debug("perform asset search using query #{query} - #{params.inspect}")
       http_get("/api/assets",params) do |response|
         parse_response response, :expects => 200, :as => :paginated do |json|
           json.map { |j| Collins::Asset.from_json(j) }

data/lib/collins/api/logging.rb

@@ -106,6 +106,21 @@ module Collins; module Api
       end
     end
 
+    # new solr interface
+    def search_logs options = {}
+      parameters = get_page_options(options).merge(
+        :query => get_option(:query, options, nil)
+      )
+      parameters = select_non_empty_parameters parameters
+      logger.debug("Fetching logs for all assets with parameters #{parameters.inspect}")
+      http_get("/api/assets/logs/search", parameters) do |response|
+        parse_response response, :as => :paginated, :default => [], :raise => strict?, :expects => 200 do |json|
+          json.map{|j| OpenStruct.new(symbolize_hash(j))}
+        end
+      end
+
+    end
+
     # Same as logs but for all assets
     # @see #logs
     def all_logs options = {}

data/lib/collins/asset.rb

@@ -25,7 +25,8 @@ module Collins
       # are attributes of the asset (such as hostname), and which are nort (such as sort or page).
       # @return [Array,<String>] Non-date related query parameters that are 'reserved'
       GENERAL_PARAMS = [
-        "details", "tag", "type", "status", "page", "size", "sort", "state", "operation", "remoteLookup"
+        "details", "tag", "type", "status", "page", "size", "sort", "state", "operation", "remoteLookup", "query",
+        "sort_field"
       ]
       # @return [Array<String>] DATE_PARAMS plus GENERAL_PARAMS
       ALL_PARAMS = DATE_PARAMS + GENERAL_PARAMS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collins_client
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1509418886285766907
+      hash: -117054897362145987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library for Collins API