campfire_export 0.2.1 → 0.3.0

data/README.md

@@ -95,6 +95,9 @@ Also, thanks much for all the help, comments and contributions:
 * [Andre Arko](https://github.com/indirect)
 * [Brian Donovan](https://github.com/eventualbuddha)
 * [Andrew Wong](https://github.com/andrewwong1221)
+* [Junya Ogura](https://github.com/juno)
+* [Chase Lee](https://github.com/chaselee)
+* [Alex Hofsteede](https://github.com/alex-hofsteede)
 
 As mentioned above, some of the work on this was done by other people. The
 Gist I forked had contributions from:

data/campfire_export.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "campfire_export"
   s.required_ruby_version = '>= 1.8.7'
   
-  s.add_development_dependency "bundler",  "~> 1.0.15"
+  s.add_development_dependency "bundler",  "> 1.0.15"
   s.add_development_dependency "fuubar",   "~> 0.0.5"
   s.add_development_dependency "rspec",    "~> 2.6.0"
   s.add_dependency "tzinfo",   "~> 0.3.29"
   s.add_dependency "httparty", "~> 0.7.8"
-  s.add_dependency "nokogiri", "~> 1.4.5"
+  s.add_dependency "nokogiri", "~> 1.5.6"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/campfire_export.rb

@@ -144,13 +144,13 @@ module CampfireExport
 
     def find_timezone
       settings = Nokogiri::XML get('/account.xml').body
-      selected_zone = settings.css('time-zone')
+      selected_zone = settings.xpath('/account/time-zone')
       Account.timezone = find_tzinfo(selected_zone.text)
     end
 
     def rooms
       doc = Nokogiri::XML get('/rooms.xml').body
-      doc.css('room').map {|room_xml| Room.new(room_xml) }
+      doc.xpath('/rooms/room').map {|room_xml| Room.new(room_xml) }
     end
   end
 
@@ -159,9 +159,9 @@ module CampfireExport
     attr_accessor :id, :name, :created_at, :last_update
     
     def initialize(room_xml)
-      @id         = room_xml.css('id').text
-      @name       = room_xml.css('name').text
-      created_utc = DateTime.parse(room_xml.css('created-at').text)
+      @id         = room_xml.xpath('id').text
+      @name       = room_xml.xpath('name').text
+      created_utc = DateTime.parse(room_xml.xpath('created-at').text)
       @created_at = Account.timezone.utc_to_local(created_utc)
     end
     
@@ -186,7 +186,7 @@ module CampfireExport
       def find_last_update
         begin
           last_message = Nokogiri::XML get("/room/#{id}/recent.xml?limit=1").body
-          update_utc   = DateTime.parse(last_message.css('created-at').text)
+          update_utc   = DateTime.parse(last_message.xpath('/messages/message[1]/created-at').text)
           @last_update = Account.timezone.utc_to_local(update_utc)
         rescue Exception => e
           log(:error, 
@@ -213,11 +213,11 @@ module CampfireExport
     def export
       begin
         log(:info, "#{export_dir} ... ")
-        @xml = Nokogiri::XML get("#{transcript_path}.xml").body      
+        @xml = Nokogiri::XML get("#{transcript_path}.xml").body
       rescue Exception => e
         log(:error, "transcript export for #{export_dir} failed", e)
       else
-        @messages = xml.css('message').map do |message|
+        @messages = xml.xpath('/messages/message').map do |message|
           CampfireExport::Message.new(message, room, date)
         end
       
@@ -301,19 +301,19 @@ module CampfireExport
     attr_accessor :id, :room, :body, :type, :user, :date, :timestamp, :upload
 
     def initialize(message, room, date)
-      @id = message.css('id').text
+      @id = message.xpath('id').text
       @room = room
       @date = date
-      @body = message.css('body').text
-      @type = message.css('type').text
+      @body = message.xpath('body').text
+      @type = message.xpath('type').text
 
-      time = Time.parse message.css('created-at').text
+      time = Time.parse message.xpath('created-at').text
       localtime = CampfireExport::Account.timezone.utc_to_local(time)
       @timestamp = localtime.strftime '%I:%M %p'
 
       no_user = ['TimestampMessage', 'SystemMessage', 'AdvertisementMessage']
       unless no_user.include?(@type)
-        @user = username(message.css('user-id').text)
+        @user = username(message.xpath('user-id').text)
       end
       
       @upload = CampfireExport::Upload.new(self) if is_upload?
@@ -327,7 +327,7 @@ module CampfireExport
         "[unknown user]"
       else
         # Take the first name and last initial, if there is more than one name.
-        name_parts = doc.css('name').text.split
+        name_parts = doc.xpath('/user/name').text.split
         if name_parts.length > 1
           name_parts[-1] = "#{name_parts.last[0,1]}."
           name_parts.join(" ")
@@ -392,7 +392,7 @@ module CampfireExport
   
   class Upload
     include CampfireExport::IO
-    attr_accessor :message, :room, :date, :id, :filename, :content_type, :byte_size
+    attr_accessor :message, :room, :date, :id, :filename, :content_type, :byte_size, :full_url
     
     def initialize(message)
       @message = message
@@ -427,10 +427,11 @@ module CampfireExport
         upload = Nokogiri::XML get(upload_path).body
         
         # Get the upload itself and export it.
-        @id = upload.css('id').text
-        @byte_size = upload.css('byte-size').text.to_i
-        @content_type = upload.css('content-type').text
-        @filename = upload.css('name').text
+        @id = upload.xpath('/upload/id').text
+        @byte_size = upload.xpath('/upload/byte-size').text.to_i
+        @content_type = upload.xpath('/upload/content-type').text
+        @filename = upload.xpath('/upload/name').text
+        @full_url = upload.xpath('/upload/full-url').text
 
         export_content(upload_dir)
         export_content(thumb_dir, path_component="thumb/#{id}", verify=false) if is_image?
@@ -458,7 +459,7 @@ module CampfireExport
       # in a day, this will preserve both copies). This path pattern also
       # matches the tail of the upload path in the HTML transcript, making
       # it easier to make downloads functional from the HTML transcripts.
-      content_path = "/room/#{room.id}/#{path_component}/#{CGI.escape(filename)}"        
+      content_path = "/room/#{room.id}/#{path_component}/#{CGI.escape(filename)}"
       content = get(content_path).body
       FileUtils.mkdir_p(File.join(export_dir, content_dir))
       export_file(content, "#{content_dir}/#{filename}", 'wb')

data/lib/campfire_export/version.rb

@@ -1,3 +1,3 @@
 module CampfireExport
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/campfire_export/message_spec.rb

@@ -0,0 +1,63 @@
+require 'campfire_export'
+require 'campfire_export/timezone'
+
+require 'nokogiri'
+
+module CampfireExport  
+  describe Message do
+    include TimeZone
+    
+    before :each do
+      @messages = Nokogiri::XML  <<XML
+<messages>
+  <message>
+    <created-at type="datetime">2012-05-11T17:45:00Z</created-at>
+    <id type="integer">111</id>
+    <room-id type="integer">222</room-id>
+    <user-id type="integer" nil="true"/>
+    <body nil="true"/>
+    <type>TimestampMessage</type>
+  </message>
+  <message>
+    <created-at type="datetime">2012-05-11T17:47:20Z</created-at>
+    <id type="integer">333</id>
+    <room-id type="integer">222</room-id>
+    <user-id type="integer">555</user-id>
+    <body>This is a tweet</body>
+    <type>TweetMessage</type>
+    <tweet>
+      <id>20100487385931234</id>
+      <message>This is a tweet</message>
+      <author_username>twitter_user</author_username>
+      <author_avatar_url>avatar.jpg</author_avatar_url>
+    </tweet>
+  </message>
+  <message>
+    <created-at type="datetime">2012-05-11T17:47:23Z</created-at>
+    <id type="integer">666</id>
+    <room-id type="integer">222</room-id>
+    <user-id type="integer">555</user-id>
+    <body>Regular message</body>
+    <type>TextMessage</type>
+  </message>
+</messages>
+XML
+      Account.timezone = find_tzinfo("America/Los_Angeles")
+    end
+    
+    context "when it is created" do
+      it "sets up basic properties" do
+        message = Message.new(@messages.xpath('/messages/message[3]')[0], nil, nil)
+        message.body.should == "Regular message"
+        message.id.should   == "666"
+        message.timestamp.should == "10:47 AM"
+      end
+
+      it "handles tweets correctly" do
+        message = Message.new(@messages.xpath('/messages/message[2]'), nil, nil)
+        message.body.should == "This is a tweet"
+        message.id.should   == "333"
+      end
+    end
+  end
+end

data/spec/campfire_export/room_spec.rb

@@ -8,8 +8,9 @@ module CampfireExport
     include TimeZone
     
     before :each do
-      @room_xml = Nokogiri::XML "<room><name>Test Room</name><id>666</id>" +
+      doc = Nokogiri::XML "<room><name>Test Room</name><id>666</id>" +
         "<created-at>2009-11-17T19:41:38Z</created-at></room>"
+      @room_xml = doc.xpath('/room') 
       Account.timezone = find_tzinfo("America/Los_Angeles")
     end
     

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marc Hedlund
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
+date: 2013-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -96,9 +96,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 4
         - 5
-        version: 1.4.5
+        - 6
+        version: 1.5.6
   type: :runtime
   version_requirements: *id006
 description: Export transcripts and uploaded files from your 37signals' Campfire account.
@@ -122,6 +122,7 @@ files:
 - lib/campfire_export/timezone.rb
 - lib/campfire_export/version.rb
 - spec/campfire_export/account_spec.rb
+- spec/campfire_export/message_spec.rb
 - spec/campfire_export/room_spec.rb
 has_rdoc: true
 homepage: https://github.com/precipice/campfire_export
@@ -157,4 +158,5 @@ specification_version: 3
 summary: Export transcripts and uploaded files from your 37signals' Campfire account.
 test_files: 
 - spec/campfire_export/account_spec.rb
+- spec/campfire_export/message_spec.rb
 - spec/campfire_export/room_spec.rb