rlivsey-voorhees 0.1.1 → 0.1.3

data/README.markdown

@@ -30,7 +30,7 @@
     user.login                => 'test'
     user.messages             => [Message, Message, Message, ...]
 
-See [/examples/](examples/) directory for more.
+See [/examples/](master/examples/) directory for more.
 
 ## A bit more in-depth
 
@@ -41,27 +41,33 @@ These can all be overridden on individual requests/services
 
     Voorhees::Config.setup do |c|
       c[:base_uri]  = "http://api.example.com/json"
-      c[:required]  = [:something]
       c[:defaults]  = {:api_version => 2}
       c[:timeout]   = 10
       c[:retries]   = 3
     end
 
-#### System options
+#### Global options
 
 * logger: set a logger to use for debug messages, defaults to Logger.new(STDOUT) or RAILS_DEFAULT_LOGGER if it's defined
 
-#### Request options
+#### Request global options
+
+These can be set in the global config and overridden on individual services/requests
 
 * base_uri: Prepend all paths with this, usually the domain of the service
 * defaults: A hash of default parameters
-* hierarchy: Define the class hierarchy for nested data - see below for info
 * http_method: The Net::HTTP method to use. One of Net::HTTP::Get (default), Net::HTTP::Post, Net::HTTP::Put or Net::HTTP::Delete 
+* retries: Number of times to retry if it fails to load data from the service
+* timeout: Number of seconds to wait for the service to send data
+
+#### Request specific options
+
+These cannot be globally set and can only be defined on individual services/requests
+
+* hierarchy: Define the class hierarchy for nested data - see below for info
 * parameters: Hash of data to send along with the request, overrides any defaults
 * path: Path to the service. Can be relative if you have a base_uri set.
 * required: Array of required parameters. Raises a Voorhees::ParameterMissingError if a required parameter is not set.
-* retries: Number of times to retry if it fails to load data from the service
-* timeout: Number of seconds to wait for the service to send data
 
 ### Services and Requests
 
@@ -104,8 +110,8 @@ Like json_service, by default it assumes you're getting items of the same class,
 
     def messages
       json_request(Message) do |r|
-        r.path => "/messages.json"
-        r.parameters => {:user_id => self.id}        
+        r.path        = "/messages.json"
+        r.parameters  = {:user_id => self.id}        
       end
     end
 
@@ -120,8 +126,8 @@ If you like you can use this yourself directly.
 This sets up a request identical to the json_request messages example above:
 
     request = Voorhees::Request.new(Message)
-    request.path = "/messages.json"
-    request.parameters => {:user_id => self.id} 
+    request.path        = "/messages.json"
+    request.parameters  = {:user_id => self.id} 
     
 To perform the HTTP request  (returning a Voorhees::Response object):
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/voorhees/request.rb

@@ -29,8 +29,12 @@ module Voorhees
       @base_uri || Voorhees::Config[:base_uri]
     end
     
+    def defaults
+      @defaults || Voorhees::Config[:defaults]
+    end
+    
     def parameters
-      (@defaults || {}).merge(@parameters || {})
+      (defaults || {}).merge(@parameters || {})
     end
     
     def timeout
@@ -114,7 +118,6 @@ module Voorhees
     
       def parse_response(response)
         Voorhees::Response.new(JSON.parse(response.body), @caller_class, @hierarchy)
-        
       rescue JSON::ParserError
         raise Voorhees::ParseError
       end

data/lib/voorhees/resource.rb

@@ -59,15 +59,12 @@ module Voorhees
         if json_attributes.include?(method_name)
           value = value_from_json(method_name)
           build_methods(method_name, value)
-          return value
-        end
-        
-        if method_name.to_s =~ /(.+)=$/ && json_attributes.include?($1.to_sym)
+          value
+        elsif method_name.to_s =~ /(.+)=$/ && json_attributes.include?($1.to_sym)
           build_methods($1, args[1])
-          return
+        else        
+          super
         end
-        
-        super
       end
       
       private
@@ -88,9 +85,9 @@ module Voorhees
           end
           
           if item.is_a?(Array)
-            return build_collection_from_json(method_name, item, klass, sub_hierarchy)
+            build_collection_from_json(method_name, item, klass, sub_hierarchy)
           else
-            return build_item(item, klass, sub_hierarchy)
+            build_item(item, klass, sub_hierarchy)
           end
         end
         

data/voorhees.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{voorhees}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Livsey"]
@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
      "README.markdown"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
+    ".gitignore",
      "LICENSE",
      "README.markdown",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rlivsey-voorhees
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Richard Livsey
@@ -23,7 +23,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.markdown

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE