jnunemaker-twitter 0.5.1 → 0.5.2

data/History

@@ -1,3 +1,11 @@
+0.5.2 - April 8, 2009
+* 4 minor fixes
+  * added mash as an install dependency, forgot it initially
+  * fixed that search wasn't taking into account a bunch of options duh!
+  * fixed some missing vars and stuff in exception raising
+  * added development dependencies to rake file to make that more explicit (technomancy)
+  * lame workaround for Mash#hash that allows using return objects in sets and such (technomancy)
+
 0.5.1 - April 5, 2009
 * 1 minor change
   * Added data error hash returned from twitter to a few of the exceptions to help with debugging

data/Rakefile

@@ -13,7 +13,14 @@ begin
     gem.files             = FileList["[A-Z]*", "{examples,lib,test}/**/*"]
     
     gem.add_dependency('oauth')
+    gem.add_dependency('mash')
     gem.add_dependency('httparty', '>= 0.4.2')
+    
+    gem.add_development_dependency('thoughtbot-shoulda')
+    gem.add_development_dependency('jeremymcanally-matchy')
+    gem.add_development_dependency('mocha')
+    gem.add_development_dependency('fakeweb')
+    gem.add_development_dependency('mash')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 1
+:patch: 2

data/examples/search.rb

@@ -7,4 +7,9 @@ puts '*'*50, 'First Run', '*'*50
 search.each { |result| pp result }
 
 puts '*'*50, 'Second Run', '*'*50
-search.each { |result| pp result }
+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

data/lib/twitter/request.rb

@@ -51,13 +51,14 @@ module Twitter
       def raise_errors(response)
         case response.code.to_i
           when 400
-            raise RateLimitExceeded.new(parse(response)), "(#{response.code}): #{response.message} - #{data['error']}"
+            data = parse(response)
+            raise RateLimitExceeded.new(data), "(#{response.code}): #{response.message} - #{data['error'] if data}"
           when 401
             data = parse(response)
-            raise Unauthorized.new(data), "(#{response.code}): #{response.message} - #{data['error']}"
+            raise Unauthorized.new(data), "(#{response.code}): #{response.message} - #{data['error'] if data}"
           when 403
             data = parse(response)
-            raise General.new(data), "(#{response.code}): #{response.message} - #{data['error']}"
+            raise General.new(data), "(#{response.code}): #{response.message} - #{data['error'] if data}"
           when 404
             raise NotFound, "(#{response.code}): #{response.message}"
           when 500
@@ -73,13 +74,22 @@ module Twitter
       
       def mash(obj)
         if obj.is_a?(Array)
-          obj.map { |item| Mash.new(item) }
+          obj.map { |item| make_mash_with_consistent_hash(item) }
         elsif obj.is_a?(Hash)
-          Mash.new(obj)
+          make_mash_with_consistent_hash(obj)
         else
           obj
         end
       end
+
+      # Lame workaround for the fact that mash doesn't hash correctly
+      def make_mash_with_consistent_hash(obj)
+        m = Mash.new(obj)
+        def m.hash
+          inspect.hash
+        end
+        return m
+      end
       
       def to_query(options)
         options.inject([]) do |collection, opt| 

data/lib/twitter/search.rb

@@ -85,7 +85,9 @@ module Twitter
     
     def fetch(force=false)
       if @fetch.nil? || force
-        response = self.class.get('http://search.twitter.com/search.json', :query => {:q => @query[:q].dup.join(' ')}, :format => :json)
+        query = @query.dup
+        query[:q] = query[:q].join(' ')
+        response = self.class.get('http://search.twitter.com/search.json', :query => query, :format => :json)
         @fetch = Mash.new(response)
       end
       

data/test/twitter/base_test.rb

@@ -69,6 +69,12 @@ class BaseTest < Test::Unit::TestCase
         first.user.name.should == '-oAk-'
         first.text.should == '@jnunemaker cold out today. cold yesterday. even colder today.'
       end
+      
+      should "correctly hash statuses" do
+        stub_get('/statuses/friends_timeline.json', 'friends_timeline.json')
+        hashes = @twitter.friends_timeline.map{ |s| s.hash }
+        hashes.should == @twitter.friends_timeline.map{ |s| s.hash }
+      end
     end
   end
 end

data/test/twitter/search_test.rb

@@ -43,23 +43,33 @@ class SearchTest < Test::Unit::TestCase
     end
 
     should "should be able to specify the language" do
-      @search.lang('en').query[:lang].should == 'en'
+      @search.lang('en')
+      @search.class.expects(:get).with('http://search.twitter.com/search.json', :query => {:lang => 'en', :q => ''}, :format => :json).returns({'foo' => 'bar'})
+      @search.fetch()
     end
 
     should "should be able to specify the number of results per page" do
-      @search.per_page(25).query[:rpp].should == 25
+      @search.per_page(25)
+      @search.class.expects(:get).with('http://search.twitter.com/search.json', :query => {:rpp => 25, :q => ''}, :format => :json).returns({'foo' => 'bar'})
+      @search.fetch()
     end
 
     should "should be able to specify the page number" do
-      @search.page(20).query[:page].should == 20
+      @search.page(20)
+      @search.class.expects(:get).with('http://search.twitter.com/search.json', :query => {:page => 20, :q => ''}, :format => :json).returns({'foo' => 'bar'})
+      @search.fetch()
     end
 
     should "should be able to specify only returning results greater than an id" do
-      @search.since(1234).query[:since_id].should == 1234
+      @search.since(1234)
+      @search.class.expects(:get).with('http://search.twitter.com/search.json', :query => {:since_id => 1234, :q => ''}, :format => :json).returns({'foo' => 'bar'})
+      @search.fetch()
     end
 
     should "should be able to specify geo coordinates" do
-      @search.geocode('40.757929', '-73.985506', '25mi').query[:geocode].should == '40.757929,-73.985506,25mi'
+      @search.geocode('40.757929', '-73.985506', '25mi')
+      @search.class.expects(:get).with('http://search.twitter.com/search.json', :query => {:geocode => '40.757929,-73.985506,25mi', :q => ''}, :format => :json).returns({'foo' => 'bar'})
+      @search.fetch()
     end
 
     should "should be able to clear the filters set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   type: :runtime
@@ -32,6 +42,56 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeremymcanally-matchy
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mash
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: nunemaker@gmail.com
 executables: []
@@ -44,23 +104,20 @@ files:
 - History
 - License
 - Notes
-- Rakefile
 - README.rdoc
+- Rakefile
 - VERSION.yml
 - examples/connect.rb
 - examples/friendship_existance.rb
-- examples/helpers
 - examples/helpers/config_store.rb
 - examples/search.rb
 - examples/timeline.rb
 - examples/update.rb
-- lib/twitter
+- lib/twitter.rb
 - lib/twitter/base.rb
 - lib/twitter/oauth.rb
 - lib/twitter/request.rb
 - lib/twitter/search.rb
-- lib/twitter.rb
-- test/fixtures
 - test/fixtures/firehose.json
 - test/fixtures/friends_timeline.json
 - test/fixtures/rate_limit_exceeded.json
@@ -70,7 +127,6 @@ files:
 - test/fixtures/status.json
 - test/fixtures/user_timeline.json
 - test/test_helper.rb
-- test/twitter
 - test/twitter/base_test.rb
 - test/twitter/oauth_test.rb
 - test/twitter/request_test.rb
@@ -80,7 +136,6 @@ has_rdoc: true
 homepage: http://github.com/jnunemaker/twitter
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -103,5 +158,16 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: wrapper for the twitter api (oauth only)
-test_files: []
-
+test_files: 
+- test/test_helper.rb
+- test/twitter/base_test.rb
+- test/twitter/oauth_test.rb
+- test/twitter/request_test.rb
+- test/twitter/search_test.rb
+- test/twitter_test.rb
+- examples/connect.rb
+- examples/friendship_existance.rb
+- examples/helpers/config_store.rb
+- examples/search.rb
+- examples/timeline.rb
+- examples/update.rb