yamwow 0.0.9 → 0.0.10

data/lib/yamwow/facade.rb

@@ -1,5 +1,6 @@
 require_relative 'client'
 Dir[File.expand_path(File.dirname(__FILE__) + '/*_request.rb')].each { |f| require f }
+require_relative 'message_builder'
 
 module YamWow
   class Facade
@@ -9,7 +10,9 @@ module YamWow
     end
 
     def messages_with_topic(topic_name, options={})
-      MessagesWithTopicRequest.new(@client, topic_name, options).send
+      r = MessagesWithTopicRequest.new(@client, topic_name, options).send
+      b = MessageBuilder.new
+      r['messages'].map { |m| b.build_message m, r['references'] }
     end
 
     def praises(options={})

data/lib/yamwow/message_builder.rb

@@ -0,0 +1,30 @@
+module YamWow
+  class MessageBuilder
+
+    def build_message(message_data, reference_data)
+      d = message_data
+      m = Message.new
+      m.id = d['id']
+      m.plain_body = d['body']['plain']
+      m.parsed_body = d['body']['parsed']
+      m.date_created = Time.parse d['created_at']
+      m.like_count = d['liked_by']['count'].to_i
+      m.url = d['web_url']
+      m.sender = build_user d['sender_id'], reference_data
+      m.reply_to_id = d['replied_to_id']
+      m.attachments = d['attachments']
+      m
+    end
+
+    private
+
+    def build_user(user_id, reference_data)
+      d = reference_data.select { |r| r['id'] == user_id }[0]
+      u = User.new
+      u.id = d['id']
+      u.name = d['full_name']
+      u
+    end
+
+  end
+end

data/lib/yamwow/messages_with_topic_request.rb

@@ -13,6 +13,7 @@ module YamWow
 
     def send
       @messages = []
+      @references = []
       loop_finished = false
 
       until loop_finished
@@ -24,8 +25,12 @@ module YamWow
         loop_finished = no_more_messages || limit_reached
       end
 
-      @messages.sort! { |x, y| y.date_created <=> x.date_created }
-      @messages
+      @messages.sort! { |x, y| Time.parse(y['created_at']) <=> Time.parse(x['created_at']) }
+
+      {
+        'messages' => @messages,
+        'references' => @references
+      }
     end
 
     private
@@ -46,40 +51,19 @@ module YamWow
     end
 
     def oldest_message_id
-      last_message = @messages.sort { |x, y| y.date_created <=> x.date_created }.last
+      sorted_messages = @messages.sort { |x, y| Time.parse(y['created_at']) <=> Time.parse(x['created_at']) }
+      last_message = sorted_messages.last
       last_message.id if last_message
     end
 
     def add_messages(messages_data, reference_data)
       @messages += build_messages messages_data, reference_data
       @messages = @messages[0..limit_count-1] if limit_count > 0
+      @references += reference_data
     end
 
     def build_messages(messages_data, reference_data)
-      messages_data.map { |m| build_message m, reference_data }.select { |m| m.thread_root? }
-    end
-
-    def build_message(message_data, reference_data)
-      d = message_data
-      m = Message.new
-      m.id = d['id']
-      m.plain_body = d['body']['plain']
-      m.parsed_body = d['body']['parsed']
-      m.date_created = Time.parse d['created_at']
-      m.like_count = d['liked_by']['count'].to_i
-      m.url = d['web_url']
-      m.sender = build_user d['sender_id'], reference_data
-      m.reply_to_id = d['replied_to_id']
-      m.attachments = d['attachments']
-      m
-    end
-
-    def build_user(user_id, reference_data)
-      d = reference_data.select { |r| r['id'] == user_id }[0]
-      u = User.new
-      u.id = d['id']
-      u.name = d['full_name']
-      u
+      messages_data.select { |m| m['replied_to_id'].nil? }
     end
 
     def limit_reached
@@ -91,4 +75,4 @@ module YamWow
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamwow
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yam
-  requirement: &70195163260140 !ruby/object:Gem::Requirement
+  requirement: &70150410097100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195163260140
+  version_requirements: *70150410097100
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -35,6 +35,7 @@ files:
 - lib/yamwow/group.rb
 - lib/yamwow/group_with_name_request.rb
 - lib/yamwow/message.rb
+- lib/yamwow/message_builder.rb
 - lib/yamwow/messages_with_topic_request.rb
 - lib/yamwow/praise.rb
 - lib/yamwow/praise_request.rb