librato_silverline_api 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    librato_silverline_api (0.0.1)
-      json
+    librato_silverline_api (1.0.1)
+      json (= 1.4.6)
       rest-client (= 1.6.1)
 
 GEM
@@ -10,6 +10,8 @@ GEM
   specs:
     json (1.4.6)
     mime-types (1.16)
+    rake (0.8.7)
+    rcov (0.9.9)
     rest-client (1.6.1)
       mime-types (>= 1.16)
 
@@ -18,6 +20,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  json
   librato_silverline_api!
-  rest-client (= 1.6.1)
+  rake (>= 0.8.7)
+  rcov (>= 0.9.8)

data/lib/librato_silverline_api/version.rb

@@ -1,3 +1,3 @@
 module SilverlineAPI
-  VERSION = "1.0.0"
-end
+  VERSION = "1.0.1"
+end

data/lib/librato_silverline_api.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "rest_client"
 require "cgi"
 require "json"
+require "uri"
 
 def symbolize_keys(arg)
   case arg
@@ -100,23 +101,22 @@ module SilverlineAPI
         :min_storage_wbw => @min_storage_wbw,
         :containers => @containers
       }.to_json
-            
-      if @id
-        begin
-          x = RestClient.put("#{SilverlineAPI.url}/templates/#{@id}.json", parameters, :content_type => :json)
-        rescue RestClient::UnprocessableEntity => e
-          @errors = JSON.parse(e.http_body)["errors"]
-          return false
-        end
-      else
-        begin
+
+      begin
+        if @id
+          RestClient.put("#{SilverlineAPI.url}/templates/#{@id}.json", parameters, :content_type => :json)
+        else
           x = RestClient.post("#{SilverlineAPI.url}/templates.json", parameters, :content_type => :json)
-        rescue RestClient::UnprocessableEntity => e
-          @errors = JSON.parse(e.http_body)["errors"]
-          return false
+          @id = x.headers[:location].scan(/\d+/).last
         end
-        @id = x.headers[:location].scan(/\d+/).last
+      rescue RestClient::UnprocessableEntity => e
+        @errors = JSON.parse(e.http_body)["errors"]
+        return false
+      rescue RestClient::BadRequest => e
+        @errors = JSON.parse(e.http_body)["errors"]
+        return false
       end
+
       true
     end
     
@@ -131,7 +131,7 @@ module SilverlineAPI
       options = args.slice!(0) || {}
 
       if scope == :all
-        array = options.map {|k, v| "#{k}=#{v}"}
+        array = options.map {|k, v| "#{k}=#{URI.escape(v)}"}
         arguments = array.join("&")
         unless arguments.empty?
           query = "/templates.json?#{arguments}"
@@ -206,4 +206,4 @@ module SilverlineAPI
       }.to_json
     end
   end
-end
+end

data/librato_silverline_api.gemspec

@@ -7,15 +7,17 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = "Chris Blaettermann"
   s.email       = "chris@librato.com"
-  s.homepage    = "http://rubygems.org/gems/librato_silverline_api"
-  s.summary     = "Write a gem summary"
-  s.description = "Write a gem description"
+  s.homepage    = "http://github.com/librato/silverline-api-ruby"
+  s.summary     = "Ruby Gem for connecting to the Librato Silverline API"
+  s.description = "This Gem is a wrapper for the Librato Silverline API. It adapts the basic behavior of ActiveResource and represents API resources as objects in Ruby."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "librato_silverline_api"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  
+  s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "rcov", ">= 0.9.8"
+
   s.add_dependency("rest-client", "1.6.1")
   s.add_dependency("json", "1.4.6")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: librato_silverline_api
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Chris Blaettermann
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -08:00
+date: 2011-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,12 +30,44 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
+  prerelease: false
   version_requirements: *id001
+  type: :development
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  prerelease: false
+  version_requirements: *id002
+  type: :development
+  name: rake
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  prerelease: false
+  version_requirements: *id003
+  type: :development
+  name: rcov
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,12 +78,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
+  prerelease: false
+  version_requirements: *id004
   type: :runtime
-  version_requirements: *id002
+  name: rest-client
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,9 +94,11 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
+  prerelease: false
+  version_requirements: *id005
   type: :runtime
-  version_requirements: *id003
-description: Write a gem description
+  name: json
+description: This Gem is a wrapper for the Librato Silverline API. It adapts the basic behavior of ActiveResource and represents API resources as objects in Ruby.
 email: chris@librato.com
 executables: []
 
@@ -91,7 +123,7 @@ files:
 - test/unit/container-test.rb
 - test/unit/template-test.rb
 has_rdoc: true
-homepage: http://rubygems.org/gems/librato_silverline_api
+homepage: http://github.com/librato/silverline-api-ruby
 licenses: []
 
 post_install_message: 
@@ -125,6 +157,6 @@ rubyforge_project: librato_silverline_api
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Write a gem summary
+summary: Ruby Gem for connecting to the Librato Silverline API
 test_files: []