weibo 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,17 +1,30 @@
 = weibo
 
-One of the goals of this gem was to have the same syntax as the twitter gem wherever possible so that it would be easy to learn and use.  Download the gem and give it a try.  Also, I've put together a small demo of how you can use the weibo gem using sinatra.
+One of the goals of this gem was to have the same syntax as the twitter gem wherever possible so that it would be easy to learn and use.  Download the gem and give it a try.  Also, I've put together a small demo using sinatra showing how you can use the weibo gem.
 
 
+To install the gem simply enter:
+
   gem install weibo
-  git clone git://github.com/ballantyne/weibo.git
-  cd weibo
-  ruby example/example.rb
-  open http://localhost:4567
+  
+To see an example of how it works enter the following into your terminal:
+
+  git clone git://github.com/ballantyne/weibo-example.git
+  cd weibo-example
+  ruby example.rb
 
 Most of the 新浪微博 api is implemented by this gem.  If I missed something, or Sina added something, please feel free to fork it and add it yourself.  I will do my best to keep the gem up to date.
 
-This gem was made in the process of creating {{叽叽喳喳.de}[http://jjzz.de], please take a moment and go and check out that project.  I think that it is a very usful tool for interacting with 新浪微博.
+This gem was made in the process of creating {叽叽喳喳.de}[http://jjzz.de], please take a moment and go and check out that project.  I think that it is a very useful tool for interacting with 新浪微博.
+
+== Sites using the Weibo gem
+* {叽叽喳喳.de}[http://jjzz.de]
+
+(Please let me know if your site is using the gem so I can list you here)
+
+== Contributors
+* {Feixiong Li}[http://github.com/feixionglee]
+* {Aaron Qian}[http://github.com/aq1018]
 
 == Note on Patches/Pull Requests
  
@@ -20,14 +33,9 @@ This gem was made in the process of creating {{叽叽喳喳.de}[http://jjzz.de],
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+  (if you want to have your own version, that is fine but bump version in a commit by itself so I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Sites using the Weibo gem
-* {叽叽喳喳.de}[http://jjzz.de]
-
-(Please let me know if your site is using the gem so I can list you here)
-
 == Special Thanks
 This library was based upon and is an adaptation of John Nunemaker's twitter gem.  It started as the twitter gem and has been adapted in the necessary ways to make it work with t.sina.com.cn's api.  I'm using it with his blessing, thanks John.
 

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.name = "weibo"
     gem.summary = %Q{a gem to help api integration for 新浪微博 (t.sina.com.cn)}
     gem.description = %Q{this gem is an adaptation of John Nunemaker's Twitter gem.  I modified it to make api integration for 新浪微博 (t.sina.com.cn) easier.}
-    gem.email = "scott@ekohe.com"
+    gem.email = "ussballantyne@gmail.com"
     gem.homepage = "http://github.com/ballantyne/weibo"
     gem.authors = ["Scott Ballantyne"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/weibo/base.rb

@@ -268,6 +268,11 @@ module Weibo
       perform_get('/help/test.json')
     end
 
+		# Trends/daily
+		def trends_daily(query={})
+      perform_get("/trends/daily.json", :query => query)
+		end
+
   protected
     def self.mime_type(file)
       case

data/lib/weibo/oauth_hack.rb

@@ -1,6 +1,17 @@
 # This hack is used for Weibo upload
 # as Sina Weibo doesn't follow the god damned OAuth specifications!!!
 
+unless {}.respond_to?(:stringify_keys)
+  class Hash
+     def stringify_keys
+       inject({}) do |options, (key, value)|
+         options[key.to_s] = value
+         options
+       end
+     end
+  end
+end
+
 module PostBodyHack
   @@parameters = nil
   def self.parameters=(val)

data/lib/weibo/request.rb

@@ -23,7 +23,7 @@ module Weibo
 
     def initialize(client, method, path, options={})
       @client, @method, @path, @options = client, method, path, {:mash => true, :query => {:source => Weibo::Config.api_key}}.merge(options)
-      puts @options.inspect
+      # puts @options.inspect
     end
 
 

data/weibo.gemspec

@@ -1,58 +1,52 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{weibo}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Ballantyne"]
-  s.date = %q{2010-08-22}
+  s.date = %q{2010-12-31}
   s.description = %q{this gem is an adaptation of John Nunemaker's Twitter gem.  I modified it to make api integration for 新浪微博 (t.sina.com.cn) easier.}
-  s.email = %q{scott@ekohe.com}
+  s.email = %q{ussballantyne@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "example/example.rb",
-     "example/views/index.haml",
-     "example/views/layout.haml",
-     "example/views/screen.sass",
-     "lib/weibo.rb",
-     "lib/weibo/base.rb",
-     "lib/weibo/config.rb",
-     "lib/weibo/httpauth.rb",
-     "lib/weibo/oauth.rb",
-     "lib/weibo/oauth_hack.rb",
-     "lib/weibo/request.rb",
-     "test/helper.rb",
-     "test/test_weibo.rb",
-     "weibo.gemspec"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/weibo.rb",
+    "lib/weibo/base.rb",
+    "lib/weibo/config.rb",
+    "lib/weibo/httpauth.rb",
+    "lib/weibo/oauth.rb",
+    "lib/weibo/oauth_hack.rb",
+    "lib/weibo/request.rb",
+    "test/helper.rb",
+    "test/test_weibo.rb",
+    "weibo.gemspec"
   ]
   s.homepage = %q{http://github.com/ballantyne/weibo}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{a gem to help api integration for 新浪微博 (t.sina.com.cn)}
   s.test_files = [
     "test/helper.rb",
-     "test/test_weibo.rb"
+    "test/test_weibo.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.1"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: weibo
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Scott Ballantyne
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +08:00
+date: 2010-12-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: oauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
@@ -47,9 +52,11 @@ dependencies:
   name: hashie
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,9 +66,11 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -70,7 +79,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 description: "this gem is an adaptation of John Nunemaker's Twitter gem.  I modified it to make api integration for \xE6\x96\xB0\xE6\xB5\xAA\xE5\xBE\xAE\xE5\x8D\x9A (t.sina.com.cn) easier."
-email: scott@ekohe.com
+email: ussballantyne@gmail.com
 executables: []
 
 extensions: []
@@ -80,15 +89,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- example/example.rb
-- example/views/index.haml
-- example/views/layout.haml
-- example/views/screen.sass
 - lib/weibo.rb
 - lib/weibo/base.rb
 - lib/weibo/config.rb
@@ -104,28 +108,32 @@ homepage: http://github.com/ballantyne/weibo
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "a gem to help api integration for \xE6\x96\xB0\xE6\xB5\xAA\xE5\xBE\xAE\xE5\x8D\x9A (t.sina.com.cn)"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/example/example.rb

@@ -1,58 +0,0 @@
-%w(rubygems sinatra haml sass oauth pp json).each { |dependency| require dependency }
-require File.join(File.dirname(__FILE__), '..', 'lib', 'weibo')
-enable :sessions
-Weibo::Config.api_key = "2942145647"
-Weibo::Config.api_secret = "5cc0026c470a25a6070237e07ade5f27"
-
-get '/' do
-  if session[:atoken]
-    redirect "/friends_timeline"
-  end
-  haml :index
-end
-
-get "/friends_timeline" do
-  oauth = Weibo::OAuth.new(Weibo::Config.api_key, Weibo::Config.api_secret)
-  oauth.authorize_from_access(session[:atoken], session[:asecret])
-  @timeline = Weibo::Base.new(oauth).friends_timeline
-  haml :index
-end
-
-get "/friends_timeline.json" do
-  content_type :json
-  oauth = Weibo::OAuth.new(Weibo::Config.api_key, Weibo::Config.api_secret)
-  oauth.authorize_from_access(session[:atoken], session[:asecret])
-  Weibo::Base.new(oauth).friends_timeline.to_json
-end
-
-post '/update' do
-  oauth = Weibo::OAuth.new(Weibo::Config.api_key, Weibo::Config.api_secret)
-  oauth.authorize_from_access(session[:atoken], session[:asecret])
-  Weibo::Base.new(oauth).update(params[:update])
-  redirect "/friends_timeline"
-end
-
-get '/connect' do
-  oauth = Weibo::OAuth.new(Weibo::Config.api_key, Weibo::Config.api_secret)
-  request_token = oauth.consumer.get_request_token
-  session[:rtoken], session[:rsecret] = request_token.token, request_token.secret
-  redirect "#{request_token.authorize_url}&oauth_callback=http://localhost:4567/callback"
-end
-
-get '/callback' do
-  oauth = Weibo::OAuth.new(Weibo::Config.api_key, Weibo::Config.api_secret)
-  oauth.authorize_from_request(session[:rtoken], session[:rsecret], params[:oauth_verifier])
-  session[:rtoken], session[:rsecret] = nil, nil
-  session[:atoken], session[:asecret] = oauth.access_token.token, oauth.access_token.secret
-  redirect "/"
-end
-
-get '/logout' do
-  session[:atoken], session[:asecret] = nil, nil
-  redirect "/"
-end
-
-get '/screen.css' do
-  content_type 'text/css'
-  sass :screen
-end

data/example/views/index.haml

@@ -1,32 +0,0 @@
--if session[:atoken]
-  %form{:action => "/update", :method => "POST"}
-    %textarea{:name => "update", :cols => "62", :rows => "5"}
-    %br
-    %input{:type => "submit", :value => "Send"} 
-  %h1
-    friends_timeline
-  -@timeline.each do |weibo|
-    .weibo
-      %img{:src => weibo.user.profile_image_url, :class => "avatar" }
-      %span.text
-        %a{:href => "http://t.sina.com.cn/#{weibo.user.id}", :target => "_blank"}=weibo.user.screen_name
-        %span=weibo.text
-        %br
-        %span=weibo.created_at
-        -if weibo.thumbnail_pic
-          %br
-          %a{:href => weibo.original_pic, :target => "_blank"}
-            %img{:src => weibo.thumbnail_pic, :class => "thumbnail_pic", :alt => weibo.original_pic}
-      -if weibo.retweeted_status
-        .retweeted_status
-          %img{:src => weibo.retweeted_status.user.profile_image_url, :class => "avatar" }
-          %span.text
-            %a{:href => "http://t.sina.com.cn/#{weibo.user.id}", :target => "_blank"}=weibo.retweeted_status.user.screen_name
-            %span=weibo.retweeted_status.text
-            %br
-            %span=weibo.retweeted_status.created_at
-            -if weibo.retweeted_status.thumbnail_pic
-              %br
-              %a{:href => weibo.retweeted_status.original_pic, :target => "_blank"}
-                %img{:src => weibo.retweeted_status.thumbnail_pic, :class => "thumbnail_pic", :alt => weibo.retweeted_status.original_pic}
-    

data/example/views/layout.haml

@@ -1,10 +0,0 @@
-!!!
-%html(xml:lang='en' lang='en' xmlns='http://www.w3.org/1999/xhtml')
-  %head
-    %meta(content='text/html;charset=UTF-8' http-equiv='content-type')
-    %title="weibo gem example"
-    %link{:href => "/screen.css", :rel =>"stylesheet", :type => "text/css", :media => "screen" }
-  %body
-    %h2="weibo gem example"
-    %a{:href => (session[:atoken] ? "/logout" : "/connect")}=(session[:atoken] ? "logout" : "connect")
-    = yield

data/example/views/screen.sass

@@ -1,24 +0,0 @@
-.weibo
-  :float left
-  :clear left
-  :padding 10px
-  :width 483px
-  :border 1px solid #242424
-  :margin-bottom 10px
-img.avatar
-  :float left
-  :display inline
-span.text
-  :float left
-  :display inline
-  :width 400px
-  :margin-left 10px
-img.thumbnail_pic
-  :clear left
-  :float left
-.retweeted_status
-  :background #cccccc
-  :float left
-  :clear left
-  :padding 10px
-  :border 1px solid #242424