douban-ruby 0.0.7 → 0.0.8

data/.gitignore

@@ -10,3 +10,4 @@ coverage
 html
 .bundle
 *.gem
+.loadpath

data/Gemfile

@@ -1,8 +1,3 @@
 source :gemcutter
 
-gem 'oauth'
-group :development, :test do
-  gem 'rspec', '~> 1.3.0'
-  gem 'rcov'
-  gem 'rake'
-end
+gemspec

data/Gemfile.lock

@@ -1,16 +1,32 @@
+PATH
+  remote: .
+  specs:
+    douban-ruby (0.0.8)
+      oauth
+
 GEM
   remote: http://rubygems.org/
   specs:
-    oauth (0.4.3)
+    diff-lcs (1.1.2)
+    oauth (0.4.4)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (1.3.0)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (>= 1.0.0)
+  douban-ruby!
   oauth
   rake
   rcov
-  rspec (~> 1.3.0)
+  rspec (~> 2.0)

data/{History.txt → History.rdoc}

@@ -1,3 +1,8 @@
+=== 0.0.8 / 2011-01-02
+* switch to rspec 2
+* Douban::Authorize
+  * access_token, request_token support :as_token argument.
+
 === 0.0.7 / 2010-09-23
 * Douban::Authorize
   * get_miniblog_comments support start_index and max_results option.

data/README.rdoc

@@ -0,0 +1,72 @@
+= Douban Ruby Client
+
+http://github.com/lidaobing/douban-ruby
+
+== Description
+
+douban ruby client. including OAuth support. 
+
+* RDoc: http://rubydoc.info/github/lidaobing/douban-ruby/master/frames
+* Douban API reference: http://www.douban.com/service/apidoc/reference/
+
+== Installation
+
+ gem install douban-ruby
+
+== Usage
+
+=== Basic Process
+
+ require 'douban'
+ 
+ douban = Douban::Authorize.new(apikey, secret)
+ puts "please open #{douban.get_authorize_url}"
+ puts "after login, press Enter to continue"
+
+ gets
+ puts douban.get_people
+
+=== Async Process (or Server Process)
+
+    class DoubanController < ApplicationController
+      DOUBAN_APIKEY = '0fb6d0a851af01a12f2471f8f50d04e3'
+      DOUBAN_SECRET = 'c59e3be2ccdde999'
+    
+      def index
+        unless params[:oauth_token]
+          unless session[:access_token]
+            # step 1, initial state, store request_token to session
+            callback_url = url_for :action => :index
+            redirect_url = douban.get_authorize_url(callback_url)
+            session[:request_token] = douban.request_token :as_token
+            redirect_to redirect_url
+          else
+            # step 3, have access_token, now you can use douban API
+            douban.access_token = session[:access_token]
+            render :text => douban.get_people.inspect
+          end
+        else
+          if session[:request_token]
+            # step 2, return from douban, store access_token to session
+            douban.request_token = session[:request_token]
+            douban.auth
+            reset_session
+            session[:access_token] = douban.access_token :as_token
+            redirect_to :action => :index
+          else
+            # error branch, you return from douban, but no request_token in session
+            logger.info "return from oauth but no request_token"
+            redirect_to :action => :index
+          end
+        end
+      end
+    
+      private
+      def douban
+        @douban ||= Douban::Authorize.new DOUBAN_APIKEY, DOUBAN_SECRET
+      end
+    end
+
+== LICENSE:
+
+licensed under Artistic License or GPL license.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
-require 'bundler/setup'
-require 'spec/rake/spectask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 require File.expand_path("../lib/douban/version", __FILE__)
 
@@ -8,29 +9,16 @@ ENV["SPEC_OPTS"] ||= "-f nested --color -b"
 ENV["RDOC_OPTS"] ||= "-c UTF-8"
 
 
-Spec::Rake::SpecTask.new :spec
+RSpec::Core::RakeTask.new :spec
 task :default => :spec
 
-namespace :spec do
-  desc "Run specs with RCov"
-  Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb' ]
-    t.rcov = true
-    t.rcov_opts = ['--exclude' , 'gems,spec' ]
-  end
+RSpec::Core::RakeTask.new :rcov do |t|
+  t.rcov = true
+  t.rcov_opts = ['--exclude' , 'gems,spec' ]
 end
 
 Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc", "History.rdoc", "lib/**/*.rb")
   rd.options << "--charset" << "UTF-8"
 end
-
-desc 'build gem file'
-task :build do
-  system "gem build douban-ruby.gemspec"
-end
- 
-desc 'upload gem file'
-task :release => :build do
-  system "gem push douban-ruby-#{Douban::VERSION}"
-end
-

data/douban-ruby.gemspec

@@ -10,13 +10,16 @@ Gem::Specification.new do |s|
   s.homepage    = "http://rubygems.org/gems/douban-ruby"
   s.summary     = "douban ruby client. including OAuth support."
   s.description = "Douban API reference: http://www.douban.com/service/apidoc/reference/"
+  s.rdoc_options << '--main' << 'README.rdoc' <<
+                    '--charset' << 'UTF-8'
+  s.extra_rdoc_files = ['README.rdoc', 'History.rdoc']
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "douban-ruby"
 
   s.add_dependency "oauth"
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency 'rspec', '~> 1.3.0'
+  s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rcov'
 

data/lib/douban.rb

@@ -3,6 +3,8 @@
 # Copyright (c) 2008 Hooopo
 # Written and maintained by Hooopo<hoooopo@gmail.com>
 #
+# Copyright (C) 2010-2011 LI Daobing <lidaobing@gmail.com>
+#
 #
 # This program is free software. You can re-distribute and/or
 # modify this program under the same terms of ruby itself ---
@@ -49,5 +51,8 @@
 #==Install and Wiki
 #  http://code.google.com/p/doubanclient-ruby/
 
-require 'douban/authorize'
+
+module Douban
+  autoload :Authorize, 'douban/authorize'
+end
 require 'douban/version'

data/lib/douban/authorize.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'oauth'
 require 'oauth'
 require 'oauth/consumer'
 require 'rexml/document'
@@ -25,8 +23,6 @@ module Douban
     attr_reader :api_secret
     attr_reader :authorize_url
     attr_reader :consumer
-    attr_reader :request_token
-    attr_reader :access_token
 
     @@debug = false
     
@@ -1122,6 +1118,23 @@ module Douban
       @request_token = token
     end
 
+
+    # :call-seq:
+    #   request_token => OAuth::RequestToken
+    #   request_token :as_token => OAuth::Token
+    #
+    # if you want to serialize request_token, use :as_token will be much shorter
+    def request_token(arg=nil)
+      if arg.nil?
+        @request_token
+      elsif arg == :as_token
+        @request_token.nil? ? nil :
+          OAuth::Token.new(@request_token.token, @request_token.secret)
+      else
+        raise ArgumentError
+      end
+    end
+
     def access_token=(token)
       unless token.kind_of? OAuth::AccessToken
         token = OAuth::AccessToken.new(
@@ -1132,6 +1145,22 @@ module Douban
       @access_token = token
     end
 
+    # :call-seq:
+    #   access_token => OAuth::AccessToken
+    #   access_token :as_token => OAuth::Token
+    #
+    # if you want to serialize access_token, use :as_token will be much shorter
+    def access_token(arg=nil)
+      if arg.nil?
+        @access_token
+      elsif arg == :as_token
+        @access_token.nil? ? nil :
+          OAuth::Token.new(@access_token.token, @access_token.secret)
+      else
+        raise ArgumentError
+      end
+    end
+
     def get_recommendation(id)
       resp=get("/recommendation/#{u(id.to_s)}")
       if resp.code=="200"

data/lib/douban/version.rb

@@ -1,3 +1,3 @@
 module Douban
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/douban/author_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/author'
 

data/spec/douban/authorize_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/authorize'
 

data/spec/douban/collection_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/collection'
 

data/spec/douban/event_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/event'
 

data/spec/douban/mail_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/mail'
 

data/spec/douban/miniblog_comment_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/miniblog_comment'
 

data/spec/douban/miniblog_comments_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/miniblog_comments'
 

data/spec/douban/miniblog_spec.rb

@@ -1,11 +1,12 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/miniblog'
 
 module Douban
   describe Miniblog do
     before do
-      @s = <<eos
+      @s = %q{
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns="http://www.w3.org/2005/Atom" xmlns:db="http://www.douban.com/xmlns/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:opensearch="http://a9.com/-/spec/opensearchrss/1.0/">
   <id>http://api.douban.com/miniblog/374100199</id>
@@ -20,8 +21,7 @@ module Douban
   <published>2010-06-30T19:27:41+08:00</published>
   <content type="html">&amp;lt;b&amp;gt;单元测试0.921892231299059</content>
   <db:attribute name="comments_count">0</db:attribute>
-</entry>
-eos
+</entry>}
     end
 
     it "should correct deserialize from string" do

data/spec/douban/note_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/note'
 

data/spec/douban/page_info_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+require 'spec_helper'
 
 require 'douban/page_info'
 

data/spec/douban/people_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+require 'spec_helper'
 
 require 'douban/people'
 

data/spec/douban/recommendation_comment_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/recommendation_comment'
 

data/spec/douban/recommendation_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/recommendation'
 

data/spec/douban/review_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/review'
 

data/spec/douban/subject_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../spec_helper')
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/subject'
 

data/spec/douban/tag_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
+# -*- encoding: UTF-8 -*-
+require "spec_helper"
 
 require 'douban/tag'
 

data/spec/douban_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '/spec_helper')
+require 'spec_helper'
 
 require 'douban'
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-$: << File.join(File.dirname(__FILE__), '/../lib')
+require 'rspec'
 
-require 'bundler/setup'
-require 'spec'
+RSpec.configure do |c|
+  # ....
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: douban-ruby
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - LI Daobing
@@ -16,10 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +08:00
+date: 2011-01-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,10 +32,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: oauth
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,26 +48,25 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  name: bundler
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        version: "2.0"
   type: :development
-  name: rspec
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,10 +77,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rake
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,8 +91,6 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rcov
-  prerelease: false
   version_requirements: *id005
 description: "Douban API reference: http://www.douban.com/service/apidoc/reference/"
 email: 
@@ -101,15 +100,16 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
+- History.rdoc
 files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - douban-ruby.gemspec
 - examples/example.rb
@@ -155,8 +155,11 @@ homepage: http://rubygems.org/gems/douban-ruby
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.rdoc
+- --charset
+- UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/README.txt

@@ -1,25 +0,0 @@
-= Douban Ruby Client
-
-http://github.com/lidaobing/douban-ruby
-
-== Description
-
-douban ruby client. including OAuth support. 
-
-Douban API reference: http://www.douban.com/service/apidoc/reference/
-
-== Requirments
-
-* oauth: sudo gem install oauth
-
-== INSTALL:
-
-  gem install douban-ruby
-
-== Usage:
-
-http://github.com/lidaobing/douban-ruby/blob/master/examples/example.rb
-
-== LICENSE:
-
-licensed under Artistic License or GPL license.