yamwow 0.1.0 → 0.1.1

data/lib/yamwow/client.rb

@@ -4,35 +4,51 @@ require_relative 'throttle'
 module YamWow
   class Client
 
-    def initialize(oauth_token)
-      @yam = Yam.new oauth_token, nil
-      @message_throttle = Throttle.new 10, 30
-      @autocomplete_throttle = Throttle.new 10, 10
-      @other_throttle = Throttle.new 10, 10
+    def initialize(access_token)
+      @yam = Yam.new access_token, nil
+      @throttles = {
+          messages: Throttle.new(10, 30),
+          autocomplete: Throttle.new(10, 10),
+          other: Throttle.new(10, 10)
+      }
     end
 
-    def get_messages(path=nil, params={})
-      path = path ? File.join('messages', path) : 'messages.json'
-      get path, params, @message_throttle
+    def get_autocomplete(params={})
+      get 'autocomplete.json', params
     end
 
-    def get_autocomplete(params={})
-      get 'autocomplete.json', params, @autocomplete_throttle
+    def get_current_user
+      get 'users/current.json'
+    end
+
+    def get_messages_about_topic(topic_id, params={})
+      get "messages/about_topic/#{topic_id}.json", params
     end
 
-    def get_other(path, params={})
-      get path, params, @other_throttle
+    def get_topic(topic_id)
+      get "topics/#{topic_id}.json"
     end
 
     private
 
-    def get(path, params, throttle)
+    def get(path, params={})
       path = '/' + path unless path.start_with? '/'
-      throttle.when_ready do
+      throttle(path).when_ready do
         puts "GET #{path} #{params.inspect}"
         @yam.get path, params
       end
     end
 
+    def throttle(path)
+      case
+        when path.start_with?('/messages')
+          @throttles[:messages]
+        when path.start_with?('/autocomplete')
+          @throttles[:autocomplete]
+        else
+          @throttles[:other]
+      end
+    end
+
   end
 end

data/lib/yamwow/facade.rb

@@ -1,35 +1,63 @@
 require_relative 'client'
 require_relative 'requests'
+require_relative 'topics_responder'
+require_relative 'messages_responder'
+require_relative 'praise_messages_responder'
 
 module YamWow
   class Facade
 
-    def initialize(oauth_token)
-      @client = Client.new oauth_token
+    def initialize(access_token)
+      client = Client.new access_token
+      topics_responder = TopicsResponder.new
+      messages_responder = MessagesResponder.new
+      praise_messages_responder = PraiseMessagesResponder.new messages_responder
+
+      @group_with_name_request = GroupWithNameRequest.new client
+
+      limited_topics_with_prefix_request = LimitedTopicsWithPrefixRequest.new client, topics_responder
+      @topics_with_prefix_request = TopicsWithPrefixRequest.new topics_responder, limited_topics_with_prefix_request
+      @topic_with_name_request = TopicWithNameRequest.new @topics_with_prefix_request
+      @topics_request = TopicsRequest.new topics_responder, @topics_with_prefix_request
+
+      limited_messages_with_topic_id_request = LimitedMessagesWithTopicIdRequest.new client, messages_responder
+      @messages_with_topic_id_request = MessagesWithTopicIdRequest.new messages_responder, limited_messages_with_topic_id_request
+      @messages_with_topic_name_request = MessagesWithTopicNameRequest.new @topic_with_name_request, @messages_with_topic_id_request
+      @praise_messages_request = PraiseMessagesRequest.new praise_messages_responder, @messages_with_topic_name_request
+
+      @current_user_request = CurrentUserRequest.new client
+    end
+
+    def group_with_name(group_name)
+      @group_with_name_request.send group_name
     end
 
-    def messages_with_topic(topic_name, options={})
-      MessagesWithTopicRequest.new(@client, topic_name, options).send
+    def messages_with_topic_id(topic_id)
+      @messages_with_topic_id_request.send(topic_id)
     end
 
-    def praises(options={})
-      PraiseRequest.new(@client, options).send
+    def messages_with_topic_name(topic_name)
+      @messages_with_topic_name_request.send topic_name
     end
 
-    def topic_with_name(topic_name, options={})
-      TopicWithNameRequest.new(@client, topic_name, options).send
+    def praise_messages
+      @praise_messages_request.send
     end
 
-    def topics(options={})
-      TopicsRequest.new(@client, options).send
+    def topic_with_name(topic_name)
+      @topic_with_name_request.send topic_name
     end
 
-    def group_with_name(group_name)
-      GroupWithNameRequest.new(@client, group_name).send
+    def topics
+      @topics_request.send
+    end
+
+    def topics_with_prefix(topic_prefix)
+      @topics_with_prefix_request.send topic_prefix
     end
 
     def current_user
-      CurrentUserRequest.new(@client).send
+      @current_user_request.send
     end
 
   end

data/lib/yamwow/messages_responder.rb

@@ -0,0 +1,35 @@
+require 'time'
+require_relative 'response'
+
+module YamWow
+  class MessagesResponder
+
+    def create_response(messages, references=[])
+      @messages = messages
+      @references = references
+      remove_comments
+      sort_by_most_recent_first
+      enhance_messages
+      YamWow::Response.new @messages, @references
+    end
+
+    private
+
+    def remove_comments
+      @messages.select! { |m| m['replied_to_id'].nil? }
+    end
+
+    def sort_by_most_recent_first
+      @messages.sort! { |x, y| Time.parse(y['created_at']) <=> Time.parse(x['created_at']) }
+    end
+
+    def enhance_messages
+      @messages.each { |m| enhance_message m }
+    end
+
+    def enhance_message(message)
+      message['sender_tag'] = "[[user:#{message['sender_id']}]]" if message['sender_id']
+    end
+
+  end
+end

data/lib/yamwow/praise_messages_responder.rb

@@ -0,0 +1,48 @@
+module YamWow
+  class PraiseMessagesResponder
+
+    def initialize(messages_responder)
+      @messages_responder = messages_responder
+    end
+
+    def create_response(messages, references=[])
+      @messages = messages
+      @references = references
+      enhance_messages
+      @messages_responder.create_response @messages, @references
+    end
+
+    private
+
+    def enhance_messages
+      @messages.each { |m| enhance_message m }
+    end
+
+    def enhance_message(message)
+      praise_attachment = praise_attachment message
+      praise_attachment ? enhance_message_with_praise_attachment(message, praise_attachment) : enhance_normal_message(message)
+    end
+
+    def enhance_message_with_praise_attachment(message, praise_attachment)
+      message['praise_message'] = praise_attachment['name'].match(/Praise: (.+)/m)[1]
+      message['praise_recipient_names'] = split_recipients(message['body']['plain']).map { |r| r.gsub '@', '' }.join ', '
+      message['praise_recipient_tags'] = split_recipients(message['body']['parsed']).join ', '
+    end
+
+    def enhance_normal_message(message)
+      message['praise_message'] = message['body']['parsed']
+    end
+
+    def praise_attachment(message)
+      attachments = message['attachments'] || []
+      attachments.select { |a| a['type'] == 'ymodule' }.select { |a| a['ymodule']['app_id'] == 'praise' }.first
+    end
+
+    def split_recipients(recipients)
+      recipients = recipients.to_s.include?('praised') ? recipients.match(/praised (.+)/)[1] : ''
+      recipients.gsub!(' and ', ', ')
+      recipients.split(', ')
+    end
+
+  end
+end

data/lib/yamwow/requests/groups/group_with_name_request.rb

@@ -0,0 +1,27 @@
+require_relative '../../response'
+
+module YamWow
+  class GroupWithNameRequest
+
+    def initialize(client)
+      @client = client
+    end
+
+    def send(group_name)
+      @group_name = group_name
+      Response.new group_with_name
+    end
+
+    private
+
+    def group_with_name
+      groups_with_prefix.select { |g| g['full_name'].casecmp(@group_name) == 0 }.first
+    end
+
+    def groups_with_prefix
+      data = @client.get_autocomplete prefix: 'to:' + @group_name
+      data['groups'] || []
+    end
+
+  end
+end

data/lib/yamwow/requests/messages/limited_messages_with_topic_id_request.rb

@@ -0,0 +1,15 @@
+module YamWow
+  class LimitedMessagesWithTopicIdRequest
+
+    def initialize(client, responder)
+      @client = client
+      @responder = responder
+    end
+
+    def send(topic_id, options={})
+      data = @client.get_messages_about_topic topic_id, threaded: true, older_than: options[:older_than_id]
+      @responder.create_response data['messages'], data['references']
+    end
+
+  end
+end

data/lib/yamwow/requests/messages/messages_with_topic_id_request.rb

@@ -0,0 +1,33 @@
+module YamWow
+  class MessagesWithTopicIdRequest
+
+    def initialize(responder, limited_messages_with_topic_id_request)
+      @responder = responder
+      @limited_messages_with_topic_id_request = limited_messages_with_topic_id_request
+    end
+
+    def send(topic_id)
+      @topic_id = topic_id
+      @messages = []
+      @references = []
+      add_messages
+      @responder.create_response @messages, @references
+    end
+
+    private
+
+    def add_messages
+      response = @limited_messages_with_topic_id_request.send(@topic_id, older_than_id: oldest_message_id)
+      @messages += response.data
+      @references += response.reference_data
+      add_messages unless response.data.empty?
+    end
+
+    private
+
+    def oldest_message_id
+      @messages.empty? ? nil : @messages.last['id']
+    end
+
+  end
+end

data/lib/yamwow/requests/messages/messages_with_topic_name_request.rb

@@ -0,0 +1,22 @@
+module YamWow
+  class MessagesWithTopicNameRequest
+
+    def initialize(topic_with_name_request, messages_with_topic_id_request)
+      @messages_with_topic_id_request = messages_with_topic_id_request
+      @topic_with_name_request = topic_with_name_request
+    end
+
+    def send(topic_name)
+      @topic_name = topic_name
+      @messages_with_topic_id_request.send topic_id
+    end
+
+    private
+
+    def topic_id
+      response = @topic_with_name_request.send @topic_name
+      response.data['id'] if response.data
+    end
+
+  end
+end

data/lib/yamwow/requests/messages/praise_messages_request.rb

@@ -0,0 +1,15 @@
+module YamWow
+  class PraiseMessagesRequest
+
+    def initialize(responder, messages_with_topic_name_request)
+      @responder = responder
+      @messages_with_topic_name_request = messages_with_topic_name_request
+    end
+
+    def send
+      r = @messages_with_topic_name_request.send 'praise'
+      @responder.create_response r.data, r.reference_data
+    end
+
+  end
+end

data/lib/yamwow/requests/topics/limited_topics_with_prefix_request.rb

@@ -0,0 +1,24 @@
+module YamWow
+  class LimitedTopicsWithPrefixRequest
+
+    LIMIT = 50
+
+    def initialize(client, responder)
+      @client = client
+      @responder = responder
+    end
+
+    def send(topic_prefix)
+      @topic_prefix = topic_prefix
+      @responder.create_response topics
+    end
+
+    private
+
+    def topics
+      data = @client.get_autocomplete prefix: @topic_prefix
+      data['topics'] || []
+    end
+
+  end
+end

data/lib/yamwow/requests/topics/topic_with_name_request.rb

@@ -0,0 +1,25 @@
+module YamWow
+  class TopicWithNameRequest
+
+    def initialize(topics_with_prefix_request)
+      @topics_with_prefix_request = topics_with_prefix_request
+    end
+
+    def send(topic_name)
+      @topic_name = topic_name
+      Response.new topic_with_name
+    end
+
+    private
+
+    def topic_with_name
+      topics_with_prefix.select { |t| t['name'].casecmp(@topic_name) == 0 }.first
+    end
+
+    def topics_with_prefix
+      response = @topics_with_prefix_request.send @topic_name
+      response.data || []
+    end
+
+  end
+end

data/lib/yamwow/requests/topics/topics_request.rb

@@ -0,0 +1,20 @@
+module YamWow
+  class TopicsRequest
+
+    def initialize(responder, topics_with_prefix_request)
+      @responder = responder
+      @topics_with_prefix_request = topics_with_prefix_request
+      @prefixes = ('0'..'9').to_a + ('a'..'z').to_a
+    end
+
+    def send
+      topics = []
+      @prefixes.each do |prefix|
+        response = @topics_with_prefix_request.send prefix
+        topics += response.data
+      end
+      @responder.create_response topics
+    end
+
+  end
+end

data/lib/yamwow/requests/topics/topics_with_prefix_request.rb

@@ -0,0 +1,40 @@
+module YamWow
+  class TopicsWithPrefixRequest
+
+    def initialize(responder, limited_topics_with_prefix_request)
+      @responder = responder
+      @limited_topics_with_prefix_request = limited_topics_with_prefix_request
+    end
+
+    def send(topic_prefix)
+      @topic_prefix = topic_prefix
+      @topics = []
+      add_topics(@topic_prefix) { find_topics @topic_prefix }
+      @responder.create_response @topics
+    end
+
+    private
+
+    def find_topics(prefix)
+      range.each do |suffix|
+        next_prefix = prefix + suffix
+        add_topics(next_prefix) { find_topics next_prefix }
+      end
+    end
+
+    def range
+      first_char = @topic_prefix[0]
+      first_char.to_i.to_s == first_char ? ('0'..'9') : ('a'..'z')
+    end
+
+    def add_topics(prefix)
+      response = @limited_topics_with_prefix_request.send prefix
+      topics = response.data || []
+      yield if topics.length == LimitedTopicsWithPrefixRequest::LIMIT
+      @topics += [topics].flatten
+    end
+
+  end
+end
+
+

data/lib/yamwow/requests/users/current_user_request.rb

@@ -0,0 +1,16 @@
+require_relative '../../response'
+
+module YamWow
+  class CurrentUserRequest
+
+    def initialize(client)
+      @client = client
+    end
+
+    def send
+      data = @client.get_current_user
+      Response.new data
+    end
+
+  end
+end

data/lib/yamwow/requests.rb

@@ -1 +1 @@
-Dir[File.expand_path(File.dirname(__FILE__) + '/requests/*.rb')].each { |f| require f }
+Dir[File.expand_path(File.dirname(__FILE__) + '/requests/**/*_request.rb')].each { |f| require f }

data/lib/yamwow/throttle.rb

@@ -30,7 +30,7 @@ module YamWow
       return 0 unless oldest_applicable
 
       age = Time.now - oldest_applicable
-      (@duration_in_seconds - age).ceil
+      (@duration_in_seconds - age + 0.5).round 2
     end
 
   end

data/lib/yamwow/topics_responder.rb

@@ -0,0 +1,22 @@
+require_relative 'response'
+
+module YamWow
+  class TopicsResponder
+
+    def create_response(topics)
+      @topics = topics
+      remove_duplicates
+      sort_by_name
+      Response.new @topics
+    end
+
+    def remove_duplicates
+      @topics.uniq! { |t| t['id'] }
+    end
+
+    def sort_by_name
+      @topics.sort! { |x, y| x['full_name'].to_s.downcase <=> y['full_name'].to_s.downcase }
+    end
+
+  end
+end

data/lib/yamwow.rb

@@ -1,2 +1,10 @@
 ENV['SSL_CERT_FILE'] ||= File.expand_path(File.dirname(__FILE__) + '/cacert.pem')
-require_relative 'yamwow/facade'
+require_relative 'yamwow/facade'
+
+module YamWow
+  class << self
+    def new(access_token)
+      Facade.new access_token
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamwow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yam
-  requirement: &70201996950260 !ruby/object:Gem::Requirement
+  requirement: &70253074602400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201996950260
+  version_requirements: *70253074602400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70253074601420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70253074601420
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: &70253074600560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70253074600560
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -32,17 +54,22 @@ files:
 - lib/yamwow/client.rb
 - lib/yamwow/enumerable_extensions.rb
 - lib/yamwow/facade.rb
-- lib/yamwow/requests/current_user_request.rb
-- lib/yamwow/requests/group_with_name_request.rb
-- lib/yamwow/requests/messages_with_topic_request.rb
-- lib/yamwow/requests/praise_request.rb
-- lib/yamwow/requests/topic_with_id_request.rb
-- lib/yamwow/requests/topic_with_name_request.rb
-- lib/yamwow/requests/topics_request.rb
-- lib/yamwow/requests/topics_with_prefix_request.rb
+- lib/yamwow/messages_responder.rb
+- lib/yamwow/praise_messages_responder.rb
+- lib/yamwow/requests/groups/group_with_name_request.rb
+- lib/yamwow/requests/messages/limited_messages_with_topic_id_request.rb
+- lib/yamwow/requests/messages/messages_with_topic_id_request.rb
+- lib/yamwow/requests/messages/messages_with_topic_name_request.rb
+- lib/yamwow/requests/messages/praise_messages_request.rb
+- lib/yamwow/requests/topics/limited_topics_with_prefix_request.rb
+- lib/yamwow/requests/topics/topic_with_name_request.rb
+- lib/yamwow/requests/topics/topics_request.rb
+- lib/yamwow/requests/topics/topics_with_prefix_request.rb
+- lib/yamwow/requests/users/current_user_request.rb
 - lib/yamwow/requests.rb
 - lib/yamwow/response.rb
 - lib/yamwow/throttle.rb
+- lib/yamwow/topics_responder.rb
 - lib/yamwow.rb
 homepage: http://rubygems.org/gems/yamwow
 licenses: []

data/lib/yamwow/requests/current_user_request.rb

@@ -1,18 +0,0 @@
-#GET https://www.yammer.com/api/v1/users/current.json
-
-require_relative '../response'
-
-module YamWow
-  class CurrentUserRequest
-
-    def initialize(client)
-      @client = client
-    end
-
-    def send
-      user = @client.get_other 'users/current.json'
-      Response.new user
-    end
-
-  end
-end

data/lib/yamwow/requests/group_with_name_request.rb

@@ -1,29 +0,0 @@
-require_relative '../response'
-
-module YamWow
-  class GroupWithNameRequest
-
-    def initialize(client, group_name)
-      @client = client
-      @group_name = group_name.downcase.gsub(/[^0-9a-z]/i, '')
-    end
-
-    def send
-      groups = get_groups
-      group = first_group_with_matching_name groups
-      Response.new group
-    end
-
-    private
-
-    def get_groups
-      r = @client.get_autocomplete prefix: 'to:' + @group_name
-      r['groups'] || []
-    end
-
-    def first_group_with_matching_name(groups)
-      groups.select { |g| g['name'] == @group_name }.first
-    end
-
-  end
-end

data/lib/yamwow/requests/messages_with_topic_request.rb

@@ -1,78 +0,0 @@
-require 'time'
-require_relative '../response'
-require_relative 'topic_with_name_request'
-
-module YamWow
-  class MessagesWithTopicRequest
-
-    def initialize(client, topic_name, options={})
-      @client = client
-      @topic_name = topic_name
-      @options = options
-    end
-
-    def send
-      @messages = []
-      @references = []
-      loop_finished = topic_id.nil?
-
-      until loop_finished
-        response_data = send_messages_request
-        before_message_count = @messages.length
-        add_messages response_data['messages'], response_data['references']
-        after_message_count = @messages.length
-        no_more_messages = before_message_count == after_message_count
-        loop_finished = no_more_messages || limit_reached
-      end
-
-      @messages.sort! { |x, y| Time.parse(y['created_at']) <=> Time.parse(x['created_at']) }
-
-      Response.new @messages, @references
-    end
-
-    private
-
-    def send_messages_request
-      @client.get_messages "about_topic/#{topic_id}.json", threaded: true, older_than: oldest_message_id
-    end
-
-    def topic_id
-      @topic_id ||= get_topic_id
-    end
-
-    def get_topic_id
-      request = TopicWithNameRequest.new @client, @topic_name
-      response = request.send
-      topic = response.data
-      topic.id if topic
-    end
-
-    def oldest_message_id
-      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.select { |m| m['replied_to_id'].nil? }.each do |m|
-        m['like_count'] = m['liked_by']['count'].to_i
-        m['sender_tag'] = "[[user:#{m['sender_id']}]]"
-      end
-    end
-
-    def limit_reached
-      limit_count > 0 ? @messages.length == limit_count : false
-    end
-
-    def limit_count
-      @options[:limit_count] ? @options[:limit_count].to_i : 0
-    end
-
-  end
-end

data/lib/yamwow/requests/praise_request.rb

@@ -1,52 +0,0 @@
-require_relative 'messages_with_topic_request'
-
-module YamWow
-  class PraiseRequest
-
-    def initialize(client, options={})
-      @client = client
-      @options = options
-    end
-
-    def send
-      get_messages_with_praise_topic
-    end
-
-    def get_messages_with_praise_topic
-      r = MessagesWithTopicRequest.new(@client, 'praise', @options).send
-      r.data.each do |m|
-        m['praise_message'] = reason m
-        m['praise_recipient_names'] = recipient_names m
-        m['praise_recipient_tags'] = recipient_tags m
-      end
-      r
-    end
-
-    private
-
-    def reason(message)
-      begin
-        attachments = message['attachments'] || []
-        praise_attachment = attachments.select { |a| a['type'] == 'ymodule' }.select { |a| a['ymodule']['app_id'] == 'praise' }.first
-        praise_attachment ? praise_attachment['name'].match(/Praise: (.+)/m)[1] : message['body']['parsed']
-      rescue
-        '(failed to extract reason)'
-      end
-    end
-
-    def recipient_names(message)
-      split_recipients(message['body']['plain']).map { |r| r.gsub '@', '' }.join ', '
-    end
-
-    def recipient_tags(message)
-      split_recipients(message['body']['parsed']).join ', '
-    end
-
-    def split_recipients(recipients)
-      recipients = recipients.include?('praised') ? recipients.match(/praised (.+)/)[1] : ''
-      recipients.gsub!(' and ', ', ')
-      recipients.split(', ')
-    end
-
-  end
-end

data/lib/yamwow/requests/topic_with_id_request.rb

@@ -1,17 +0,0 @@
-require_relative '../response'
-
-module YamWow
-  class TopicWithIdRequest
-
-    def initialize(client, topic_id)
-      @client = client
-      @topic_id = topic_id
-    end
-
-    def send
-      topic = @client.get_other "topics/#{@topic_id}.json"
-      Response.new topic
-    end
-
-  end
-end

data/lib/yamwow/requests/topic_with_name_request.rb

@@ -1,31 +0,0 @@
-require_relative '../response'
-require_relative 'topics_with_prefix_request'
-
-module YamWow
-  class TopicWithNameRequest
-
-    def initialize(client, topic_name, options={})
-      @client = client
-      @topic_name = topic_name
-      @detailed = options[:detailed]
-    end
-
-    def send
-      topics = get_topics
-      topic = first_topic_with_matching_name topics
-      Response.new topic
-    end
-
-    private
-
-    def get_topics
-      response = TopicsWithPrefixRequest.new(@client, @topic_name, detailed: @detailed).send
-      response.data || []
-    end
-
-    def first_topic_with_matching_name(topics)
-      topics.select { |t| t['name'].casecmp(@topic_name) == 0 }.first
-    end
-
-  end
-end

data/lib/yamwow/requests/topics_request.rb

@@ -1,37 +0,0 @@
-require_relative '../response'
-require_relative 'topics_with_prefix_request'
-
-module YamWow
-  class TopicsRequest
-
-    def initialize(client, options={})
-      @client = client
-      @detailed = options[:detailed]
-    end
-
-    def send
-      @topics = []
-      process_range '0', '9'
-      process_range 'a', 'z'
-      @topics.uniq! { |t| t['id'] }
-      @topics.sort! { |x, y| x['name'].downcase <=> y['name'].downcase }
-      Response.new @topics
-    end
-
-    private
-
-    def process_range(first, last, current=nil)
-      ((current.to_s + first)..(current.to_s + last)).each do |prefix|
-        topics = send_topics_with_prefix_request prefix
-        @topics += topics
-        process_range first, last, prefix if topics.length == 50
-      end
-    end
-
-    def send_topics_with_prefix_request(topic_prefix)
-      response = TopicsWithPrefixRequest.new(@client, topic_prefix, detailed: @detailed).send
-      response.data || []
-    end
-
-  end
-end

data/lib/yamwow/requests/topics_with_prefix_request.rb

@@ -1,36 +0,0 @@
-require_relative '../response'
-require_relative 'topic_with_id_request'
-
-module YamWow
-  class TopicsWithPrefixRequest
-
-    def initialize(client, topic_prefix, options={})
-      @client = client
-      @topic_prefix = topic_prefix
-      @detailed = options[:detailed]
-    end
-
-    def send
-      topics = get_topics
-      topics.each { |t| add_details t } if @detailed
-      Response.new topics
-    end
-
-    private
-
-    def get_topics
-      response = @client.get_autocomplete(prefix: @topic_prefix)
-      response['topics'] || []
-    end
-
-    def add_details(topic)
-      r = get_detailed_topic topic['id']
-      topic.merge! r.data
-    end
-
-    def get_detailed_topic(topic_id)
-      TopicWithIdRequest.new(@client, topic_id).send
-    end
-
-  end
-end