deadprogrammer-twitter 0.6.11 → 0.6.12

data/examples/search.rb

@@ -12,4 +12,5 @@ search.each { |result| pp result }
 puts '*'*50, 'Parameter Check', '*'*50
 pp Twitter::Search.new('#austineats').fetch().results.first
 pp Twitter::Search.new('#austineats').page(2).fetch().results.first
-pp Twitter::Search.new('#austineats').since(1412737343).fetch().results.first
+pp Twitter::Search.new('#austineats').since(1412737343).fetch().results.first
+pp Twitter::Search.new('#austineats').user_agent("Testing Twitter App").fetch().results.first

data/lib/twitter/search.rb

@@ -3,11 +3,13 @@ module Twitter
     include HTTParty
     include Enumerable
     
-    attr_reader :result, :query, :user_agent
+    headers 'Accept' => 'text/json'
     
-    def initialize(q=nil, agent="Twitter Ruby Gem")
+    attr_reader :result, :query
+    
+    def initialize(q=nil, o={})
       clear
-      @user_agent = agent
+      @user_agent = o[:user_agent] ? o[:user_agent] : "Twitter Ruby Gem"
       containing(q) if q && q.strip != ''
     end
     
@@ -86,7 +88,6 @@ module Twitter
       @fetch = nil
       @query = {}
       @query[:q] = []
-      @user_agent = "Twitter Ruby Gem"
       self
     end
     
@@ -94,7 +95,7 @@ module Twitter
       if @fetch.nil? || force
         query = @query.dup
         query[:q] = query[:q].join(' ')
-        response = self.class.get('http://search.twitter.com/search.json', :query => query, :format => :json, :headers => {'user-agent' => @user_agent})
+        response = self.class.get('http://search.twitter.com/search.json', {:query => query, :format => :json, :headers => {'user-agent' => @user_agent}})
         @fetch = Mash.new(response)
       end
       
@@ -104,5 +105,14 @@ module Twitter
     def each
       fetch()['results'].each { |r| yield r }
     end
+    
+    def user_agent(agent=nil)
+      if agent.nil?
+        @user_agent
+      else
+        @user_agent = agent
+        self
+      end
+    end
   end
 end

data/test/twitter/search_test.rb

@@ -92,6 +92,18 @@ class SearchTest < Test::Unit::TestCase
       @search.query[:geocode].should == '40.757929,-73.985506,25mi'
     end
 
+    should "should be able to use with default user-agent" do
+      Twitter::Search.new('httparty').user_agent.should == "Twitter Ruby Gem"
+    end
+
+    should "should be able to have custom user-agent" do
+      Twitter::Search.new('httparty').user_agent('My Twitter App').user_agent.should == "My Twitter App"
+    end
+
+    should "should be able to to initialize custom user-agent with options hash in constructor" do
+      Twitter::Search.new('httparty', :user_agent => 'My Twitter App').user_agent.should == "My Twitter App"
+    end
+
     context "fetching" do
       setup do
         stub_get('http://search.twitter.com:80/search.json?q=%40jnunemaker', 'search.json')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deadprogrammer-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors: 
 - John Nunemaker