friendfeed 0.1.8 → 0.1.9

data/.gitignore

@@ -1,2 +1 @@
-friendfeed.gemspec
 pkg/

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Akinori MUSHA
+Copyright (c) 2009, 2010 Akinori MUSHA
 
 All rights reserved.  You can redistribute and/or modify it under the
 same terms as Ruby.

data/README.rdoc

@@ -4,4 +4,4 @@ This is a Ruby library to provide access to FriendFeed API's.
 
 == Copyright
 
-Copyright (c) 2009 Akinori MUSHA.  See LICENSE for details.
+Copyright (c) 2009, 2010 Akinori MUSHA.  See LICENSE for details.

data/Rakefile

@@ -16,6 +16,8 @@ manipulating friends, groups and services for your personal purposes.
     gem.homepage = "http://github.com/knu/ruby-friendfeed"
     gem.authors = ["Akinori MUSHA"]
     gem.rubyforge_project = "friendfeed"
+    gem.add_dependency "json"
+    gem.add_dependency "mechanize", ">= 1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bin/tw2ff

@@ -216,7 +216,7 @@ EOF
         putinfo 'Skipping a protected user %s', name
       }
 
-      agent = WWW::Mechanize.new
+      agent = Mechanize.new
 
       to_subscribe.each { |name|
         putinfo 'Creating an imaginary friend for %s', name
@@ -235,6 +235,73 @@ EOF
     end
   end
 
+  mode 'likes' do
+    description 'Synchronize Twitter favorites and FriendFeed likes as far as possible'
+
+    def run
+      require 'set'
+      require 'pp'
+
+      ffcli = friendfeed_client()
+      ff_me = ffcli.nickname
+
+      twcli = twitter_client()
+
+      favorited = Set[]
+
+      twcli.favorites.each { |favorite|
+        id = favorite['id']
+        # p [id, favorite.user.screen_name]
+        favorited << id
+      }
+
+      liked = Set[]
+      tw_url = {}
+
+      ffcli.get_user_liked_entries.each { |like|
+        url = like['link']
+        case TWITTER_URI.route_to(url).to_s
+        when %r{\A([A-Za-z0-9_]+)/statuses/([0-9]+)\z}
+          id = $2.to_i
+          liked << id
+          tw_url[id] = url
+        end
+      }
+
+      # Favorite FriendFeed-liked entry in Twitter
+      (liked - favorited).each { |id|
+        putinfo "Adding a favorite in Twitter: %s", tw_url[id]
+        twcli.favorite_create(id)
+      }
+
+      # Find Twitter-liked entries in FriendFeed that aren't liked yet
+      (
+        ffcli.get_user_friend_entries('num' => 1000) +
+        ffcli.get_user_discussed_entries
+      ).sort_by { |entry|
+        entry["published"]
+      }.each { |entry|
+        # Just in case this entry is not covered by the 'liked' list
+        next if entry['likes'].any? { |like| like['user']['nickname'] == ff_me }
+
+        # Is the source Twitter?
+        url = entry['service']['profileUrl'] or next
+        m = TWITTER_URI.route_to(url).to_s.match(%r{\A([A-Za-z0-9_]+)/statuses/([0-9]+)\z}) or next
+        id = m[2].to_i
+
+        # A different entry with the same source may be liked already
+        next if liked.include?(id)
+
+        if favorited.include?(id)
+          entryid = entry['id']
+          putinfo "Adding a like in FriendFeed: %s", entry['link']
+          ffcli.add_like(entryid)
+          liked << id
+        end
+      }
+    end
+  end
+
   mode 'replies' do
     description 'Produce an RSS feed for Twitter replies from non-friends'
 

data/friendfeed.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{friendfeed}
+  s.version = "0.1.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Akinori MUSHA"]
+  s.date = %q{2010-02-09}
+  s.default_executable = %q{tw2ff}
+  s.description = %q{This is a Ruby library to provide access to FriendFeed API's.
+
+It implements official API's as well as unofficial API's to allow
+manipulating friends, groups and services for your personal purposes.
+}
+  s.email = %q{knu@idaemons.org}
+  s.executables = ["tw2ff"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/tw2ff",
+     "friendfeed.gemspec",
+     "lib/friendfeed.rb",
+     "lib/friendfeed/compat.rb",
+     "lib/friendfeed/unofficial.rb",
+     "test/friendfeed_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/knu/ruby-friendfeed}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{friendfeed}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A Ruby library to provide access to FriendFeed API's}
+  s.test_files = [
+    "test/friendfeed_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+  end
+end
+

data/lib/friendfeed.rb

@@ -2,7 +2,7 @@
 #--
 # friendfeed.rb - provides access to FriendFeed API's
 #++
-# Copyright (c) 2009 Akinori MUSHA <knu@iDaemons.org>
+# Copyright (c) 2009, 2010 Akinori MUSHA <knu@iDaemons.org>
 #
 # All rights reserved.  You can redistribute and/or modify it under the same
 # terms as Ruby.
@@ -30,7 +30,7 @@ module FriendFeed
     private
 
     def get_api_agent
-      @api_agent ||= WWW::Mechanize.new
+      @api_agent ||= Mechanize.new
     end
 
     def validate
@@ -46,7 +46,7 @@ module FriendFeed
 
       uri = API_URI + path
 
-      agent = WWW::Mechanize.new
+      agent = Mechanize.new
       agent.auth('username', @nickname)
       JSON.parse(agent.post(uri, { 'apikey' => @remote_key }).body)
     end
@@ -155,77 +155,79 @@ module FriendFeed
     end
 
     # Gets an array of the most recent public entries.
-    def get_public_entries()
-      call_api('feed/public')['entries']
+    def get_public_entries(options = nil)
+      call_api('feed/public', options)['entries']
     end
 
     # Gets an array of the entries the authenticated user would see on
     # their home page.
-    def get_home_entries()
+    def get_home_entries(options = nil)
       require_api_login
-      call_api('feed/home')['entries']
+      call_api('feed/home', options)['entries']
     end
 
     # Gets an array of the entries for the authenticated user's list
     # of a given +nickname+
-    def get_list_entries(nickname)
+    def get_list_entries(nickname, options = nil)
       require_api_login
-      call_api('feed/list/%s' % URI.encode(nickname))['entries']
+      call_api('feed/list/%s' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries from a user of a given
     # +nickname+ (defaulted to the authenticated user).
-    def get_user_entries(nickname = @nickname)
+    def get_user_entries(nickname = @nickname, options = nil)
       nickname or require_api_login
-      call_api('feed/user/%s' % URI.encode(nickname))['entries']
+      call_api('feed/user/%s' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries from users of given
     # +nicknames+.
-    def get_multi_user_entries(nicknames)
-      call_api('feed/user', 'nickname' => nicknames)['entries']
+    def get_multi_user_entries(nicknames, options = nil)
+      new_options = { 'nickname' => nicknames }
+      new_options.merge!(options) if options
+      call_api('feed/user', new_options)['entries']
     end
 
     # Gets an array of the most recent entries a user of a given
     # +nickname+ (defaulted to the authenticated user) has commented
     # on.
-    def get_user_commented_entries(nickname = @nickname)
+    def get_user_commented_entries(nickname = @nickname, options = nil)
       nickname or require_api_login
-      call_api('feed/user/%s/comments' % URI.encode(nickname))['entries']
+      call_api('feed/user/%s/comments' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries a user of a given
     # +nickname+ (defaulted to the authenticated user) has like'd.
-    def get_user_liked_entries(nickname = @nickname)
+    def get_user_liked_entries(nickname = @nickname, options = nil)
       nickname or require_api_login
-      call_api('feed/user/%s/likes' % URI.encode(nickname))['entries']
+      call_api('feed/user/%s/likes' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries a user of a given
     # +nickname+ (defaulted to the authenticated user) has commented
     # on or like'd.
-    def get_user_discussed_entries(nickname = @nickname)
+    def get_user_discussed_entries(nickname = @nickname, options = nil)
       nickname or require_api_login
-      call_api('feed/user/%s/discussion' % URI.encode(nickname))['entries']
+      call_api('feed/user/%s/discussion' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries from friends of a user
     # of a given +nickname+ (defaulted to the authenticated user).
-    def get_user_friend_entries(nickname = @nickname)
+    def get_user_friend_entries(nickname = @nickname, options = nil)
       nickname or require_api_login
-      call_api('feed/user/%s/friends' % URI.encode(nickname))['entries']
+      call_api('feed/user/%s/friends' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the most recent entries in a room of a given
     # +nickname+.
-    def get_room_entries(nickname)
-      call_api('feed/room/%s' % URI.encode(nickname))['entries']
+    def get_room_entries(nickname, options = nil)
+      call_api('feed/room/%s' % URI.encode(nickname), options)['entries']
     end
 
     # Gets an array of the entries the authenticated user would see on
     # their rooms page.
-    def get_rooms_entries()
-      call_api('feed/rooms')['entries']
+    def get_rooms_entries(options = nil)
+      call_api('feed/rooms', options)['entries']
     end
 
     # Gets an entry of a given +entryid+.  An exception is raised when
@@ -241,8 +243,10 @@ module FriendFeed
     end
 
     # Gets an array of entries that match a given +query+.
-    def search(query)
-      call_api('feed/search', 'q' => query)['entries']
+    def search(query, options = nil)
+      new_options = { 'q' => query }
+      new_options.merge!(options) if options
+      call_api('feed/search', 'q' => new_options)['entries']
     end
 
     # Gets an array of entries that link to a given +url+.

data/lib/friendfeed/unofficial.rb

@@ -36,7 +36,7 @@ module FriendFeed
     def login(nickname, password)
       @nickname = nickname
       @password = password
-      @login_agent = WWW::Mechanize.new
+      @login_agent = Mechanize.new
 
       page = @login_agent.get(LOGIN_URI)
 
@@ -81,7 +81,7 @@ module FriendFeed
           raise message
         if html_frag = json['html']
           html_body = '<html><body>' << html_frag << '</body></html>'
-          json['html_parser'] = WWW::Mechanize.html_parser.parse(html_body)
+          json['html_parser'] = Mechanize.html_parser.parse(html_body)
         end
         json
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendfeed
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +09:00
+date: 2010-02-09 00:00:00 +09:00
 default_executable: tw2ff
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: |
   This is a Ruby library to provide access to FriendFeed API's.
   
@@ -35,6 +54,7 @@ files:
 - Rakefile
 - VERSION
 - bin/tw2ff
+- friendfeed.gemspec
 - lib/friendfeed.rb
 - lib/friendfeed/compat.rb
 - lib/friendfeed/unofficial.rb