itrigga-admin_api_client 0.2.0 → 0.2.1

data/README.rdoc

@@ -22,12 +22,14 @@ And returns:
         "aggregated" => 1,
          "editorial" => 22
     },
-             "status_code" => 200,
     "max_scheduled_job_id" => 1252
 }
 
-Each call will return results as a Mash.
-
+Each call will return results as a Mash with 2 keys:
+{
+  :status_code - the HTTP status code (200 for a success)
+  :data - whatever the api call returned (in the example above this would be a hash)
+}
 Each call will return a :status_code (normally 200 for when it went ok, else an error code eg 500)
 
 If an error occurs a Mash will be returned like:

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/itrigga-admin_api_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{itrigga-admin_api_client}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anson Kelly"]
-  s.date = %q{2011-10-17}
+  s.date = %q{2011-10-18}
   s.description = %q{Wraps API calls to iTrigga applications}
   s.email = %q{support@itrigga.com}
   s.extra_rdoc_files = [

data/lib/itrigga/admin_api_client.rb

@@ -2,14 +2,12 @@
 this_dir =  File.dirname(__FILE__)
 $: << this_dir unless $:.include?(this_dir)
 
-#require 'faster_csv'
 require 'yaml'
 require 'hashie'
 require 'core_ext'
 require 'trigga/param_fu'
 require 'net_helper'
 
-#require 'trigga/param_fu'
 Dir[File.join(File.dirname(File.expand_path(__FILE__)),"admin_api_client","proxies","*.rb")].each {|f| require f }
 Dir[File.join(File.dirname(File.expand_path(__FILE__)),"admin_api_client","*.rb")].each {|f| require f }
 

data/lib/itrigga/admin_api_client/admin_api_client.rb

@@ -17,17 +17,13 @@ module Itrigga
         Itrigga.add_log_line("[API Client] - #{url}")
         
         response = JSON.parse(Itrigga::NetHelper.do_get(url))
-        ::Hashie::Mash.new(response.kind_of?(Array) ? default_response : response.merge(default_response) )
+        ::Hashie::Mash.new(:status_code => 200, :data => response )
         
       rescue Exception => e
          Itrigga.add_log_line "[API Client Error] - #{e.message}\n#{e.backtrace.join('\n')}" if RAILS_ENV == "development"
          ::Hashie::Mash.new(:error => e.message, :status_code => status_code_from_error(e.message))
       end 
-    end
-    
-    def self.default_response
-      {:status_code => 200}
-    end
+    end    
     
     def self.make_endpoint_absolute(endpoint)
       endpoint.to_s.match(/^\/{1}.*/) ? endpoint : "/#{endpoint}"

data/spec/admin_api_client_spec.rb

@@ -55,7 +55,7 @@ describe Itrigga::AdminApiClient do
     end
     
     it "should return a mash with the status code" do
-      Itrigga::AdminApiClient.make_call("test","stats",@opts).should == Hashie::Mash.new(:response => "text", :status_code => 200)
+      Itrigga::AdminApiClient.make_call("test","stats",@opts).should == Hashie::Mash.new(:data => { :response => "text" }, :status_code => 200)
     end
     
     describe "when an error occurs" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-admin_api_client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Anson Kelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 +01:00
+date: 2011-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency