spohlenz-freshbooksrb 0.3 → 0.4

data/lib/freshbooks/base.rb

@@ -1,3 +1,5 @@
+require 'andand'
+
 module FreshBooks
   class Base
     def initialize(attributes={})
@@ -35,8 +37,8 @@ module FreshBooks
     end
     
     def self.get(id)
-      result = call_api_with_id('get', id)
-      new(result[prefix]) if result[prefix]
+      result = call_api_with_id('get', id).andand[prefix]
+      new(result) if result
     end
     
     def self.delete(id)
@@ -44,9 +46,12 @@ module FreshBooks
     end
     
     def self.list(params={})
-      result = call_api('list', params)
-      if result[prefix.pluralize] && result[prefix]
-        result[prefix.pluralize][prefix].map { |p| new(p) }
+      result = call_api('list', params).andand[prefix.pluralize].andand[prefix]
+      
+      if result && result.is_a?(Array)
+        result.map { |p| new(p) }
+      elsif result
+        new(result)
       else
         []
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spohlenz-freshbooksrb
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -39,6 +39,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: andand
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+    version: 
 description: FreshBooksRb is a Ruby library for integrating your apps with the FreshBooks API (http://developers.freshbooks.com/overview/)
 email: sam@sampohlenz.com
 executables: []