livejournal 0.2.0 → 0.3.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 PKG_NAME = 'livejournal'
-PKG_VERSION = '0.2.0'
+PKG_VERSION = '0.3.0'
 
 FILES = FileList[
   'Rakefile', 'README', 'LICENSE', 'setup.rb',

data/lib/livejournal/database.rb

@@ -27,24 +27,24 @@
 require 'sqlite3'
 
 module LiveJournal
-  class DatabaseError < RuntimeError; end
-
   # An interface for an SQLite database dump.
   class Database
-    EXPECTED_DATABASE_VERSION = "2"
+    class Error < RuntimeError; end
+
+    EXPECTED_DATABASE_VERSION = "3"
     SCHEMA = %q{
       CREATE TABLE meta (
         key TEXT PRIMARY KEY,
-        value TEXT 
+        value TEXT
       );
       CREATE TABLE entry (
         itemid INTEGER PRIMARY KEY,
         anum INTEGER,
         subject TEXT,
         event TEXT,
-        moodid INTEGER, mood TEXT, music TEXT, taglist TEXT, 
-        pickeyword TEXT, preformatted INTEGER, backdated INTEGER, 
-        comments INTEGER, year INTEGER, month INTEGER, day INTEGER, 
+        moodid INTEGER, mood TEXT, music TEXT, location TEXT, taglist TEXT,
+        pickeyword TEXT, preformatted INTEGER, backdated INTEGER,
+        comments INTEGER, year INTEGER, month INTEGER, day INTEGER,
         timestamp INTEGER, security INTEGER
       );
       CREATE INDEX dateindex ON entry (year, month, day);
@@ -92,7 +92,7 @@ module LiveJournal
         # Existing database!
         version = self.version
         unless version == EXPECTED_DATABASE_VERSION
-          raise DatabaseError, "Database version mismatch -- db has #{version.inspect}, expected #{EXPECTED_DATABASE_VERSION.inspect}"
+          raise Error, "Database version mismatch -- db has #{version.inspect}, expected #{EXPECTED_DATABASE_VERSION.inspect}"
         end
       end
 
@@ -178,7 +178,7 @@ module LiveJournal
 
     # Store an Entry.
     def store_entry entry
-      sql = 'INSERT OR REPLACE INTO entry VALUES (' + ("?, " * 16) + '?)'
+      sql = 'INSERT OR REPLACE INTO entry VALUES (' + ("?, " * 17) + '?)'
       @db.execute(sql, *entry.to_database_row)
     end
 
@@ -244,19 +244,19 @@ module LiveJournal
       @itemid, @anum = row[0].to_i, row[1].to_i
       @subject, @event = row[2], row[3]
       @moodid, @mood = row[4].nil? ? nil : row[4].to_i, row[5]
-      @music, @taglist, @pickeyword = row[6], row[7], row[8]
+      @music, @location, @taglist, @pickeyword = row[6], row[7], row[8], row[9]
       @taglist = if @taglist then @taglist.split(/, /) else [] end
-      @preformatted, @backdated = !row[9].nil?, !row[10].nil?
-      @comments = case Database::optional_to_i(row[11])
+      @preformatted, @backdated = !row[10].nil?, !row[11].nil?
+      @comments = case Database::optional_to_i(row[12])
         when nil; :normal
         when 1; :none
         when 2; :noemail
-        else raise DatabaseError, "Bad comments value: #{row[11].inspect}"
+        else raise Database::Error, "Bad comments value: #{row[12].inspect}"
       end
 
-      @time = Time.at(row[15].to_i).utc
+      @time = Time.at(row[16].to_i).utc
 
-      case Database::optional_to_i(row[16])
+      case Database::optional_to_i(row[17])
       when nil
         @security = :public
       when 0
@@ -265,7 +265,7 @@ module LiveJournal
         @security = :friends
       else
         @security = :custom
-        @allowmask = row[16]
+        @allowmask = row[17]
       end
 
       self
@@ -283,7 +283,7 @@ module LiveJournal
         when :custom; @allowmask
       end
       [@itemid, @anum, @subject, @event,
-       @moodid, @mood, @music, @taglist.join(', '), @pickeyword,
+       @moodid, @mood, @music, @location, @taglist.join(', '), @pickeyword,
        @preformatted ? 1 : nil, @backdated ? 1 : nil, comments,
        @time.year, @time.mon, @time.day, @time.to_i, security]
     end

data/lib/livejournal/entry.rb

@@ -46,7 +46,8 @@ module LiveJournal
 
   class Entry
     attr_accessor :itemid, :anum, :subject, :event, :moodid, :mood
-    attr_accessor :music, :taglist, :pickeyword, :preformatted, :backdated
+    attr_accessor :music, :location, :taglist, :pickeyword
+    attr_accessor :preformatted, :backdated
     attr_accessor :comments  # values: {:normal, :none, :noemail}
     attr_reader :time  # a Ruby Time object
     attr_accessor :security  # values: {:public, :private, :friends, :custom}
@@ -60,6 +61,7 @@ module LiveJournal
       @moodid = nil
       @mood = nil
       @music = nil
+      @location = nil
       @taglist = []
       @pickeyword = nil
       @preformatted = false
@@ -72,23 +74,21 @@ module LiveJournal
       @props = {}
     end
 
-    def ==(other)
-      [:subject, :event, :moodid, :mood, :music, :taglist, :pickeyword,
-       :preformatted, :backdated, :comments, :security, :allowmask,
+    def equivalent_to?(other)
+      [:subject, :event, :moodid,
+       :mood, :music, :location, :taglist, :pickeyword,
+       :preformatted, :backdated, :comments, :time, :security, :allowmask,
        :screening, :props].each do |attr|
         return false if send(attr) != other.send(attr)
       end
-      # compare time fields one-by-one because livejournal ignores the
-      # "seconds" field.
-      [:year, :mon, :day, :hour, :min, :zone].each do |attr|
-        return false if @time.send(attr) != other.time.send(attr)
-      end
       return true
     end
 
     def time=(time)
       raise RuntimeError, "Must use GMT times everywhere to reduce confusion.  See LiveJournal::coerce_gmt for details." unless time.gmt?
-      @time = time
+      components = time.to_a
+      components[0] = 0   # set seconds to zero
+      @time = Time.gm *components
     end
 
     def from_request(req)
@@ -123,6 +123,8 @@ module LiveJournal
         @moodid = value.to_i
       when 'current_music'
         @music = value
+      when 'current_location'
+        @location = value
       when 'taglist'
         @taglist = value.split(/, /).sort
       when 'picture_keyword'
@@ -213,6 +215,7 @@ module LiveJournal
       { 'current_mood' => self.mood,
         'current_moodid' => self.moodid,
         'current_music' => self.music,
+        'current_location' => self.location,
         'picture_keyword' => self.pickeyword,
         'taglist' => self.taglist.join(', '),
         'opt_preformatted' => self.preformatted ? 1 : 0,

data/lib/livejournal/friends.rb

@@ -29,7 +29,12 @@ module LiveJournal
   # See LiveJournal::Request::Friends to get an array of these.
   class Friend
     attr_accessor :username, :fullname
-    attr_accessor :background, :foreground, :groupmask, :type
+    # as HTML color, like '#ff0000'
+    attr_accessor :background, :foreground
+    # bitfield of friend groups this friend is a member of
+    attr_accessor :groupmask
+    # friend type. possible values: :community, :news, :syndicated, :shared, :user
+    attr_accessor :type
     def initialize
       @username = nil
       @fullname = nil
@@ -44,7 +49,16 @@ module LiveJournal
       @foreground = req['fg']
       @background = req['bg']
       @groupmask = req['groupmask']
-      @type = req['type']
+      @type =
+        case req['type']
+          when 'community';  :community
+          when 'news';       :news
+          when 'syndicated'; :syndicated
+          when 'shared';     :shared
+          when nil;          :user
+          else raise LiveJournal::Request::ProtocolException.new(
+                       "unknown friend type: #{req['type']}")
+        end
       self
     end
     def to_s
@@ -54,18 +68,25 @@ module LiveJournal
 
   module Request
     class Friends < Req
-      attr_reader :friends
-      def initialize(user)
+      attr_reader :friends, :friendofs
+      # Allowed options:
+      # :include_friendofs => true:: also fill out @friendofs in single request
+      def initialize(user, opts={})
         super(user, 'getfriends')
         @friends = nil
+        @friendofs = nil
+        @request['includefriendof'] = true if opts.has_key? :include_friendofs
       end
       # Returns an array of LiveJournal::Friend.
       def run
         super
         @friends = build_array('friend') { |r| Friend.new.from_request(r) }
+        @friendofs = build_array('friendof') { |r| Friend.new.from_request(r) }
         @friends
       end
     end
+
+    # See Friends to fetch both friends and friend-ofs in one request.
     class FriendOfs < Req
       attr_reader :friendofs
       def initialize(user)

data/test/comments-xml.rb

@@ -22,7 +22,9 @@
 # SOFTWARE.
 #++
 
+$:.unshift '../lib'
 require 'livejournal/comments-xml'
+require 'rexml/document'
 require 'test/unit'
 
 TEST_COMMENTS_META = %q{<?xml version="1.0" encoding='utf-8'?>

data/test/database.rb

@@ -24,7 +24,7 @@ class TC_Database < Test::Unit::TestCase
   def roundtrip e
     @db.store_entry e
     new_e = @db.get_entry e.itemid
-    assert_equal(e, new_e)
+    assert(e.equivalent_to?(new_e), "#{e.inspect}\n=>\n#{new_e.inspect}")
   end
 
   def test_roundtrips

data/test/roundtrip.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
-require 'livejournal/login'
+$:.unshift '../lib'
+
 require 'livejournal/entry'
 require 'test/unit'
 
@@ -15,10 +16,9 @@ class TC_RoundTrip < Test::Unit::TestCase
     postevent = Request::PostEvent.new(@user, entry)
     postevent.run
 
-    getevents = Request::GetEvents.new(@user,
-                                                    :itemid => entry.itemid)
+    getevents = Request::GetEvents.new(@user, :itemid => entry.itemid)
     new_entry = getevents.run
-    assert_equal(new_entry, entry)
+    assert(entry.equivalent_to?(new_entry), "#{entry.inspect}\n=>\n#{new_entry.inspect}")
 
     delete = Request::EditEvent.new(@user, entry, :delete => true)
     delete.run
@@ -27,7 +27,7 @@ class TC_RoundTrip < Test::Unit::TestCase
   def test_roundtrip
     e = Entry.new
     e.subject = 'subject'
-    e.event = 'event here'
+    e.event = 'event here ' + Time.now.to_s
     e.time = LiveJournal::coerce_gmt Time.now
     roundtrip e
 
@@ -38,6 +38,7 @@ class TC_RoundTrip < Test::Unit::TestCase
     e.comments = :noemail
     e.preformatted = true
     e.security = :friends
+    e.location = "test"
     roundtrip e
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: livejournal
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-05-13 00:00:00 +09:00
+  version: 0.3.0
+date: 2006-07-25 00:00:00 +09:00
 summary: module for interacting with livejournal
 require_paths: 
 - lib