yamwow 0.0.3 → 0.0.4

data/lib/yamwow/facade.rb

@@ -5,15 +5,15 @@ module YamWow
       @client = Client.new oauth_credentials
     end
 
-    def messages_for_topic(topic_name)
+    def messages_for_topic(topic_name, options={})
       request = MessagesByTopicRequest.new @client
-      response = request.send topic_name
+      response = request.send topic_name, options
       response.messages
     end
 
-    def praises
+    def praises(options={})
       request = PraiseRequest.new @client
-      response = request.send
+      response = request.send options
       response.praises
     end
 

data/lib/yamwow/message.rb

@@ -4,12 +4,12 @@ module YamWow
   class Message
 
     def initialize(message_data, reference_data)
-      @topic_data = message_data
+      @message_data = message_data
       @reference_data = reference_data
     end
 
     def id
-      @topic_data['id']
+      @message_data['id']
     end
 
     def sender_tag
@@ -37,29 +37,33 @@ module YamWow
     end
 
     def date_created
-      Time.parse @topic_data['created_at']
+      Time.parse @message_data['created_at']
     end
 
     def like_count
-      @topic_data['liked_by']['count'].to_i
+      @message_data['liked_by']['count'].to_i
     end
 
     def url
-      @topic_data['web_url']
+      @message_data['web_url']
     end
 
     def attachments
-      @topic_data['attachments']
+      @message_data['attachments']
+    end
+
+    def thread_root?
+      @message_data.select { |m| m['replied_to_id'].nil? }
     end
 
     private
 
     def sender_id
-      @topic_data['sender_id']
+      @message_data['sender_id']
     end
 
     def body
-      @topic_data['body']
+      @message_data['body']
     end
 
     def get_name(id)

data/lib/yamwow/messages_by_topic_request.rb

@@ -9,19 +9,31 @@ module YamWow
       @client = client
     end
 
-    def send(topic_name)
+    def send(topic_name, options={})
       topic_id = get_topic_id topic_name
+      limit_count = (options[:limit_count] || 0).to_i
 
       oldest_message_id = nil
-      message_data = []
       reference_data = []
+      messages = []
+      limit_reached = false
 
       loop do
         response_data = get topic_id, oldest_message_id
-        message_data += response_data['messages']
         reference_data += response_data['references']
-        response = MessagesByTopicResponse.new message_data, reference_data
-        return response if response.oldest_message_id == oldest_message_id
+        message_data = response_data['messages']
+        messages += message_data.map { |m| Message.new m, reference_data }.select { |m| m.thread_root? }
+
+        if limit_count > 0
+          messages = messages[0..limit_count-1]
+          limit_reached = messages.length == limit_count
+        end
+
+        response = MessagesByTopicResponse.new messages
+        oldest_message_reached = response.oldest_message_id == oldest_message_id
+        loop_finished = oldest_message_reached || limit_reached
+        return response if loop_finished
+
         oldest_message_id = response.oldest_message_id
       end
     end

data/lib/yamwow/messages_by_topic_response.rb

@@ -1,15 +1,10 @@
 module YamWow
   class MessagesByTopicResponse
 
-    attr_reader :message_data
+    attr_reader :messages
 
-    def initialize(message_data, reference_data)
-      @topic_data = message_data
-      @reference_data = reference_data
-    end
-
-    def messages
-      @messages ||= root_messages.map { |m| Message.new m, @reference_data }
+    def initialize(messages)
+      @messages = messages
     end
 
     def oldest_message_id
@@ -17,11 +12,5 @@ module YamWow
       last_message.id if last_message
     end
 
-    private
-
-    def root_messages
-      @topic_data.select { |m| m['replied_to_id'].nil? }
-    end
-
   end
 end

data/lib/yamwow/praise_request.rb

@@ -7,9 +7,9 @@ module YamWow
       @client = client
     end
 
-    def send
+    def send(options={})
       messages_by_topic_request = MessagesByTopicRequest.new @client
-      messages_by_topic_response = messages_by_topic_request.send 'praise'
+      messages_by_topic_response = messages_by_topic_request.send 'praise', options
       PraiseResponse.new messages_by_topic_response.messages
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamwow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70183684306860 !ruby/object:Gem::Requirement
+  requirement: &70128193076360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183684306860
+  version_requirements: *70128193076360
 description: 
 email: matthew-github@matthewriley.name
 executables: []