r43 0.2.0 → 0.3.0

data/test/search_tags-travel.xml

@@ -0,0 +1,39 @@
+<feed>
+<title>Tag search results for "travel" on 43 Things</title>
+<link href="http://www.43things.com/search/query?q=travel" rel="alternate" type="text/html"/>
+<query>travel</query>
+-
+	<pagination>
+<offset>0</offset>
+<max>20</max>
+<total>159</total>
+<next_offset>20</next_offset>
+<previous_offset/>
+</pagination>
+-
+	<tags>
+-
+	<tag count="1">
+travel travelling europe france spain menorca mallorca work webdesign exchange flower therapy healing reiki teachings agriculture
+</tag>
+<tag count="1627">travel</tag>
+<tag count="1">travel.</tag>
+<tag count="15">travelling</tag>
+<tag count="4">traveling</tag>
+<tag count="1">traveled</tag>
+<tag count="1">'travel'</tag>
+<tag count="1">traveler</tag>
+<tag count="4">travels</tag>
+<tag count="1">travel!</tag>
+<tag count="1">go travelling</tag>
+<tag count="1">when i travel</tag>
+<tag count="1">ireland travel</tag>
+<tag count="1">mexico travel</tag>
+<tag count="4">space travel</tag>
+<tag count="1">travel texas</tag>
+<tag count="1">travel tibet</tag>
+<tag count="7">travel to europe</tag>
+<tag count="2">wine travel</tag>
+<tag count="1">travel canada</tag>
+</tags>
+</feed>

data/test/test_r43.rb

@@ -6,6 +6,28 @@ require 'test/unit'
 require 'r43'
 require 'stringio'
 
+
+class Test::Unit::TestCase
+
+  def assert_includes(item, enum)
+    assert(enum.include?(item), "expected to find #{item}, but didn't")
+  end
+
+  def assert_array_of(type, array)
+    assert_instance_of(Array, array)
+    is_homogenous = array.all? do |element|
+      element.class == type
+    end
+    assert is_homogenous
+  end
+
+  def assert_number_of(type, count, enum)
+    assert_kind_of(Enumerable, enum)
+    assert_equal(count, enum.find_all{|e|e.instance_of? type}.length)
+  end
+
+end
+
 class FakeService < R43::Service
 
   #
@@ -33,6 +55,8 @@ class FakeService < R43::Service
       "#{File.open('test/search_goals-ruby-offset20-max10.xml').read}",
     "get_goal_by_id?api_key=1234&id=255" =>
       "#{File.open('test/get_goal_by_id-255.xml').read}",
+    "get_goal_by_id?api_key=1234&id=533" =>
+      "#{File.open('test/get_goal_by_id-533.xml').read}",
     "get_goal_by_name?api_key=1234&name=Try+out+43+Things" =>
       "#{File.open('test/get_goal_by_name-255.xml').read}",
     "get_goals_similarities?api_key=1234&id=255" =>
@@ -77,6 +101,10 @@ class FakeService < R43::Service
 
     #
     # Team Methods
+    "get_teams_progress?api_key=1234&id=222591" =>
+      "#{File.open('test/get_teams_progress-222591.xml').read}",
+    "get_teams_progress?api_key=1234&id=7" =>
+      "#{File.open('test/get_teams_progress-7.xml').read}",
       
     #
     # Entry Methods
@@ -85,6 +113,20 @@ class FakeService < R43::Service
 
     #
     # Tag Methods
+    "search_tags?api_key=1234&q=travel" =>
+      "#{File.open('test/search_tags-travel.xml').read}",
+    "search_tags?api_key=1234&q=travel&offset=20" =>
+      "#{File.open('test/search_tags-travel-offset20.xml').read}",
+    "search_tags?api_key=1234&q=lose+weight" =>
+      "#{File.open('test/search_tags-lose+weight.xml').read}",
+    "get_tags_goals?api_key=1234&id=travel" =>
+      "#{File.open('test/get_tags_goals-travel.xml').read}",
+    "get_tags_goals?api_key=1234&id=travel&offset=20" =>
+      "#{File.open('test/get_tags_goals-travel-offset20.xml').read}",
+    "get_tags_goals?api_key=1234&id=travel&offset=80&max=10" =>
+      "#{File.open('test/get_tags_goals-travel-offset80-max10.xml').read}",
+    "get_tags_similarities?api_key=1234&id=travel" =>
+      "#{File.open('test/get_tags_similarities-travel.xml').read}",
 
     #
     # City Methods
@@ -92,18 +134,27 @@ class FakeService < R43::Service
       "#{File.open('test/search_cities-london.xml').read}",
     "get_city?api_key=1234&id=36" =>
       "#{File.open('test/get_city-36.xml').read}",
+    "get_city?api_key=1234&id=1164" =>
+      "#{File.open('test/get_city-1164.xml').read}",
     "get_citys_people?api_key=1234&id=1164" =>
       "#{File.open('test/get_citys_people-1164.xml').read}",
     "get_citys_people?api_key=1234&id=1164&offset=20" =>
       "#{File.open('test/get_citys_people-1164-offset20.xml').read}",
     "get_citys_people?api_key=1234&id=1164&offset=20&max=20" =>
-      "#{File.open('test/get_citys_people-1164-offset20.xml').read}"
+      "#{File.open('test/get_citys_people-1164-offset20.xml').read}",
     
     #
     # Action Methods
 
     #
     # ATOM Methods
+
+    # calls on other 43 Family sites
+    "get_persons_tags?api_key=1234&id=Alvaro" =>
+      "#{File.open('test/es-get_persons_tags-Alvaro.xml').read}",
+    "get_person?api_key=1234&id=pate" =>
+      "#{File.open('test/idea-get_person-pate.xml').read}"
+
   }
   
 
@@ -115,11 +166,11 @@ end
 
 class FakeConnection < R43::Connection
   attr_reader :proxy_addr
-  def initialize(key, proxy_addr=nil, proxy_port=nil, 
+  def initialize(key, url='www.43things.com', proxy_addr=nil, proxy_port=nil, 
                  proxy_user=nil, proxy_pass=nil)
     super key
     @proxy_addr = proxy_addr
-    @service = FakeService.new(key, proxy_addr, proxy_port, 
+    @service = FakeService.new(key, url, proxy_addr, proxy_port, 
                                proxy_user, proxy_pass)
   end
 end
@@ -129,18 +180,6 @@ class TestConnection < Test::Unit::TestCase
     @connection = FakeConnection.new('1234')
   end
 
-  def assert_array_of(type, array)
-    assert_instance_of(Array, array)
-    array.each do |element|
-      assert_instance_of(type, element)
-    end
-  end
-
-  def assert_number_of(type, count, enum)
-    assert_kind_of(Enumerable, enum)
-    assert_equal(count, enum.find_all{|e|e.instance_of? type}.length)
-  end
-
   def test_key
     assert_equal('1234',@connection.service.key)
     newreq = FakeConnection.new(1234)
@@ -155,7 +194,7 @@ class TestConnection < Test::Unit::TestCase
                    "controller"=>"service"},
                  @connection.echo)
     # and testing it with a proxy
-    req = FakeConnection.new(1234, "http://proxy.example.com")
+    req = FakeConnection.new(1234, "www", "http://proxy.example.com")
     assert_not_nil(req.proxy_addr)
   end
 
@@ -164,9 +203,35 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_get_entry
-    content = "It's odd to say that the objective is survival rather than huge market success. But just making it work and sticking to it is the objective I'm after.  Hopefully, by making sure the product we develop is meaningful and the work set-up is friendly and fun, drudgery will be held in abeyance and the world will be positively impacted by what we do.\\n\\nAnyway, about 2-3 times a day I'm struck with some paranoid thought or shuddering fear about making sure the company is still here in 2-3 years. It's like an internal emotional tide. Here comes the wave of utter terror! There goes the tide of dread and its a cresting wave of happiness again."
+    entry = @connection.get_entry(33)
+    assert_entry_33(entry)
+    entry_by_number = @connection.get_entry(entry.entry_id)
+    assert_entry_33(entry_by_number)
+    entry_by_id = @connection.get_entry(entry.id)
+    assert_entry_33(entry_by_id)
+    entry_by_entry = @connection.get_entry(entry)
+    assert_entry_33(entry_by_entry)
 
     entry = @connection.get_entry(33)
+    entry.title= nil
+    entry.author= nil
+    entry.dc_subject= nil
+    entry.goal.goal_id = nil
+    entry.goal.num_registered_people= nil
+    entry.content= nil
+    entry.num_comments= nil
+    entry.issued= nil
+    entry.link= nil
+    entry.id= nil
+    entry.entry_id= nil
+    entry_after_mod = @connection.response.entry
+    assert_entry_33(entry_after_mod)
+  end
+
+  # custom assert for use by test_get_entry
+  def assert_entry_33(entry)
+    content = "It's odd to say that the objective is survival rather than huge market success. But just making it work and sticking to it is the objective I'm after.  Hopefully, by making sure the product we develop is meaningful and the work set-up is friendly and fun, drudgery will be held in abeyance and the world will be positively impacted by what we do.\\n\\nAnyway, about 2-3 times a day I'm struck with some paranoid thought or shuddering fear about making sure the company is still here in 2-3 years. It's like an internal emotional tide. Here comes the wave of utter terror! There goes the tide of dread and its a cresting wave of happiness again."
+
     assert_instance_of(R43::Response, @connection.response)
     assert_array_of(Entry, @connection.response.entries)
     assert_number_of(Entry, 1, @connection.response.entries)
@@ -186,9 +251,30 @@ class TestConnection < Test::Unit::TestCase
     assert_equal("tag:43things.com:joshp:entry:33", entry.id.to_s)
   end
 
-
   def test_get_goal_by_id
     goal = @connection.get_goal_by_id(255)
+    goal_by_id = @connection.get_goal_by_id(goal.id)
+    goal_by_goal = @connection.get_goal_by_id(goal)
+    assert_goal_255(goal)
+    assert_goal_255(goal_by_id)
+    assert_goal_255(goal_by_goal)
+
+    goal_before_mods = @connection.get_goal_by_id(255)
+    goal_before_mods.name= nil
+    goal_before_mods.link= nil
+    goal_before_mods.num_registered_people= nil
+    goal_before_mods.num_unregistered_people= nil
+    goal_before_mods.num_say_worth_it= nil
+    goal_before_mods.num_say_not_worth_it= nil
+    goal_before_mods.percentage_worth_it= nil
+    goal_before_mods.tags.clear
+    goal_before_mods.id= nil
+    goal_after_mods = @connection.response.goal
+    assert_goal_255(goal_after_mods)
+  end
+
+  # custom asser for test_get_goal_by_id
+  def assert_goal_255(goal)
     assert_instance_of(Goal, goal)
     assert_equal("Try out 43 Things", goal.name)
     assert_equal("http://www.43things.com/things/view/255",
@@ -208,6 +294,7 @@ class TestConnection < Test::Unit::TestCase
     assert_equal("tag:43things.com:goal:255",goal.id.to_s)
   end
 
+
   def test_get_goal_by_name
     goal = @connection.get_goal_by_name("Try out 43 Things")
     assert_instance_of(Goal, goal)
@@ -234,45 +321,85 @@ class TestConnection < Test::Unit::TestCase
     assert_array_of(Goal, goals)
     assert_number_of(Goal, 1, goals)
     assert_equal("finish reading The Little Schemer", goals[0].name)
-    goals = @connection.search_goals("ruby", {"offset" => 20, "max" => 10})
+    goals = @connection.search_goals("ruby", {:offset => 20, :max => 10})
     assert_array_of(Goal, goals)
     assert_number_of(Goal, 10, goals)
     assert_equal("Learn to program in Ruby", goals[0].name)
   end
 
   def test_get_goals_similarities
-    goals = @connection.get_goals_similarities(255)
+    goal_255 = @connection.get_goal_by_id(255)
+    goals_by_number = @connection.get_goals_similarities(goal_255.goal_id)
+    goals_by_id = @connection.get_goals_similarities(goal_255.id)
+    goals_by_goal = @connection.get_goals_similarities(goal_255)
+    assert_goals_similar_to_255(goals_by_number)
+    assert_goals_similar_to_255(goals_by_id)
+    assert_goals_similar_to_255(goals_by_goal)
+    goals_by_goal.clear
+    goals_after_mod = @connection.response.goals
+    assert_goals_similar_to_255(goals_after_mod)
+  end
+  
+  # custom assert for use by test_get_goals_similarities
+  def assert_goals_similar_to_255(goals)
     assert_array_of(Goal, goals)
+    assert_number_of(Goal, 5, goals)
     assert_equal(212,goals[0].goal_id)
     assert_equal("Make Firefox my default browser",goals[1].name)
   end
 
   def test_get_goals_people
-    people = @connection.get_goals_people(533)
-    assert_array_of(Person, people)
-    assert_number_of(Person, 20, people)
-    assert_equal("pate", people[0].name)
-    people = @connection.get_goals_people(533,{"offset"=>20})
+    goal_533 = @connection.get_goal_by_id(533)
+    people = @connection.get_goals_people(goal_533.goal_id)
+    assert_people_of_goal_533(people)
+    people = @connection.get_goals_people(goal_533.id)
+    assert_people_of_goal_533(people)
+    people = @connection.get_goals_people(goal_533)
+    assert_people_of_goal_533(people)
+    people.clear
+    people = @connection.response.people
+    assert_people_of_goal_533(people)
+    people = @connection.get_goals_people(533,{:offset=>20})
     assert_array_of(Person, people)
     assert_number_of(Person, 5, people)
     assert_equal("Guan Yang", people[0].name)
   end
+  
+  # custom assert for use by test_get_goals_people
+  def assert_people_of_goal_533(people)
+    assert_array_of(Person, people)
+    assert_number_of(Person, 20, people)
+    assert_equal("pate", people[0].name)
+  end
 
   def test_get_goals_entries
-    entries = @connection.get_goals_entries(533)
-    assert_array_of(Entry, entries)
-    assert_number_of(Entry, 4, entries)
-    assert_equal("pate", entries[0].author.name)
+    goal_533 = @connection.get_goal_by_id(533)
+    entries = @connection.get_goals_entries(goal_533.goal_id)
+    assert_entries_of_goal_533(entries)
+    entries = @connection.get_goals_entries(goal_533.id)
+    assert_entries_of_goal_533(entries)
+    entries = @connection.get_goals_entries(goal_533)
+    assert_entries_of_goal_533(entries)
+    entries.clear
+    entries = @connection.response.entries
+    assert_entries_of_goal_533(entries)
     entries = @connection.get_goals_entries(255, {
-                                             "offset" => 20, 
-                                             "max" => 10, 
-                                             "view" => "done"
+                                             :offset => 20, 
+                                             :max => 10, 
+                                             :view => "done"
                                            })
     assert_array_of(Entry, entries)
     assert_number_of(Entry, 10, entries)
     assert_equal("iflynn",entries[0].author.name)
   end
   
+  # custom assert for use by test_get_goals_entries
+  def assert_entries_of_goal_533(entries)
+    assert_array_of(Entry, entries)
+    assert_number_of(Entry, 4, entries)
+    assert_equal("pate", entries[0].author.name)
+  end
+  
   def test_search_people
     people = @connection.search_people("Sean")
     assert_array_of(Person, people)
@@ -317,6 +444,14 @@ class TestConnection < Test::Unit::TestCase
     assert_equal(person.flickr_username, person3.flickr_username)
   end
 
+  def test_get_person_idea
+    connection = FakeConnection.new(1234,'idea.43things.com')
+    person = connection.get_person('pate')
+    assert_instance_of(Person, person)
+    assert_equal("pate", person.username)
+    assert_equal("pate", person.name)
+  end
+
   def test_get_persons_completed_things
     person = @connection.get_persons_completed_things("erik")
     assert_instance_of(Person, person)
@@ -375,6 +510,13 @@ class TestConnection < Test::Unit::TestCase
     # TODO: test with flickr_username
   end
 
+  def test_get_persons_tags_es
+    connection = FakeConnection.new(1234, "es.43things.com")
+    tags = connection.get_persons_tags("Alvaro")
+    assert_array_of(Tag, tags)
+    assert_number_of(Tag, 3, tags)
+  end
+
   def test_get_persons_tag_cloud
     tags = @connection.get_persons_tag_cloud("erik")
     assert_array_of(Tag, tags)
@@ -383,6 +525,46 @@ class TestConnection < Test::Unit::TestCase
     # TODO: test with flickr_username
   end
 
+  def test_get_teams_progress
+    entries = @connection.get_teams_progress("222591")
+    assert_array_of(Entry, entries)
+    assert_number_of(Entry, 3, entries)
+    assert_equal("tag:43things.com:pate:entry:156413", entries[0].id.to_s)
+
+    people = @connection.response.people
+    assert_number_of(Person, 5, people)
+    assert_equal('milythael', people[2].username)
+
+    title = 'Team of 5\'s progress on "finish a 1.0 release of r43" at 43 Things'
+    assert_equal(title, @connection.response.title)
+    entries.clear
+    assert_number_of(Entry, 0, entries)
+
+    entries = @connection.response.entries
+    assert_array_of(Entry, entries)
+    assert_number_of(Entry, 3, entries)
+
+    title = 'Team of 3\'s progress on "start a company that survives longer than 2 years" at 43 Things'
+    entries = @connection.get_teams_progress("7")
+    people = @connection.response.people
+    tags = @connection.response.tags
+
+    assert_array_of(Entry, entries)
+    assert_array_of(Person, people)
+    assert_array_of(Tag, tags)
+
+    assert_number_of(Entry, 4, entries)
+    assert_number_of(Person, 3, people)
+    assert_number_of(Tag, 3, tags)
+
+    assert_equal(title, @connection.response.title)
+    assert_equal(16068, entries[0].to_i)
+    assert_equal('erik', people[1].username)
+    assert_equal('business', tags[2].name)
+
+  end
+
+
   def test_search_cities
     cities = @connection.search_cities("london")
     assert_instance_of(Array, cities)
@@ -393,6 +575,24 @@ class TestConnection < Test::Unit::TestCase
   
   def test_get_city
     city = @connection.get_city(36)
+    assert_city_36(city)
+    city_by_number = @connection.get_city(city.city_id)
+    assert_city_36(city_by_number)
+    city_by_city = @connection.get_city(city)
+    assert_city_36(city_by_city)
+    
+    city = @connection.get_city(36)
+    city.name= nil
+    city.region= nil
+    city.country= nil
+    city.num_people= nil
+    city.goals.clear
+    city_after_mod = @connection.response.city
+    assert_city_36(city_after_mod)
+  end
+
+  # custom assert for use by test_get_city
+  def assert_city_36(city)
     assert_instance_of(R43::Response, @connection.response)
     assert_equal(1, @connection.response.cities.length)
     assert_instance_of(Array, @connection.response.cities)
@@ -405,19 +605,88 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_get_citys_people
-    people = @connection.get_citys_people(1164)
-    assert_instance_of(Array, people)
-    assert_equal("zerokarmaleft", people[5].username)
-    people.each { |person| assert_instance_of(Person, person) }
+    city = @connection.get_city(1164)
+    people_by_number = @connection.get_citys_people(city.city_id)
+    assert_people_of_city_1164(people_by_number)
+    people_by_city = @connection.get_citys_people(city)
+    assert_people_of_city_1164(people_by_city)
+    
+    people = @connection.get_citys_people(city)
+    people.clear
+    people_after_mod = @connection.response.people
+    assert_people_of_city_1164(people_after_mod)
+
+    people = @connection.get_citys_people(city)
     people += @connection.more()
-    assert_equal(21, people.length)
+    assert_array_of(Person, people)
+    assert_number_of(Person, 21, people)
     assert_equal("JoelBlain", people[20].username)
 
-    people = @connection.get_citys_people(1164, {"offset" => 20,"max" => 20 })
+    people = @connection.get_citys_people(1164, {:offset => 20,:max => 20 })
     assert_equal(1, people.length)
     assert_equal("JoelBlain", people[0].username)
     people.each { |person| assert_instance_of(Person, person) }
   end
+
+  # custom assert for use by test_get_cities_people
+  def assert_people_of_city_1164(people)
+    assert_array_of(Person, people)
+    assert_number_of(Person, 20, people)
+    assert_equal("zerokarmaleft", people[5].username)
+  end
+
+  def test_search_tags
+    tags = @connection.search_tags 'travel'
+    assert_array_of(Tag, tags)
+    assert_number_of(Tag, 20, tags)
+    assert_equal(1627, tags[1].count)
+    assert_equal('travel to europe', tags[17].name)
+
+    tags += @connection.more
+    assert_array_of(Tag, tags)
+    assert_number_of(Tag, 40, tags)
+    assert_equal(13, tags[33].count)
+    assert_equal('travel the world', tags[33].name)
+
+    tags = @connection.search_tags 'lose weight'
+    assert_array_of(Tag, tags)
+    assert_equal('lose weight', tags[2].name)
+    assert_equal(57, tags[2].count)
+
+    tags.clear
+    assert_number_of(Tag, 0, tags)
+    tags = @connection.response.tags
+    assert_array_of(Tag, tags)
+    assert_number_of(Tag, 20, tags)
+    assert_equal(1, tags[15].count)
+    assert_equal('losing weight', tags[3].name)
+  end
+
+  def test_get_tags_goals
+    goals = @connection.get_tags_goals 'travel'
+    assert_array_of(Goal, goals)
+    assert_number_of(Goal, 20, goals)
+
+    goals += @connection.more
+    assert_array_of(Goal, goals)
+    assert_number_of(Goal, 40, goals)
+
+    assert_equal(48, goals[0].to_i)
+    assert_equal(829, goals[39].to_i)
+
+    goals = @connection.get_tags_goals("travel", {:offset => 80, :max => 10})
+    assert_array_of(Goal, goals)
+    assert_number_of(Goal, 10, goals)
+    assert_equal(36, goals[0].to_i)
+  end
+
+  def test_get_tags_similarities
+    tags = @connection.get_tags_similarities 'travel'
+    assert_array_of(Tag, tags)
+    assert_number_of(Tag, 5, tags)
+    assert_equal(227, tags[0].count)
+    assert_equal("adventure", tags[0].name)
+  end
 end
 
 class TestResponse < Test::Unit::TestCase