tddium_client 0.0.4 → 0.0.5

data/.gitignore

@@ -6,3 +6,4 @@ nbproject
 *.swp
 coverage/
 .rvmrc
+doc/

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium_client (0.0.4)
+    tddium_client (0.0.5)
       httparty
       json
 

data/lib/tddium_client.rb

@@ -12,13 +12,29 @@ module TddiumClient
 
   class Error < RuntimeError; end
   class TimeoutError < TddiumClient::Error; end
-  
+
   class APIError < TddiumClient::Error
     attr_accessor :tddium_result
 
     def initialize(result)
       self.tddium_result = result
     end
+
+    def http_code
+      self.tddium_result.http_code if self.tddium_result
+    end
+
+    def http_result
+      self.tddium_result.http_result if self.tddium_result
+    end
+
+    def to_s
+      "#{http_code} #{http_result} (#{self.tddium_result.status}) #{self.tddium_result.explanation}"
+    end
+
+    def message
+      "API Error: #{to_s}"
+    end
   end
 
   class ServerError < TddiumClient::Error
@@ -28,6 +44,14 @@ module TddiumClient
       self.http_code = http_code
       self.http_result = http_result
     end
+
+    def to_s
+      "#{http_code} #{http_result}"
+    end
+
+    def message
+      "Server Error: #{to_s}"
+    end
   end
 
   class Result
@@ -40,15 +64,35 @@ module TddiumClient
     end
 
     def success?
-      !response.nil? && response.is_a?(Hash) && response["status"] == 0
+      has_response? && response["status"] == 0
+    end
+
+    def has_response?
+      !response.nil? && response.is_a?(Hash) 
+    end
+
+    def status
+      has_response? ? response["status"] : nil
+    end
+      
+    def explanation
+      has_response? ? response["explanation"] : nil
     end
   end
 
   class Client
-    attr_accessor :environment
+    attr_reader :environment
 
     def initialize(env = :development)
-      self.environment = env
+      @all_config = YAML.load(File.read(config_path))
+      self.environment = env.to_s
+    end
+
+    def environment=(new_environment)
+      env = new_environment.to_s
+      raise ArgumentError, "Invalid environment #{env}" unless @all_config[env]
+      @tddium_config = @all_config[env]
+      @environment = env
     end
 
     def call_api(method, api_path, params = {}, api_key = nil, retries = 5)
@@ -83,17 +127,20 @@ module TddiumClient
 
     private
 
-    def tddium_uri(path)
-      uri = URI.parse("")
-      uri.host = tddium_config["api"]["host"]
-      uri.port = tddium_config["api"]["port"]
-      uri.scheme = tddium_config["api"]["scheme"]
-      URI.join(uri.to_s, "#{tddium_config["api"]["version"]}/#{path}").to_s
-    end
+      def tddium_uri(path)
+        uri = URI.parse("")
+        uri.host = tddium_config["api"]["host"]
+        uri.port = tddium_config["api"]["port"]
+        uri.scheme = tddium_config["api"]["scheme"]
+        URI.join(uri.to_s, "#{tddium_config["api"]["version"]}/#{path}").to_s
+      end
 
-    def tddium_config
-     @tddium_config = YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "config", "environment.yml")))[environment.to_s] unless @tddium_config
-     @tddium_config
-    end
+      def config_path
+        File.join(File.dirname(__FILE__), "..", "config", "environment.yml")
+      end
+
+      def tddium_config
+        @tddium_config
+      end
   end
 end

data/lib/tddium_client/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumClient
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/tddium_client_spec.rb

@@ -6,6 +6,23 @@ require "spec_helper"
 
 module TddiumClient
   describe Result do
+    describe "#has_response?" do
+      it "should be true with a reponse" do
+        result = TddiumClient::Result.new 200, "OK", {"status" => 0}
+        result.should be_has_response
+      end
+
+      it "should be false without a response" do
+        result = TddiumClient::Result.new 200, "OK", nil
+        result.should_not be_has_response
+      end
+
+      it "should be false with a nonhash response" do
+        result = TddiumClient::Result.new 200, "OK", "a"
+        result.should_not be_has_response
+      end
+    end
+
     describe "#success?" do
       context "with successful params" do
         it "should be true" do
@@ -28,6 +45,27 @@ module TddiumClient
     end
   end
 
+  describe ServerError do
+    it "should stringify with code and result" do
+      code = 404
+      message = 'Not Found'
+      e = TddiumClient::ServerError.new(code, message)
+      e.message.should =~ /#{code}/
+      e.message.should =~ /#{message}/
+    end
+  end
+
+  describe APIError do
+    it "should stringify with explanation" do
+      obj = {"status" => 1, "explanation"=>"oops"}
+      result = TddiumClient::Result.new(200, "OK", obj)
+      result.should_not be_success
+      e = TddiumClient::APIError.new(result)
+      e.message.should =~ /#{obj["status"]}/
+      e.message.should =~ /#{obj["explanation"]}/
+    end
+  end
+
   describe Client do
     include FakeFS::SpecHelpers
     include TddiumSpecHelpers
@@ -48,14 +86,21 @@ module TddiumClient
 
     let(:tddium_client) { TddiumClient::Client.new }
 
-    it "should set the default environment to :development" do
-      tddium_client.environment.should == :development
-    end
-
     describe "#environment" do
+      before(:each) do
+        stub_tddium_client_config
+      end
+
+      it "should raise on init if environment can't be found" do
+        expect { TddiumClient::Client.new('foobar') }.to raise_error(ArgumentError)
+      end
+
+      it "should set the default environment to :development" do
+        tddium_client.environment.should == 'development'
+      end
       it "should set the environment" do
         tddium_client.environment = :production
-        tddium_client.environment.should == :production
+        tddium_client.environment.should == 'production'
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: tddium_client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jay Moorthi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README