itrigga-admin_api_client 0.1.1 → 0.1.2

data/Gemfile

@@ -19,11 +19,4 @@ group :development do
   gem "fastercsv"
   gem "hpricot"
   gem "json_pure"
-end
-
-group :test do
-  gem "rspec", "1.3.0"
-  gem "rspec-rails", "1.3.2"
-  gem "bundler", "~> 1.0.0"
-  gem "rcov", ">= 0"
 end

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "itrigga-admin_api_client"
-  gem.homepage = "http://rubygems.org/itrigga-admin_api_client"
+  gem.homepage = "http://rubygems.org/gems/itrigga-admin_api_client"
   gem.license = "MIT"
   gem.summary = %Q{Wraps API calls to iTrigga applications}
   gem.description = %Q{Wraps API calls to iTrigga applications}

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/itrigga-admin_api_client.gemspec

@@ -0,0 +1,103 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{itrigga-admin_api_client}
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Anson Kelly"]
+  s.date = %q{2011-10-11}
+  s.description = %q{Wraps API calls to iTrigga applications}
+  s.email = %q{support@itrigga.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "configuration.yml",
+    "itrigga-admin_api_client.gemspec",
+    "lib/trigga/admin_api_client.rb",
+    "lib/trigga/admin_api_client/admin_api_client.rb",
+    "lib/trigga/admin_api_client/proxies/admin.rb",
+    "lib/trigga/admin_api_client/proxies/api.rb",
+    "lib/trigga/admin_api_client/proxies/search_tracker.rb",
+    "spec/admin_api_client_spec.rb",
+    "spec/proxies/admin_spec.rb",
+    "spec/proxies/api_spec.rb",
+    "spec/proxies/search_tracker_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://rubygems.org/gems/itrigga-admin_api_client}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Wraps API calls to iTrigga applications}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<itrigga-core_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-net_helper>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["= 1.3.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<fastercsv>, [">= 0"])
+      s.add_development_dependency(%q<hpricot>, [">= 0"])
+      s.add_development_dependency(%q<json_pure>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-core_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-net_helper>, [">= 0"])
+    else
+      s.add_dependency(%q<itrigga-core_ext>, [">= 0"])
+      s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_dependency(%q<itrigga-net_helper>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<fastercsv>, [">= 0"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<itrigga-core_ext>, [">= 0"])
+      s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_dependency(%q<itrigga-net_helper>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<itrigga-core_ext>, [">= 0"])
+    s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+    s.add_dependency(%q<itrigga-net_helper>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<fastercsv>, [">= 0"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<itrigga-core_ext>, [">= 0"])
+    s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+    s.add_dependency(%q<itrigga-net_helper>, [">= 0"])
+  end
+end
+

data/lib/trigga/admin_api_client/admin_api_client.rb

@@ -16,15 +16,19 @@ module Trigga
         url = build_url(host,endpoint,opts) 
         Trigga.add_log_line("[API Client] - #{url}")
         
-        response = Itrigga::NetHelper.do_get(url)
-        ::Hashie::Mash.new(JSON.parse(response).merge(:status_code => 200))
+        response = JSON.parse(Itrigga::NetHelper.do_get(url))
+        ::Hashie::Mash.new(response.kind_of?(Array) ? default_response : response.merge(default_response) )
         
       rescue Exception => e
-         Trigga.add_log_line "[API Client Error] - #{e.message}\n#{e.backtrace.join('\n')}"
+         Trigga.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
+    
     def self.make_endpoint_absolute(endpoint)
       endpoint.to_s.match(/^\/{1}.*/) ? endpoint : "/#{endpoint}"
     end

data/lib/trigga/admin_api_client/proxies/admin.rb

@@ -5,13 +5,21 @@ module Trigga
         
         def self.included(base)
           base.send("extend",self)
-          base.send(:include, Trigga::ParamFu)
         end
         
-        def get_stats( opts )
+        def get_stats( opts = {})
           Trigga::AdminApiClient.make_call "admin", "stats", opts
         end
         
+        def get_clients(opts = {})
+          Trigga::AdminApiClient.make_call "admin", "clients", opts
+        end
+        
+        def get_client(opts = {})
+          require_param(opts, :client_id)
+          Trigga::AdminApiClient.make_call "admin", "clients/#{opts[:client_id]}", opts
+        end
+        
       end
     end
   end

data/lib/trigga/admin_api_client/proxies/api.rb

@@ -5,7 +5,6 @@ module Trigga
 
         def self.included(base)
           base.send("extend",self)
-          base.send(:include, Trigga::ParamFu)
         end
 
         private

data/lib/trigga/admin_api_client/proxies/search_tracker.rb

@@ -5,7 +5,6 @@ module Trigga
         
         def self.included(base)
           base.send("extend",self)
-          base.send(:include, Trigga::ParamFu)
         end        
         
       end

data/spec/admin_api_client_spec.rb

@@ -22,6 +22,7 @@ describe Trigga::AdminApiClient do
   describe "make_call" do
     before do
       TRIGGA_ADMIN_API_CLIENT_CONFIG = {"test" => Hashie::Mash.new(:base_url => "base_url")}
+        
       Trigga::AdminApiClient.stub!(:require_param).and_return(true)
       Trigga::AdminApiClient.stub!(:build_url).and_return("a url")
       Itrigga::NetHelper.stub!(:do_get).and_return({:response => "text"}.to_json)

data/spec/proxies/admin_spec.rb

@@ -1,10 +1,18 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'spec_helper'))
 
 class AdminApiClientProxyTest
+  include Trigga::ParamFu
   include Trigga::AdminApiClient::Proxies::Admin
 end
 
 describe Trigga::AdminApiClient::Proxies::Admin do
+  before do
+    AdminApiClientProxyTest.stub!(:require_one_of).and_return(true)
+    AdminApiClientProxyTest.stub!(:require_param).and_return(true)
+    Trigga::AdminApiClient.stub!(:make_call).and_return(true)
+    @opts = {:abc => 123, :api_key => "blah"}
+  end
+  
   describe "get_stats" do
     before do
       @opts = {:abc => 123}  
@@ -15,4 +23,30 @@ describe Trigga::AdminApiClient::Proxies::Admin do
       AdminApiClientProxyTest.new.get_stats @opts
     end
   end
+  
+  
+  describe "get_clients" do
+    it "should call make_call" do
+      Trigga::AdminApiClient.should_receive(:make_call).with("admin","clients",@opts)
+      AdminApiClientProxyTest.new.get_clients @opts
+    end
+  end
+  
+  
+  describe "get_client" do
+    before do
+      @opts = {:client_id => 42}
+    end
+    
+    it "should require client_id" do
+      AdminApiClientProxyTest.should_receive(:require_param).with(@opts, :client_id)
+      AdminApiClientProxyTest.new.get_client @opts
+    end
+    
+    it "should call make_call" do
+      Trigga::AdminApiClient.should_receive(:make_call).with("admin","clients/42",@opts)
+      AdminApiClientProxyTest.new.get_client @opts
+    end
+  end
+  
 end

data/spec/proxies/api_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'spec_helper'))
 
 class ApiApiClientProxyTest
+  include Trigga::ParamFu
   include Trigga::AdminApiClient::Proxies::Api
 end
 

data/spec/proxies/search_tracker_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'spec_helper'))
+
+class SearchTrackerApiClientProxyTest
+  include Trigga::ParamFu
+  include Trigga::AdminApiClient::Proxies::SearchTracker
+end
+
+describe Trigga::AdminApiClient::Proxies::SearchTracker do
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-admin_api_client
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Anson Kelly
@@ -255,6 +255,7 @@ files:
 - Rakefile
 - VERSION
 - configuration.yml
+- itrigga-admin_api_client.gemspec
 - lib/trigga/admin_api_client.rb
 - lib/trigga/admin_api_client/admin_api_client.rb
 - lib/trigga/admin_api_client/proxies/admin.rb
@@ -263,10 +264,11 @@ files:
 - spec/admin_api_client_spec.rb
 - spec/proxies/admin_spec.rb
 - spec/proxies/api_spec.rb
+- spec/proxies/search_tracker_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://rubygems.org/itrigga-admin_api_client
+homepage: http://rubygems.org/gems/itrigga-admin_api_client
 licenses: 
 - MIT
 post_install_message: