yamwow 0.0.8 → 0.0.9

data/lib/yamwow/csv_generator.rb

@@ -3,17 +3,25 @@ require 'csv'
 module YamWow
   class CsvGenerator
 
-    def initialize(column_headers)
-      @column_headers = column_headers
+    attr_accessor :headers
+
+    def initialize
+      @headers = nil
     end
 
-    def generate(messages)
+    def generate(items)
       CSV.generate do |csv|
-        csv << @column_headers
-        sorted_messages = messages.sort { |x, y| y.date_created <=> x.date_created }
-        sorted_messages.each { |p| csv << yield(p) }
+        csv << headers_as_array if @headers
+        items.each { |i| csv << yield(i) }
       end
     end
 
+    private
+
+    def headers_as_array
+      return unless @headers
+      @headers.kind_of?(Array) ? @headers : @headers.split(',').map { |h| h.strip }
+    end
+
   end
 end

data/lib/yamwow/facade.rb

@@ -1,3 +1,6 @@
+require_relative 'client'
+Dir[File.expand_path(File.dirname(__FILE__) + '/*_request.rb')].each { |f| require f }
+
 module YamWow
   class Facade
 
@@ -5,34 +8,24 @@ module YamWow
       @client = Client.new oauth_token
     end
 
-    def messages_for_topic(topic_name, options={})
-      request = MessagesForTopicRequest.new @client, topic_name, options
-      response = request.send
-      response.messages
+    def messages_with_topic(topic_name, options={})
+      MessagesWithTopicRequest.new(@client, topic_name, options).send
     end
 
     def praises(options={})
-      request = PraiseRequest.new @client, options
-      response = request.send
-      response.praises
+      PraiseRequest.new(@client, options).send
     end
 
-    def topic(topic_name)
-      request = TopicRequest.new @client, topic_name
-      response = request.send
-      response.topic
+    def topic_with_name(topic_name)
+      TopicWithNameRequest.new(@client, topic_name).send
     end
 
     def topics
-      request = TopicsRequest.new @client
-      response = request.send
-      response.topics
+      TopicsRequest.new(@client).send
     end
 
-    def group(group_name)
-      request = GroupRequest.new @client, group_name
-      response = request.send
-      response.group
+    def group_with_name(group_name)
+      GroupWithNameRequest.new(@client, group_name).send
     end
 
   end

data/lib/yamwow/group_with_name_request.rb

@@ -0,0 +1,40 @@
+require_relative 'group'
+
+module YamWow
+  class GroupWithNameRequest
+
+    def initialize(client, group_name)
+      @client = client
+      @group_name = group_name.downcase.gsub(/[^0-9a-z]/i, '')
+    end
+
+    def send
+      build_group group_data
+    end
+
+    private
+
+    def group_data
+      data = send_autocomplete_request
+      groups = data['groups'] || []
+      groups.select { |g| g['name'] == @group_name }.first
+    end
+
+    def send_autocomplete_request
+      @client.get_autocomplete prefix: autocomplete_prefix
+    end
+
+    def autocomplete_prefix
+      'to:' + @group_name
+    end
+
+    def build_group(group_data)
+      return unless group_data
+      g = YamWow::Group.new
+      g.id = group_data['id']
+      g.name = group_data['full_name']
+      g
+    end
+
+  end
+end

data/lib/yamwow/{messages_for_topic_request.rb → messages_with_topic_request.rb}

@@ -1,10 +1,9 @@
-require_relative 'topic_request'
-require_relative 'messages_for_topic_response'
+require_relative 'topic_with_name_request'
 require_relative 'message'
 require_relative 'user'
 
 module YamWow
-  class MessagesForTopicRequest
+  class MessagesWithTopicRequest
 
     def initialize(client, topic_name, options={})
       @client = client
@@ -12,7 +11,6 @@ module YamWow
       @options = options
     end
 
-
     def send
       @messages = []
       loop_finished = false
@@ -26,7 +24,8 @@ module YamWow
         loop_finished = no_more_messages || limit_reached
       end
 
-      build_response
+      @messages.sort! { |x, y| y.date_created <=> x.date_created }
+      @messages
     end
 
     private
@@ -40,10 +39,10 @@ module YamWow
     end
 
     def get_topic_id
-      request = TopicRequest.new @client, @topic_name
-      response = request.send
-      raise "Topic '#{@topic_name}' was not found." unless response.topic
-      response.topic.id
+      request = TopicWithNameRequest.new @client, @topic_name
+      topic = request.send
+      raise "Topic '#{@topic_name}' was not found." unless topic
+      topic.id
     end
 
     def oldest_message_id
@@ -91,9 +90,5 @@ module YamWow
       @options[:limit_count] ? @options[:limit_count].to_i : 0
     end
 
-    def build_response
-      MessagesForTopicResponse.new @messages
-    end
-
   end
 end

data/lib/yamwow/praise_request.rb

@@ -1,4 +1,5 @@
-require_relative 'messages_for_topic_request'
+require_relative 'messages_with_topic_request'
+require_relative 'praise'
 
 module YamWow
   class PraiseRequest
@@ -9,9 +10,9 @@ module YamWow
     end
 
     def send
-      messages_by_topic_request = MessagesForTopicRequest.new @client, 'praise', @options
-      messages_by_topic_response = messages_by_topic_request.send
-      PraiseResponse.new messages_by_topic_response.messages
+      r = MessagesWithTopicRequest.new @client, 'praise', @options
+      messages = r.send
+      messages.map { |m| Praise.new m }
     end
 
   end

data/lib/yamwow/topic.rb

@@ -1,5 +1,5 @@
 module YamWow
   class Topic
-    attr_accessor :id, :name
+    attr_accessor :id, :name, :usages
   end
 end

data/lib/yamwow/topic_with_name_request.rb

@@ -0,0 +1,36 @@
+require_relative 'topic'
+
+module YamWow
+  class TopicWithNameRequest
+
+    def initialize(client, topic_name)
+      @client = client
+      @topic_name = topic_name
+    end
+
+    def send
+      build_topic topic_data
+    end
+
+    private
+
+    def topic_data
+      data = send_autocomplete_request
+      topics = data['topics'] || []
+      topics.select { |t| t['name'].casecmp(@topic_name) == 0 }.first
+    end
+
+    def send_autocomplete_request
+      @client.get_autocomplete prefix: @topic_name
+    end
+
+    def build_topic(topic_data)
+      return unless topic_data
+      t = Topic.new
+      t.id = topic_data['id']
+      t.name = topic_data['name']
+      t
+    end
+
+  end
+end

data/lib/yamwow/topics_request.rb

@@ -1,7 +1,4 @@
-
-
 require_relative 'topic'
-require_relative 'topics_response'
 
 module YamWow
   class TopicsRequest
@@ -14,18 +11,20 @@ module YamWow
       @topics = []
       process_range '0', '9'
       process_range 'a', 'z'
-      build_response
+      @topics.uniq! { |t| t.id }
+      @topics.sort! { |x, y| x.name.downcase <=> y.name.downcase }
+      @topics
     end
 
     private
 
-    def process_range(first, last)
-      (first..last).each do |current|
-        response_data = send_autocomplete_request current
+    def process_range(first, last, current=nil)
+      ((current.to_s + first)..(current.to_s + last)).each do |prefix|
+        response_data = send_autocomplete_request prefix
         topics_data = response_data['topics'] || []
         topics = topics_data.map { |t| build_topic t }
         @topics += topics
-        process_range current + first, current + last if topics.length == 50
+        process_range first, last, prefix if topics.length == 50
       end
     end
 
@@ -33,16 +32,11 @@ module YamWow
       @client.get_autocomplete prefix: prefix.downcase
     end
 
-    def build_response
-      topics = @topics.uniq { |t| t.id }
-      topics = topics.sort { |x, y| x.name.downcase <=> y.name.downcase }
-      TopicsResponse.new topics
-    end
-
     def build_topic(topic_data)
       t = Topic.new
       t.id = topic_data['id']
       t.name = topic_data['name']
+      t.usages = topic_data['applications_count']
       t
     end
 

data/lib/yamwow.rb

@@ -1,2 +1,3 @@
 ENV['SSL_CERT_FILE'] ||= File.expand_path(File.dirname(__FILE__) + '/cacert.pem')
-Dir[File.expand_path(File.dirname(__FILE__) + '/yamwow/*.rb')].each { |f| require f }
+require_relative 'yamwow/facade'
+require_relative 'yamwow/csv_generator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamwow
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yam
-  requirement: &70341913725080 !ruby/object:Gem::Requirement
+  requirement: &70195163260140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341913725080
+  version_requirements: *70195163260140
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -33,20 +33,15 @@ files:
 - lib/yamwow/csv_generator.rb
 - lib/yamwow/facade.rb
 - lib/yamwow/group.rb
-- lib/yamwow/group_request.rb
-- lib/yamwow/group_response.rb
+- lib/yamwow/group_with_name_request.rb
 - lib/yamwow/message.rb
-- lib/yamwow/messages_for_topic_request.rb
-- lib/yamwow/messages_for_topic_response.rb
+- lib/yamwow/messages_with_topic_request.rb
 - lib/yamwow/praise.rb
 - lib/yamwow/praise_request.rb
-- lib/yamwow/praise_response.rb
 - lib/yamwow/throttle.rb
 - lib/yamwow/topic.rb
-- lib/yamwow/topic_request.rb
-- lib/yamwow/topic_response.rb
+- lib/yamwow/topic_with_name_request.rb
 - lib/yamwow/topics_request.rb
-- lib/yamwow/topics_response.rb
 - lib/yamwow/user.rb
 - lib/yamwow.rb
 homepage: http://rubygems.org/gems/yamwow

data/lib/yamwow/group_request.rb

@@ -1,47 +0,0 @@
-require_relative 'group'
-require_relative 'group_response'
-
-module YamWow
-  class GroupRequest
-
-    def initialize(client, group_name)
-      @client = client
-      @group_name = group_name.gsub /[^0-9a-z]/i, ''
-    end
-
-    def send
-      group_data = get_group_data
-      group_data ? build_response(group_data) : build_empty_response
-    end
-
-    private
-
-    def get_group_data
-      data = send_autocomplete_request
-      topics = data['groups'] || []
-      topics.select { |t| t['name'].downcase == @group_name.downcase }[0]
-    end
-
-    def send_autocomplete_request
-      prefix = 'to:' + @group_name.downcase
-      @client.get_autocomplete prefix: prefix
-    end
-
-    def build_empty_response
-      GroupResponse.new nil
-    end
-
-    def build_response(group_data)
-      group = build_group group_data
-      GroupResponse.new group
-    end
-
-    def build_group(group_data)
-      g = YamWow::Group.new
-      g.id = group_data['id']
-      g.name = group_data['full_name']
-      g
-    end
-
-  end
-end

data/lib/yamwow/group_response.rb

@@ -1,11 +0,0 @@
-module YamWow
-  class GroupResponse
-
-    attr_reader :group
-
-    def initialize(group)
-      @group = group
-    end
-
-  end
-end

data/lib/yamwow/messages_for_topic_response.rb

@@ -1,11 +0,0 @@
-module YamWow
-  class MessagesForTopicResponse
-
-    attr_reader :messages
-
-    def initialize(messages)
-      @messages = messages
-    end
-
-  end
-end

data/lib/yamwow/praise_response.rb

@@ -1,15 +0,0 @@
-require_relative 'praise'
-
-module YamWow
-  class PraiseResponse
-
-    def initialize(messages)
-      @messages = messages
-    end
-
-    def praises
-      @praises ||= @messages.map { |m| Praise.new m }
-    end
-
-  end
-end

data/lib/yamwow/topic_request.rb

@@ -1,46 +0,0 @@
-require_relative 'topic'
-require_relative 'topic_response'
-
-module YamWow
-  class TopicRequest
-
-    def initialize(client, topic_name)
-      @client = client
-      @topic_name = topic_name
-    end
-
-    def send
-      topic_data = get_topic_data
-      topic_data ? build_response(topic_data) : build_empty_response
-    end
-
-    private
-
-    def get_topic_data
-      data = send_autocomplete_request
-      topics = data['topics'] || []
-      topics.select { |t| t['name'].downcase == @topic_name.downcase }[0]
-    end
-
-    def send_autocomplete_request
-      @client.get_autocomplete prefix: @topic_name.downcase
-    end
-
-    def build_empty_response
-      TopicResponse.new nil
-    end
-
-    def build_response(topic_data)
-      topic = build_topic topic_data
-      TopicResponse.new topic
-    end
-
-    def build_topic(topic_data)
-      t = Topic.new
-      t.id = topic_data['id']
-      t.name = topic_data['name']
-      t
-    end
-
-  end
-end

data/lib/yamwow/topic_response.rb

@@ -1,11 +0,0 @@
-module YamWow
-  class TopicResponse
-
-    attr_reader :topic
-
-    def initialize(topic)
-      @topic = topic
-    end
-
-  end
-end

data/lib/yamwow/topics_response.rb

@@ -1,11 +0,0 @@
-module YamWow
-  class TopicsResponse
-
-    attr_reader :topics
-
-    def initialize(topics)
-      @topics = topics
-    end
-
-  end
-end