hellotxt 1.0.1 → 1.0.2

data/.gitignore

@@ -1,2 +1,3 @@
+doc/
 pkg/
 coverage/

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.2 / 2009-03-23
+
+* maintenance release
+	* update 'user.services' call to reflect current API
+	* add support for 'user.latest' API call
+
 == 1.0.1 / 2009-01-03
 
 * bugfix release

data/Rakefile

@@ -1,38 +1,33 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-
 begin
   require 'bones'
-  Bones.setup
 rescue LoadError
-  load 'tasks/setup.rb'
+  abort '### Please install the "bones" gem ###'
 end
 
 ensure_in_path 'lib'
 require 'hellotxt'
 
 task :default => 'spec:run'
-
-PROJ.name = 'hellotxt'
-PROJ.authors = ['Kevin Williams']
-PROJ.email = ['kevwil@gmail.com']
-PROJ.url = 'http://kevwil.github.com/hellotxt'
-PROJ.version = ENV['VERSION'] || HelloTxt::VERSION
-PROJ.rubyforge.name = 'hellotxt'
-PROJ.readme_file = 'README'
-
-PROJ.gem.need_tar = false
-
-PROJ.spec.opts << '--color'
-
-namespace :gem do
-  desc 'create a gemspec file to support github gems'
-  task :gemspec => 'gem:prereqs' do
-    File.open("#{PROJ.name}.gemspec", 'w+') do |f|
-      f.write PROJ.gem._spec.to_ruby
-    end
-  end
-end
+task 'gem:release' => 'spec:run'
+
+Bones {
+  name 'hellotxt'
+  authors ['Kevin Williams']
+  email ['kevwil@gmail.com']
+  url 'http://kevwil.github.com/hellotxt'
+  version ENV['VERSION'] || HelloTxt::VERSION
+  # rubyforge.name 'hellotxt'
+  readme_file 'README'
+  ignore_file '.gitignore'
+  gem.need_tar false
+  depend_on 'bones', :development => true
+  depend_on 'rspec', :development => true
+  depend_on 'mocha', :development => true
+  ruby_opts << '-Ilib' << '-rubygems'
+  #spec_opts << '--color'# << '--format html:./spec_out.html'
+  #rcov_opts << ['--exclude', 'rcov']
+  #rcov_opts << ['--exclude', 'mocha']
+  # enable_sudo
+}
 
 # EOF

data/lib/hellotxt.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 module HelloTxt
 
   # :stopdoc:
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -30,7 +30,7 @@ module HelloTxt
     args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
 
-  # Utility method used to rquire all files ending in .rb that lie in the
+  # Utility method used to require all files ending in .rb that lie in the
   # directory below this file that has the same name as the filename passed
   # in. Optionally, a specific _directory_ name can be passed in such that
   # the _filename_ does not have to be equivalent to the directory.
@@ -38,7 +38,7 @@ module HelloTxt
   def self.require_all_libs_relative_to( fname, dir = nil )
     dir ||= ::File.basename(fname, '.*')
     search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '*', '*.rb'))
+        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
 
     Dir.glob(search_me).sort.each {|rb| require rb}
   end

data/lib/hellotxt/client.rb

@@ -30,12 +30,14 @@ module HelloTxt
   	end
 
   	# Returns a list of services the user has set up through HelloTxt
+  	# Optional arguments:
+  	# group = service group type; either 'inhome', 'friend', 'colleague', 'all'
   	# if successful returns:
     #   {'status' => 'OK', 'services' => [{'id' => 'serviceid', 'name' => 'servicename', 'code' => 'servicecode', 'inhome' => 'checked', 'friend' => 'checked', 'collegue' => 'checked'}, ...]}
   	# if unsuccessful returns:
   	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def user_services
-  	  response = get_response('user.services')
+  	def user_services(group = 'all')
+  	  response = get_response('user.services', 'group' => group)
   		if response.elements['rsp'].attributes['status'] == 'OK'
   			services = status_ok()
   			services['services'] = []
@@ -76,6 +78,27 @@ module HelloTxt
   			return status_fail(response)
   		end
   	end
+  	
+  	# Returns a list of 20 status update sent through HelloTxt.
+  	# if successful returns:
+  	#   {'status' => 'OK', 'messages' => [{'id' => 'messageid', 'title' => 'titletext', 'body' => 'bodytext'}, ...]}
+  	# if unsuccessful returns:
+  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+  	def latest
+  	  response = get_response('user.latest')
+  		if response.elements['rsp'].attributes['status'] == 'OK'
+  		  messages = status_ok()
+  		  messages['messages'] = []
+  		  response.elements.each('rsp/messages/message') do |message|
+  		    messages['messages'].push({'id' => message.attributes['id'],
+  		                                'title' => message.elements['title'].text,
+  		                                'body' => message.elements['body'].text})
+		    end
+  			return messages
+  		else
+  			return status_fail(response)
+  		end
+  	end
 
   	private
 

data/spec/client_spec.rb

@@ -29,6 +29,7 @@ describe HelloTxt::Client, "with expected results" do
     init_service_response
 
     uri = URI.parse "#{HelloTxt::API_URL}/method/#{@service_type}"
+    @params.merge!('group' => 'all')
 
     # mock the http call
     http_resp = mock('response')
@@ -45,6 +46,28 @@ describe HelloTxt::Client, "with expected results" do
     result['services'].length.should eql(5)
     result['services'].first['name'].should eql('twitter')
   end
+  
+  it "should list only jaiku in list of 'friend' services" do
+    init_friend_service_response
+    
+    uri = URI.parse "#{HelloTxt::API_URL}/method/#{@service_type}"
+    @params.merge!('group' => 'friend')
+
+    # mock the http call
+    http_resp = mock('response')
+    http_resp.expects(:body).returns(@response)
+    Net::HTTP.expects(:post_form).with(uri, @params).returns(http_resp)
+
+    # call and verify
+    result = @client.user_services('friend')
+    result.should_not be_empty
+    result['status'].should_not be_nil
+    result['status'].should eql('OK')
+    result['services'].should_not be_nil
+    result['services'].should_not be_empty
+    result['services'].length.should eql(1)
+    result['services'].first['name'].should eql('jaiku')
+  end
 
   it "should post a message to the service" do
     init_ok_response 'user.post'
@@ -65,6 +88,27 @@ describe HelloTxt::Client, "with expected results" do
     result['status'].should_not be_nil
     result['status'].should eql('OK')
   end
+  
+  it "should retrieve user's 20 latest status messages" do
+    init_user_latest_response
+
+    uri = URI.parse "#{HelloTxt::API_URL}/method/#{@service_type}"
+
+    # mock the http call
+    http_resp = mock('response')
+    http_resp.expects(:body).returns(@response)
+    Net::HTTP.expects(:post_form).with(uri, @params).returns(http_resp)
+
+    # call and verify
+    result = @client.latest
+    result.should_not be_empty
+    result['status'].should_not be_nil
+    result['status'].should eql('OK')
+    result['messages'].should_not be_nil
+    result['messages'].should_not be_empty
+    result['messages'].length.should eql(2)
+    result['messages'].first['body'].should eql('this is a test message')
+  end
 
 end
 
@@ -96,6 +140,7 @@ describe HelloTxt::Client, "with error messages" do
     init_fail_response 'user.services'
 
     uri = URI.parse "#{HelloTxt::API_URL}/method/#{@service_type}"
+    @params.merge!('group' => 'all')
 
     # mock the http call
     http_resp = mock('response')
@@ -130,4 +175,21 @@ describe HelloTxt::Client, "with error messages" do
     result['message'].should_not be_nil
   end
 
+  it "should handle a failed user.latest call cleanly" do
+    init_fail_response 'user.latest'
+
+    uri = URI.parse "#{HelloTxt::API_URL}/method/#{@service_type}"
+
+    # mock the http call
+    http_resp = mock('response')
+    http_resp.expects(:body).returns(@response)
+    Net::HTTP.expects(:post_form).with(uri, @params).returns(http_resp)
+
+    # call and verify
+    result = @client.latest
+    result.should_not be_empty
+    result['status'].should_not be_nil
+    result['status'].should eql('FAIL')
+    result['message'].should_not be_nil
+  end
 end

data/spec/spec_responses.rb

@@ -23,7 +23,7 @@ end
 def init_service_response
   @service_type = 'user.services'
   @response = <<EOXML
-  <?xml version="1.0"?>
+<?xml version="1.0"?>
 <rsp status="OK">
   <services>
     <service id="tw" name="twitter">
@@ -41,7 +41,7 @@ def init_service_response
     <service id="jk" name="jaiku">
       <code>OK38</code>
       <inhome>checked</inhome>
-      <friend>unchecked</friend>
+      <friend>checked</friend>
       <collegue>unchecked</collegue>
     </service>
     <service id="id" name="identica">
@@ -60,3 +60,39 @@ def init_service_response
 </rsp>
 EOXML
 end
+
+def init_friend_service_response
+  @service_type = 'user.services'
+  @response = <<EOXML
+<?xml version="1.0"?>
+<rsp status="OK">
+  <services>
+    <service id="jk" name="jaiku">
+      <code>OK38</code>
+      <inhome>checked</inhome>
+      <friend>checked</friend>
+      <collegue>unchecked</collegue>
+    </service>
+  </services>
+</rsp>
+EOXML
+end
+
+def init_user_latest_response
+  @service_type = 'user.latest'
+  @response = <<EOXML
+<?xml version="1.0"?>
+<rsp status="OK">
+  <messages>
+    <message id="1234">
+      <title></title>
+      <body>this is a test message</body>
+    </message>
+  <message id="5678">
+    <title></title>
+    <body>Desperately trying not to be bored</body>
+  </message>
+  </messages>
+</rsp>
+EOXML
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hellotxt
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Kevin Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-03 00:00:00 -07:00
+date: 2009-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,37 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 3.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0
     version: 
 description: HelloTxt (http://hellotxt.com) is a simple service that makes updating your social networks a snap, and this is it's Ruby library.
 email: 
@@ -31,6 +61,7 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - bin/hellotxt
 files: 
 - .gitignore
@@ -47,21 +78,10 @@ files:
 - spec/keyloader_spec.rb
 - spec/spec_helper.rb
 - spec/spec_responses.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/manifest.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
 has_rdoc: true
 homepage: http://kevwil.github.com/hellotxt
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -83,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hellotxt
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: HelloTxt (http://hellotxt
 test_files: []
 

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF