the_castle_client 0.0.4 → 0.0.5

data/lib/the_castle_client/version.rb

@@ -1,3 +1,3 @@
 module TheCastleClient
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/the_castle_client.rb

@@ -7,23 +7,9 @@ module TheCastleClient
 
     attr_accessor :key, :secret, :scheme, :host, :port, :version
 
-    def account_data(account_id, options={})
-      url = "/api/#{version}/accounts/#{account_id}#{to_query(options)}"
-      get(url, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
-    end
-
-    def account_aggregates(account_id)
-      url = "/api/#{version}/accounts/#{account_id}/aggregates"
-      get(url, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
-    end
-
-    def piece_data(piece_id, options={})
-      url = "/api/#{version}/pieces/#{piece_id}#{to_query(options)}"
-      get(url, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
-    end
-
-    def piece_aggregates(piece_id)
-      url = "/api/#{version}/pieces/#{piece_id}/aggregates"
+    def query(id, model='account', data_type='', options={})
+      raise "Invalid data type #{data_type}" unless ['aggregates', 'referrers', 'embedders', ''].include?(data_type)
+      url = "/api/#{version}/#{model}s/#{id}/#{data_type}#{to_query(options)}"
       get(url, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
     end
 
@@ -35,6 +21,12 @@ module TheCastleClient
       get(url, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
     end
 
+    #  these are just niceties around the query method; deprecate?
+    def account_data(id, opts={}); query(id, 'account', '', opts); end
+    def account_aggregates(id); query(id, 'account', 'aggregates'); end
+    def piece_data(id, opts={}); query(id, 'piece', '', opts); end
+    def piece_aggregates(id); query(id, 'piece', 'aggregates'); end
+
     protected
 
     [:delete, :get, :head, :post, :put, :request].each do |method|

data/test/test_the_castle_client.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class TestTheCastleClient < Test::Unit::TestCase
-
+  
   def setup 
     TheCastleClient.key     = '9NmQzsWBWs8TyfJswqMmkmjwAH3ItNBIC72KLjQK'
     TheCastleClient.secret  = '592BSoaCb4FfwqsZ6Ql8WShVZ6HVnecR4Dk9lRfQ'
@@ -9,27 +9,37 @@ class TestTheCastleClient < Test::Unit::TestCase
     TheCastleClient.port    = 3000
     TheCastleClient.version = 'v1'
   end
-
+  
   def test_account_data
     response = TheCastleClient.account_data(7018, {:scale=>'week', :start_on=>'2010-01-01', :end_on=>'2010-04-01'})
     puts response.read_body
   end
   
+  def test_account_embedders
+    response = TheCastleClient.query(128129, 'account', 'embedders', {:scale=>'week', :start_on=>'2011-10-24', :end_on=>'2011-11-02'})
+    puts response.read_body
+  end
+  
+  def test_account_referrers
+    response = TheCastleClient.query(128129, 'account', 'referrers', {:scale=>'week', :start_on=>'2011-10-24', :end_on=>'2011-11-02'})
+    puts response.read_body
+  end
+  
   def test_account_aggregates
     response = TheCastleClient.account_aggregates(7018)
     puts response.read_body
   end
-
+  
   def test_piece_aggregates
     response = TheCastleClient.piece_aggregates(37745)
     puts response.read_body
   end
-
+  
   def test_piece_data
     response = TheCastleClient.piece_data(37745, {:scale=>'week', :start_on=>'2010-01-01', :end_on=>'2010-04-01'})
     puts response.read_body
   end
-
+  
   def test_popular_pieces
     response = TheCastleClient.popular_pieces(Date.parse('2011-01-03'), 10)
     puts response.read_body

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: the_castle_client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - kookster
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 -04:00
+date: 2011-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency