whatser 0.4.0 → 0.5.0

data/README.rdoc

@@ -7,7 +7,7 @@ The 'Whatser API' Gem is a simple Ruby / Rails wrapper for interacting with What
 * read/write API access
 * OAuth 2 authentication (using oauth2)
 * network connectivity (using httparty)
-* simple DSL for API resource classes (spots, media, reviews, check ins, etc.)
+* simple DSL for API resource classes (spots, media, comments, check ins, etc.)
 * user spot collection management
 * check-in aggregation
 * social network integration (facebook, twitter, foursquare, gowalla)
@@ -111,7 +111,7 @@ The API stores user profiles, which may have originated either directly from API
     m = Whatser.client.users.find( user_id )
     m.connection
 
-    <Whatser::User @bio="Example", @location="Amsterdam, NL", @facebook_id="1234567890", @email="user@example.com", @gowalla_id="1234567890", @avatar_pic="http://example.com/img/14.jpg", @promoted=false, @name="User", @twitter_name="example", @last_login_at="2010-12-24T16:46:23Z", @twitter_id="1234567890", @id=101, @foursquare_id="1234567890">
+    <Whatser::User @bio="Example", @location="Amsterdam, NL", @facebook_id="1234567890", @email="user@example.com", @gowalla_id="1234567890", @avatar_pic="http://example.com/img/14.jpg", @promoted=false, @name="User", @twitter_name="example", @last_login_at="2010-12-24T16:46:23Z", @twitter_id="1234567890", @id=101, @foursquare_id="1234567890", @thanks_count=0, @poi_count=0, @check_ins_count=0, @media_count=0, @taggings_count=0, @follows_count=0, @followers_count=0, @comments_count=0>
 
 The API also permits anonymous user access, but in order to do so an anonymous user must first be created. Anonymous users have limited privileges and no email address, but otherwise function identically to authorized users. After the user is created, you can get the oauth token to use with your client and perform actions on behalf of the anonymous user.
 
@@ -134,8 +134,7 @@ A spot is a named geographical location and the most fundamental kind of content
     m = Whatser.client.spots.new( :name => 'my spot', :lat => 52.0, :lng => 4.0 )
     m.save
     m.delete
-    results = m.details
-    results = m.reviews
+    results = m.comments
     results = m.tags
     results = m.activity
 
@@ -170,36 +169,6 @@ A user's cities represent the cities in which they have collected spots.
     <Whatser::City @count=5, @name="Amsterdam">
 
 
-=== Reviews
-
-A review is a short- to long-form text article about a spot.
-
-    Whatser.client.reviews.list( spot_id, :page => 1, :per_page => 10 )
-    Whatser.client.reviews.find( spot_id, review_id )
-    Whatser.client.reviews.create( spot_id, :body => 'my spot review.' )
-    Whatser.client.reviews.delete( spot_id, review_id )
-    m = Whatser.client.reviews.new( :body => 'my spot review.' )
-    m.save
-    m.delete
-
-    <Whatser::Review @user_id=null, @id=101, @body="whatser spot review.", @created_at="2010-12-24T16:45:55Z">
-
-
-=== Details
-
-Details are miscellaneous, freeform information about a spot, such as operating hours, pricing, etc. The data attribute serializes a hash, which can be used to store arbitrary spot details.
-
-    Whatser.client.details.list( spot_id, :page => 1, :per_page => 10 )
-    Whatser.client.details.find( spot_id, details_id )
-    Whatser.client.details.create( spot_id, :data => {:title => 'details', :opening_hours => '8:00-5:00'} )
-    Whatser.client.details.delete( spot_id, review_id )
-    m = Whatser.client.details.new( :data => {:title => 'details', :opening_hours => '8:00-5:00'} )
-    m.save
-    m.delete
-
-    <Whatser::Detail @data={"meta"=>"Long metadata here", "opening_hours" => "9-5"}, @user_id=null, @id=101>
-
-
 === Media
 	
 Media are photos, logos, and other graphics associated with a spot. You can create new media either by supplying a file for a multipart upload, or else with a link to an existing online image.
@@ -226,7 +195,16 @@ Tags are freeform text that reflect user thoughts, opinions, and feedback on spe
     m.save
     m.delete
 
-    <Whatser::Tag @name="my tag">
+Tags can also be accessed through their spot, either by calling the model's cached tag_list, branded_tags, or making an API request for a full tag listing.
+
+    spot = Whatser.client.spots.find( spot_id )
+    spot.tag_list
+    spot.branded_tags
+    spot.tags
+
+In addition to user tags, some spots will also have branded tags, keywords promoted by Whatser partners and associated with branded images; for normal user tags, these image urls are not used. The images are customized for three platforms (web, touch, and wap), and two sizes (list and detail).
+
+    <Whatser::Tag @name="my tag", @poi_id=101, @web_list_pic="http://wht.sr/1.png", @web_detail_pic="http://wht.sr/2.png", @touch_list_pic="http://wht.sr/3.png", @touch_detail_pic="http://wht.sr/4.png", @wap_list_pic="http://wht.sr/5.png", @wap_detail_pic="http://wht.sr/6.png">
 
 
 === Follows
@@ -241,7 +219,7 @@ Follows represent a user's interest in another user, namely the user's spot acti
     m.save
     m.delete
 
-    <Whatser::Follow @location="Amsterdam, NL", @premium=false, @avatar_pic="http://example.com/avatars/thumb/1.jpg", @promoted=false, @name="Example User", @id=1>
+    <Whatser::Follow @location="Amsterdam, NL", @avatar_pic="http://example.com/avatars/thumb/1.jpg", @promoted=false, @name="Example User", @id=1>
 
 
 === Check Ins
@@ -256,18 +234,6 @@ A check in represents a user's visit to a spot, and will typically have a counte
     <Whatser::CheckIn @message="statuscastin' over here", @lng=4.8931739, @rating=3, @lat=52.3665312, @check_out_at="2010-12-24T16:46:38Z", @name="Popular Spot", @poi_id=101, @check_in_at="2010-12-24T16:31:38Z", @user_id=101>
 
 
-=== Data Sources
-
-A data source represents a free or purchasable content stream of collected spots, media, and reviews. Users can subscribe to data sources in order to access their content in Whatser. To begin the subscription and payment process, redirect your user to the data source's subscription_url.
-
-    Whatser.client.data_sources.list( :page => 1, :per_page => 10 )
-    Whatser.client.data_sources.for_users( :user_id => [101,23], :page => 1, :per_page => 10 )
-    m = Whatser.client.data_sources.find( 1 )
-    redirect_to m.subscription_url(:display => 'touch')
-
-    <Whatser::DataSource @review_count=405, @poi_count=0, @price=0.0, @collection_count=0, @name="Rough Guides - Barcelona", @media_count=0, @id=9, @users=[{"name": "premium user", "id": 33}]>
-
-
 === Comments
 
 A comment is just a short user note that can be associated with other resources. At the moment, you can comment on a POI, Media, or an Activity Feed. Users can also delete their own comments.
@@ -342,6 +308,6 @@ You can use convenience methods on users and spots to determine their connection
 
 == Copyright
 
-Copyright (c) 2010 Travis Dunn / SoGeo Company. See LICENSE.txt for
+Copyright (c) 2010-2011 Travis Dunn / SoGeo Company. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/whatser/client.rb

@@ -28,12 +28,10 @@ module Whatser
     def check_ins; Whatser::CheckIn.set(self); end
     def collections; Whatser::Collection.set(self); end
     def data_sources; Whatser::DataSource.set(self); end
-    def details; Whatser::Detail.set(self); end
     def media; Whatser::Media.set(self); end
     def spots; Whatser::Poi.set(self); end
     def users; Whatser::User.set(self); end
     def follows; Whatser::Follow.set(self); end
-    def reviews; Whatser::Review.set(self); end
     def subscriptions; Whatser::Subscription.set(self); end
     def tags; Whatser::Tag.set(self); end
     def comments; Whatser::Comment.set(self); end

data/lib/whatser/resources/comment.rb

@@ -1,6 +1,6 @@
 module Whatser
   class Comment < Whatser::Resource
-    attr_accessor :id,:user_id,:activity_feed_id,:subject_id,:created_at
+    attr_accessor :id,:user_id,:activity_feed_id,:subject_id,:poi_id,:created_at
     attr_accessor :user_name,:user_avatar,:subject_type,:subject_name,:body
     
     class << self
@@ -21,6 +21,14 @@ module Whatser
       end      
     end
     
+    def poi
+      Whatser::Poi.set(self.class.client).find(poi_id) if poi_id
+    end
+
+    def user
+      Whatser::User.set(self.class.client).find(user_id) if user_id
+    end
+    
     def delete
       self.class.delete(id)
     end     

data/lib/whatser/resources/follow.rb

@@ -2,7 +2,7 @@ module Whatser
   class Follow < Whatser::Resource
     attr_accessor :id
     attr_accessor :name,:avatar_pic,:location
-    attr_accessor :promoted,:premium,:collections_count
+    attr_accessor :promoted,:collections_count
     attr_accessor :following,:followed,:foaf_count,:foaf
     
     class << self

data/lib/whatser/resources/poi.rb

@@ -1,8 +1,9 @@
 module Whatser
   class Poi < Whatser::Resource
     attr_accessor :id,:user_id,:gowalla_id,:foursquare_id
-    attr_accessor :name,:lat,:lng,:street,:district,:region,:city,:postal_code,:country
-    attr_accessor :tag_list,:created_at
+    attr_accessor :name,:opening_times,:directions,:payment_methods,:pricing,:website,:phone_number
+    attr_accessor :lat,:lng,:street,:district,:region,:city,:postal_code,:country
+    attr_accessor :tag_list,:created_at,:branded_tags
     
     class << self
       def suggested(opts={})
@@ -26,6 +27,19 @@ module Whatser
       end        
     end
     
+    def branded_tags=(val)
+      if val.is_a?(Array)
+        @branded_tags = []
+        val.each do |tag|
+          if tag.is_a?(Whatser::Tag)
+            @branded_tags << tag
+          else
+            @branded_tags << Resource.from_hash_to_model(tag, Whatser::Tag)
+          end
+        end
+      end
+    end
+    
     def save
       if id.blank?
         self.class.create(to_params)
@@ -50,14 +64,6 @@ module Whatser
       Whatser::Media.list(id, opts)
     end
     
-    def reviews(opts={})
-      Whatser::Review.set(self.class.client).list(id, opts)
-    end
-    
-    def details(opts={})
-      Whatser::Detail.set(self.class.client).list(id, opts)
-    end    
-    
     def activity(opts)
       Whatser::ActivityFeed.set(self.class.client).spot( self.id, opts )
     end

data/lib/whatser/resources/tag.rb

@@ -2,6 +2,7 @@ module Whatser
   class Tag < Whatser::Resource
     attr_accessor :id,:poi_id
     attr_accessor :name
+    attr_accessor :web_list_pic,:web_detail_pic,:touch_list_pic,:touch_detail_pic,:wap_list_pic,:wap_detail_pic
     
     class << self
       def list(poi_id, opts={})

data/lib/whatser/resources/user.rb

@@ -2,9 +2,10 @@ module Whatser
   class User < Whatser::Resource
     attr_accessor :id,:facebook_id,:gowalla_id,:foursquare_id,:twitter_id
     attr_accessor :name,:twitter_name,:avatar_pic,:location,:bio,:email
-    attr_accessor :last_login_at,:promoted,:premium,:collections_count
+    attr_accessor :last_login_at,:promoted
     attr_writer   :avatar,:remote_avatar,:password,:lat,:lng
-    attr_writer   :access_tokens
+    attr_writer   :comments_count,:poi_count,:check_ins_count,:media_count,:taggings_count,:follows_count,:followers_count,:collections_count
+    attr_writer   :access_token
     
     class << self
       def me
@@ -53,13 +54,7 @@ module Whatser
     end
     
     def oauth_token
-      if access_tokens.blank? 
-        nil
-      elsif access_tokens.is_a?(Array)
-        access_tokens.first
-      else
-        access_token
-      end
+      access_token
     end
     
     def facebook_connected?

data/lib/whatser.rb

@@ -12,11 +12,8 @@ require File.expand_path('../whatser/resources/resource', __FILE__)
 require File.expand_path('../whatser/resources/city', __FILE__)
 require File.expand_path('../whatser/resources/check_in', __FILE__)
 require File.expand_path('../whatser/resources/collection', __FILE__)
-require File.expand_path('../whatser/resources/data_source', __FILE__)
-require File.expand_path('../whatser/resources/detail', __FILE__)
 require File.expand_path('../whatser/resources/media', __FILE__)
 require File.expand_path('../whatser/resources/poi', __FILE__)
-require File.expand_path('../whatser/resources/review', __FILE__)
 require File.expand_path('../whatser/resources/subscription', __FILE__)
 require File.expand_path('../whatser/resources/tag', __FILE__)
 require File.expand_path('../whatser/resources/user', __FILE__)

data/test/test_client.rb

@@ -67,8 +67,7 @@ class TestClient < Test::Unit::TestCase
     client = Whatser::Client.new
     assert_equal Whatser::CheckIn, client.check_ins
     assert_equal Whatser::Collection, client.collections
-    assert_equal Whatser::DataSource, client.data_sources
-    assert_equal Whatser::Detail, client.details
+    assert_equal Whatser::Comment, client.comments
     assert_equal Whatser::Media, client.media
     assert_equal Whatser::Poi, client.spots
     assert_equal Whatser::Subscription, client.subscriptions
@@ -82,8 +81,7 @@ class TestClient < Test::Unit::TestCase
     
     assert_equal client, client.check_ins.client
     assert_equal client, client.collections.client
-    assert_equal client, client.data_sources.client
-    assert_equal client, client.details.client
+    assert_equal client, client.comments.client
     assert_equal client, client.media.client
     assert_equal client, client.spots.client
     assert_equal client, client.subscriptions.client

data/test/test_comment.rb

@@ -5,7 +5,20 @@ class TestComment < Test::Unit::TestCase
     @client = Whatser::Client.new
     @poi_id = 1
     @media_id = 1    
-    @comment = Whatser::Comment.new(:poi_id => @poi_id, :body => 'test')
+    @user_id = 1
+    @comment = Whatser::Comment.new(:poi_id => @poi_id, :body => 'test', :user_id => @user_id)
+  end
+  
+  def test_poi
+    assert @comment.poi.is_a?(Whatser::Response)
+    @comment.poi_id = nil
+    assert_nil @comment.poi
+  end
+  
+  def test_user
+    assert @comment.user.is_a?(Whatser::Response)
+    @comment.user_id = nil
+    assert_nil @comment.user
   end
   
   def test_poi_list

data/test/test_poi.rb

@@ -79,13 +79,25 @@ class TestPoi < Test::Unit::TestCase
   
   def test_comments
     assert @poi.comments(:opt => 'test').is_a?(Whatser::Response)
-  end  
+  end   
   
-  def test_details
-    assert @poi.details(:page => 1).is_a?(Whatser::Response)
+  def branded_tags
+    @poi.branded_tags = nil
+    assert_nil @poi.branded_tags
+    
+    @poi.branded_tags = {}
+    assert_nil @poi.branded_tags
+    
+    @poi.branded_tags = []
+    assert_equal [], @poi.branded_tags
+    
+    tag = Whatser::Tag.new(:name => 'test')
+    tags = [tag]
+    @poi.branded_tags = tags
+    assert_equal [tag], @poi.branded_tags
+    
+    tags = [{"name"=>"hash","web_detail_pic_url"=>nil,"touch_detail_pic_url"=>nil,"touch_list_pic_url"=>nil,"web_list_pic_url"=>nil,"wap_detail_pic_url"=>nil,"wap_list_pic_url"=>nil}]
+    @poi.branded_tags = tags
+    assert_equal "hash", @poi.branded_tags.first.name
   end
-  
-  def test_reviews
-    assert @poi.reviews(:page => 1).is_a?(Whatser::Response)
-  end    
 end

data/whatser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whatser}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Dunn"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-03-04}
   s.description = %q{The 'Whatser API' Gem is a simple Ruby / Rails wrapper for interacting with Whatser's location-based web services (see http://docs.sogeoapi.com for more details).}
   s.email = %q{cmd@travisdunn.com}
   s.extra_rdoc_files = [
@@ -42,13 +42,10 @@ Gem::Specification.new do |s|
     "lib/whatser/resources/city.rb",
     "lib/whatser/resources/collection.rb",
     "lib/whatser/resources/comment.rb",
-    "lib/whatser/resources/data_source.rb",
-    "lib/whatser/resources/detail.rb",
     "lib/whatser/resources/follow.rb",
     "lib/whatser/resources/media.rb",
     "lib/whatser/resources/poi.rb",
     "lib/whatser/resources/resource.rb",
-    "lib/whatser/resources/review.rb",
     "lib/whatser/resources/subscription.rb",
     "lib/whatser/resources/tag.rb",
     "lib/whatser/resources/user.rb",
@@ -60,8 +57,6 @@ Gem::Specification.new do |s|
     "test/test_collection.rb",
     "test/test_comment.rb",
     "test/test_configuration.rb",
-    "test/test_data_source.rb",
-    "test/test_detail.rb",
     "test/test_facebook.rb",
     "test/test_follow.rb",
     "test/test_foursquare.rb",
@@ -72,7 +67,6 @@ Gem::Specification.new do |s|
     "test/test_poi.rb",
     "test/test_resource.rb",
     "test/test_response.rb",
-    "test/test_review.rb",
     "test/test_service.rb",
     "test/test_subscription.rb",
     "test/test_tag.rb",
@@ -94,8 +88,6 @@ Gem::Specification.new do |s|
     "test/test_collection.rb",
     "test/test_comment.rb",
     "test/test_configuration.rb",
-    "test/test_data_source.rb",
-    "test/test_detail.rb",
     "test/test_facebook.rb",
     "test/test_follow.rb",
     "test/test_foursquare.rb",
@@ -106,7 +98,6 @@ Gem::Specification.new do |s|
     "test/test_poi.rb",
     "test/test_resource.rb",
     "test/test_response.rb",
-    "test/test_review.rb",
     "test/test_service.rb",
     "test/test_subscription.rb",
     "test/test_tag.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whatser
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Travis Dunn
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,13 +141,10 @@ files:
 - lib/whatser/resources/city.rb
 - lib/whatser/resources/collection.rb
 - lib/whatser/resources/comment.rb
-- lib/whatser/resources/data_source.rb
-- lib/whatser/resources/detail.rb
 - lib/whatser/resources/follow.rb
 - lib/whatser/resources/media.rb
 - lib/whatser/resources/poi.rb
 - lib/whatser/resources/resource.rb
-- lib/whatser/resources/review.rb
 - lib/whatser/resources/subscription.rb
 - lib/whatser/resources/tag.rb
 - lib/whatser/resources/user.rb
@@ -159,8 +156,6 @@ files:
 - test/test_collection.rb
 - test/test_comment.rb
 - test/test_configuration.rb
-- test/test_data_source.rb
-- test/test_detail.rb
 - test/test_facebook.rb
 - test/test_follow.rb
 - test/test_foursquare.rb
@@ -171,7 +166,6 @@ files:
 - test/test_poi.rb
 - test/test_resource.rb
 - test/test_response.rb
-- test/test_review.rb
 - test/test_service.rb
 - test/test_subscription.rb
 - test/test_tag.rb
@@ -221,8 +215,6 @@ test_files:
 - test/test_collection.rb
 - test/test_comment.rb
 - test/test_configuration.rb
-- test/test_data_source.rb
-- test/test_detail.rb
 - test/test_facebook.rb
 - test/test_follow.rb
 - test/test_foursquare.rb
@@ -233,7 +225,6 @@ test_files:
 - test/test_poi.rb
 - test/test_resource.rb
 - test/test_response.rb
-- test/test_review.rb
 - test/test_service.rb
 - test/test_subscription.rb
 - test/test_tag.rb

data/lib/whatser/resources/data_source.rb

@@ -1,24 +0,0 @@
-module Whatser
-  class DataSource < Whatser::Resource
-    attr_accessor :id
-    attr_accessor :name,:price,:review_count,:media_count,:collection_count,:poi_count
-    attr_accessor :users
-    
-    class << self
-      def list(opts={})
-        api_request :get, "/api/data_sources", {:query => opts}
-      end
-      
-      def for_users(user_id, opts={})
-        user_id = user_id.is_a?(Array) ? user_id.join(',') : user_id
-        api_request :get, "/api/data_sources", {:query => {:user_id => user_id}.merge(opts || {})}
-      end      
-    end
-    
-    def subscription_url(opts={})
-      url = "#{self.class.client.api_uri}/payments/data_sources/#{id}/orders/new?oauth_token=#{self.class.client.oauth_token}"
-      url = "#{url}&#{opts.to_params}" unless opts.blank?
-      url
-    end
-  end
-end

data/lib/whatser/resources/detail.rb

@@ -1,40 +0,0 @@
-module Whatser
-  class Detail < Whatser::Resource
-    attr_accessor :id,:user_id,:poi_id
-    attr_accessor :data,:created_at
-    
-    class << self
-      def list(poi_id, opts={})
-        api_request :get, "/api/poi/#{poi_id}/details", {:query => opts}
-      end
-              
-      def find(poi_id, id, opts={})
-        api_request :get, "/api/poi/#{poi_id}/details/#{id}", {:query => opts}
-      end
-      
-      def create(poi_id, params={})
-        api_request :post, "/api/poi/#{poi_id}/details", {:body => {'detail' => params} }
-      end  
-      
-      def delete(poi_id, id)
-        api_request :delete, "/api/poi/#{poi_id}/details/#{id}"
-      end              
-    end      
-    
-    def save
-      if id.blank?
-        self.class.create(poi_id, to_params)
-      else
-        api_request :put, "/api/poi/#{poi_id}/details/#{id}", {:body => {'detail' => to_params} }
-      end
-    end           
-    
-    def delete
-      self.class.delete(poi_id, id)
-    end       
-    
-    def to_params
-      {:data => data}
-    end
-  end
-end

data/lib/whatser/resources/review.rb

@@ -1,40 +0,0 @@
-module Whatser
-  class Review < Whatser::Resource
-    attr_accessor :id,:user_id,:poi_id
-    attr_accessor :body,:created_at
-    
-    class << self
-      def list(poi_id, opts={})
-        api_request :get, "/api/poi/#{poi_id}/reviews", {:query => opts}
-      end
-              
-      def find(poi_id, id, opts={})
-        api_request :get, "/api/poi/#{poi_id}/reviews/#{id}", {:query => opts}
-      end
-      
-      def create(poi_id, params={})
-        api_request :post, "/api/poi/#{poi_id}/reviews", {:body => {'review' => params} }
-      end
-      
-      def delete(poi_id, id)
-        api_request :delete, "/api/poi/#{poi_id}/reviews/#{id}"
-      end               
-    end      
-    
-    def save
-      if id.blank?
-        self.class.create(poi_id, to_params)
-      else
-        api_request :put, "/api/poi/#{poi_id}/reviews/#{id}", {:body => {'review' => to_params} }
-      end
-    end           
-    
-    def delete
-      self.class.delete(poi_id, id)
-    end       
-    
-    def to_params
-      {:body => body}
-    end      
-  end
-end

data/test/test_data_source.rb

@@ -1,35 +0,0 @@
-require 'helper'
-
-class TestDataSource < Test::Unit::TestCase
-  def setup
-    @client = Whatser::Client.new(:oauth_token => '1234')
-  end
-  
-  def test_list
-    assert @client.data_sources.list(:page => 1).is_a?(Whatser::Response)
-  end
-  
-  def test_for_users_with_id
-    assert @client.data_sources.for_users(1, :page => 1).is_a?(Whatser::Response)
-  end  
-
-  def test_for_users_with_string
-    assert @client.data_sources.for_users('1,2,3', :page => 1).is_a?(Whatser::Response)
-  end  
-
-  def test_for_users_with_array
-    assert @client.data_sources.for_users([1,2,3], :page => 1).is_a?(Whatser::Response)
-  end
-    
-  def test_subscription_url
-    datasource = @client.data_sources.new(:id => '1')
-    expected = "#{@client.api_uri}/payments/data_sources/1/orders/new?oauth_token=1234"
-    assert_equal expected, datasource.subscription_url
-  end
-  
-  def test_subscription_url_with_params  
-    datasource = @client.data_sources.new(:id => '1')
-    expected = "#{@client.api_uri}/payments/data_sources/1/orders/new?oauth_token=1234&test=2&extra=1"
-    assert_equal expected, datasource.subscription_url(:extra => 1, :test => 2)
-  end
-end

data/test/test_detail.rb

@@ -1,38 +0,0 @@
-require 'helper'
-
-class TestDetail < Test::Unit::TestCase
-  def setup
-    @client = Whatser::Client.new
-    @poi_id = 1
-    @params = {:rating => 'four stars', :hours => '9-5'}
-    @detail = Whatser::Detail.new(:poi_id => @poi_id, :data => @params)
-  end
-  
-  def test_list
-    assert @client.reviews.list(@poi_id, :page => 1).is_a?(Whatser::Response)
-  end
-  
-  def test_create
-    assert @client.reviews.create(@poi_id, :data => @params).is_a?(Whatser::Response)
-  end
-  
-  def test_delete
-    assert @client.reviews.delete(@poi_id, :data => @params).is_a?(Whatser::Response)
-  end  
-  
-  def test_save
-    assert @detail.save.is_a?(Whatser::Response)
-  end
-  
-  def test_update
-    @detail.id = 1
-    assert @detail.save.is_a?(Whatser::Response)
-  end  
-    
-  def test_to_params
-    params = [:data]
-    params.each do |p|
-      assert @detail.to_params.keys.include?(p)
-    end
-  end  
-end

data/test/test_review.rb

@@ -1,37 +0,0 @@
-require 'helper'
-
-class TestReview < Test::Unit::TestCase
-  def setup
-    @client = Whatser::Client.new
-    @poi_id = 1
-    @review = Whatser::Review.new(:poi_id => @poi_id, :body => 'four stars')
-  end
-  
-  def test_list
-    assert @client.reviews.list(@poi_id, :page => 1).is_a?(Whatser::Response)
-  end
-  
-  def test_create
-    assert @client.reviews.create(@poi_id, :body => 'four stars').is_a?(Whatser::Response)
-  end
-  
-  def test_delete
-    assert @client.reviews.delete(@poi_id, :body => 'four stars').is_a?(Whatser::Response)
-  end  
-  
-  def test_save
-    assert @review.save.is_a?(Whatser::Response)
-  end
-  
-  def test_update
-    @review.id = 1
-    assert @review.save.is_a?(Whatser::Response)
-  end  
-    
-  def test_to_params
-    params = [:body]
-    params.each do |p|
-      assert @review.to_params.keys.include?(p)
-    end
-  end  
-end