placid 0.0.2 → 0.0.3

data/History.md

@@ -1,6 +1,13 @@
 Placid History
 ==============
 
+0.0.3
+-----
+
+- Raise RestConnectionError when REST connection is refused
+- Use ActiveSupport's Array#extract_options! method
+
+
 0.0.2
 -----
 

data/lib/placid/exceptions.rb

@@ -1,4 +1,9 @@
 module Placid
+  # Error parsing a JSON response
   class JSONParseError < RuntimeError
   end
+
+  # Error connecting to the REST API
+  class RestConnectionError < RuntimeError
+  end
 end

data/lib/placid/helper.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'json'
 require 'hashie'
 require 'rest-client'
+require 'active_support/core_ext/array' # for extract_options!
 require 'placid/exceptions'
 
 module Placid
@@ -15,19 +16,6 @@ module Placid
       URI.escape(text.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
 
-    # If the last arg in `args` is a hash, pop it off and return it. Otherwise,
-    # return an empty hash. `args` is modified in-place. Behaves like
-    # ActiveSupport's `String#extract_options!` method.
-    #
-    # @param [Array] args
-    #   Zero or more arguments, the last of which might be a Hash.
-    #
-    # @return [Hash]
-    #
-    def extract_options(args)
-      args.last.is_a?(::Hash) ? args.pop : {}
-    end
-
     # Return a full URL for a REST API request to the given path, relative to
     # the configured `Placid::Config.rest_url`. Each path component is
     # URI-escaped.
@@ -66,13 +54,16 @@ module Placid
     #
     def request(method, *path)
       method = method.to_sym
-      params = extract_options(path)
+      params = path.extract_options!
       params = {:params => params} if method == :get
-      base_url = Placid::Config.rest_url
+      rest_url = url(*path)
       begin
-        response = RestClient.send(method, url(*path), params)
+        response = RestClient.send(method, rest_url, params)
       rescue RestClient::Exception => e
         response = e.response
+      rescue Errno::ECONNREFUSED => e
+        raise RestConnectionError,
+          "Could not connect to REST API: #{rest_url} (#{e.message})"
       rescue => e
         raise
       end

data/placid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "placid"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "Models from REST"
   s.description = <<-EOS
   EOS

data/spec/placid_helper_spec.rb

@@ -33,6 +33,13 @@ describe Placid::Helper do
       json.should == ["fail"]
     end
 
+    it "returns a RestConnectionError when connection is refused" do
+      RestClient.stub(:get).and_raise(Errno::ECONNREFUSED)
+      lambda do
+        json = request('get')
+      end.should raise_error(Placid::RestConnectionError, /Could not connect/)
+    end
+
     it "passes other exceptions through" do
       RestClient.stub(:get).and_raise(URI::InvalidURIError)
       lambda do
@@ -62,6 +69,38 @@ describe Placid::Helper do
     end
   end
 
+  describe "#get" do
+    it "sends a GET request to the given path" do
+      RestClient.should_receive(:get).
+        with('http://localhost/foo/bar', {:params => {:baz => 'hi'}})
+      get('foo', 'bar', :baz => 'hi')
+    end
+  end
+
+  describe "#post" do
+    it "sends a POST request to the given path" do
+      RestClient.should_receive(:post).
+        with('http://localhost/foo/bar', {:baz => 'hi'})
+      post('foo', 'bar', :baz => 'hi')
+    end
+  end
+
+  describe "#put" do
+    it "sends a PUT request to the given path" do
+      RestClient.should_receive(:put).
+        with('http://localhost/foo/bar', {:baz => 'hi'})
+      put('foo', 'bar', :baz => 'hi')
+    end
+  end
+
+  describe "#delete" do
+    it "sends a DELETE request to the given path" do
+      RestClient.should_receive(:delete).
+        with('http://localhost/foo/bar', {:baz => 'hi'})
+      delete('foo', 'bar', :baz => 'hi')
+    end
+  end
+
   describe "#get_mash" do
     it "returns a Hashie::Mash for hash data" do
       data = {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: placid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Eric Pierce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 Z
+date: 2012-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hashie