douban-rails2.3 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.6

data/douban-rails2.3.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{douban-rails2.3}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuanyi Zhang chengdh"]
@@ -25,13 +25,15 @@ Gem::Specification.new do |s|
      "douban-rails2.3-0.6.1.gem",
      "douban-rails2.3-0.6.2.gem",
      "douban-rails2.3-0.6.3.gem",
+     "douban-rails2.3-0.6.4.gem",
      "douban-rails2.3.gemspec",
      "generators/douban/douban_generator.rb",
      "generators/douban/templates/douban.yml",
      "generators/douban/templates/douban_controller.rb",
      "generators/douban/templates/douban_helper.rb",
-     "generators/douban/templates/douban_init.rb",
-     "lib/douban.rb"
+     "lib/douban.rb",
+     "lib/models/book.rb",
+     "lib/parser.rb"
   ]
   s.homepage = %q{http://github.com/yzhang/douban}
   s.rdoc_options = ["--charset=UTF-8"]

data/generators/douban/douban_generator.rb

@@ -4,7 +4,6 @@ class DoubanGenerator < Rails::Generator::Base
       m.file 'douban_controller.rb', 'app/controllers/douban_controller.rb'
       m.file "douban_helper.rb", 'app/helpers/douban_helper.rb'
       m.file "douban.yml", 'config/douban.yml'
-      m.file "douban_init.rb", 'config/initializers/douban_init.rb'
       m.route :name => :douban_login,:controller => :douban,:action => :new
       m.route :name => :douban_callback,:controller => :douban,:action => :callback
       m.route :name => :douban_logout,:controller => :douban,:action => :destroy

data/generators/douban/templates/douban_controller.rb

@@ -1,6 +1,6 @@
 class DoubanController < ApplicationController
   def new
-    douban = Douban.new
+    douban = Douban::Douban.new
     douban.callback = douban_callback_url
     authorize_url = douban.authorize_url
     
@@ -13,7 +13,7 @@ class DoubanController < ApplicationController
   
   def callback
     if session[:douban]
-      douban = Douban.load(session[:douban])
+      douban = Douban::Douban.load(session[:douban])
       douban.authorize
       session[:douban] = douban.dump
     end
@@ -28,4 +28,4 @@ class DoubanController < ApplicationController
     douban.destroy
     redirect_to '/'
   end
-end
+end

data/lib/douban.rb

@@ -1,20 +1,22 @@
 require 'oauth'
+require 'parser'
+require 'models/book'
+module  Douban
+  class Douban
+    attr_accessor :callback, :request_token, :access_token
 
-class Douban
-  attr_accessor :callback, :request_token, :access_token
-  
-  class << self
-    def load(data)
-      access_token        = data[:access_token]
-      access_token_secret = data[:access_token_secret]
-    
-      douban               = Douban.new(data[:request_token], data[:request_token_secret])
-      douban.access_token  = OAuth::AccessToken.new(api_consumer, access_token, access_token_secret) if access_token
-      douban
-    end
+    class << self
+      def load(data)
+        access_token        = data[:access_token]
+        access_token_secret = data[:access_token_secret]
+
+        douban               = Douban.new(data[:request_token], data[:request_token_secret])
+        douban.access_token  = OAuth::AccessToken.new(api_consumer, access_token, access_token_secret) if access_token
+        douban
+      end
 
-    def auth_consumer
-      @@auth_consumer ||= OAuth::Consumer.new(key, secret, {
+      def auth_consumer
+        @@auth_consumer ||= OAuth::Consumer.new(key, secret, {
           :signature_method   => "HMAC-SHA1",
           :site               => "http://www.douban.com",
           :scheme             => :header,
@@ -22,109 +24,110 @@ class Douban
           :access_token_path  => '/service/auth/access_token',
           :authorize_path     => '/service/auth/authorize',
           :realm              => url
-         })
-    end
-  
-    def api_consumer
-      @@api_consumer ||= OAuth::Consumer.new(key, secret,
-        {
+        })
+      end
+
+      def api_consumer
+        @@api_consumer ||= OAuth::Consumer.new(key, secret,
+                                               {
           :site             => "http://api.douban.com",
           :scheme           => :header,
           :signature_method => "HMAC-SHA1",
           :realm            => url
         })
+      end
+
+      def key; config['key'];  end
+      def secret; config['secret']; end
+      def url; config['url']; end
+
+      def config
+        @@config ||= lambda do
+          require 'yaml'
+          filename = "#{Rails.root}/config/douban.yml"
+          file     = File.open(filename)
+          yaml     = YAML.load(file)
+          return yaml[Rails.env]
+        end.call
+      end
     end
-    
-    def key; config['key'];  end
-    def secret; config['secret']; end
-    def url; config['url']; end
-    
-    def config
-      @@config ||= lambda do
-        require 'yaml'
-        filename = "#{Rails.root}/config/douban.yml"
-        file     = File.open(filename)
-        yaml     = YAML.load(file)
-        return yaml[Rails.env]
-      end.call
+
+    def initialize(request_token = nil, request_token_secret = nil)
+      if request_token && request_token_secret
+        self.request_token = OAuth::RequestToken.new(self.class.auth_consumer, request_token, request_token_secret)
+      else
+        self.request_token = self.class.auth_consumer.get_request_token()
+      end
     end
-  end
-  
-  def initialize(request_token = nil, request_token_secret = nil)
-    if request_token && request_token_secret
-      self.request_token = OAuth::RequestToken.new(self.class.auth_consumer, request_token, request_token_secret)
-    else
-      self.request_token = self.class.auth_consumer.get_request_token()
+
+    def authorize_url
+      @authorize_url ||= request_token.authorize_url(:oauth_callback => self.callback)
     end
-  end
-  
-  def authorize_url
-    @authorize_url ||= request_token.authorize_url(:oauth_callback => self.callback)
-  end
-  
-  def authorize
-    return unless self.access_token.nil?
-    
-    access_token = self.request_token.get_access_token
-    self.access_token ||= OAuth::AccessToken.new(self.class.api_consumer, access_token.token, access_token.secret)
-  end
-  
-  def authorized?
-    return false if access_token.nil?
-    response = self.get("/access_token/#{access_token.token}")
-    response.code == '200'
-  end
-  
-  def destroy
-    destroy_access_key if !access_token.nil?
-    request_token = access_token = nil
-  end
 
-  def dump
-    {
-      :request_token        => request_token.token, 
-      :request_token_secret => request_token.secret,
-      :access_token         => access_token.nil? ? nil : access_token.token,
-      :access_token_secret  => access_token.nil? ? nil : access_token.secret
-    }
-  end
-  
-  def request(http_method, path, headers = {})
-    access_token.request(http_method, path, headers)
-  end
-    
-  def get(path, headers = {})
-    request(:get, path, headers)
-  end
-  
-  def post(path, headers = {})
-    request(:post, path, headers)
-  end
-    
-  def delete(path, headers = {})
-    request(:delete, path, headers)
-  end
-  
-  def put(path, headers = {})
-    request(:put, path, headers)
-  end
-  #使用isbn获取单本书籍信息
-  def get_book(isbn)
-    url = ENV['DOUBAN_BOOK_URL'] + isbn
-    rsp = Net::HTTP.get_response(URI.parse(url))
-    rsp.body
-  end
-  #使用模糊查询获取多本书籍
-  def get_books(params = {})
-    q_str = params.to_query
-    url = ENV['DOUBAN_BOOKS_URL'] + q_str
-    rsp = Net::HTTP.get_response(URI.parse(url))
-    rsp.body
-  end
-  
-  protected
-  def destroy_access_key
-    response = delete("/access_token/#{access_token.token}")
-    response.code == '200'
+    def authorize
+      return unless self.access_token.nil?
+
+      access_token = self.request_token.get_access_token
+      self.access_token ||= OAuth::AccessToken.new(self.class.api_consumer, access_token.token, access_token.secret)
+    end
+
+    def authorized?
+      return false if access_token.nil?
+      response = self.get("/access_token/#{access_token.token}")
+      response.code == '200'
+    end
+
+    def destroy
+      destroy_access_key if !access_token.nil?
+      request_token = access_token = nil
+    end
+
+    def dump
+      {
+        :request_token        => request_token.token, 
+        :request_token_secret => request_token.secret,
+        :access_token         => access_token.nil? ? nil : access_token.token,
+        :access_token_secret  => access_token.nil? ? nil : access_token.secret
+      }
+    end
+
+    def request(http_method, path, headers = {})
+      access_token.request(http_method, path, headers)
+    end
+
+    def get(path, headers = {})
+      request(:get, path, headers)
+    end
+
+    def post(path, headers = {})
+      request(:post, path, headers)
+    end
+
+    def delete(path, headers = {})
+      request(:delete, path, headers)
+    end
+
+    def put(path, headers = {})
+      request(:put, path, headers)
+    end
+    #使用isbn获取单本书籍信息
+    def get_book(isbn)
+      url = ENV['DOUBAN_BOOK_URL'] + isbn + "?apikey=#{ENV['DOUBAN_APP_KEY']}"
+      rsp = Net::HTTP.get_response(URI.parse(url))
+      Parser.parse_book(rsp.body)
+    end
+    #使用模糊查询获取单本书籍
+    def get_books(params = {})
+      params['apikey'] = ENV['DOUBAN_APP_KEY']
+      q_str = params.to_query
+      url = ENV['DOUBAN_BOOKS_URL'] + q_str
+      rsp = Net::HTTP.get_response(URI.parse(url))
+      Parser.parse_books(rsp.body)
+    end
+    protected
+    def destroy_access_key
+      response = delete("/access_token/#{access_token.token}")
+      response.code == '200'
+    end
   end
 end

data/lib/models/book.rb

@@ -0,0 +1,13 @@
+module Douban
+  class Book
+    def self.attr_names
+      [
+        :title,:image,:author,:isbn10,:isbn13,:pubdate,
+        :pages,:translator,:price,:publisher,:binding,:author_intro,:content
+      ]
+    end
+    for a in attr_names
+      attr_accessor a
+    end
+  end
+end

data/lib/parser.rb

@@ -0,0 +1,44 @@
+require 'nokogiri'
+module Douban
+  class Parser
+    #解析单本书籍信息
+    def self.parse_book(book_xml)
+      xml_doc = Nokogiri::XML(book_xml)
+      book_node = xml_doc.css('entry').first
+      parse_single_book(book_node)
+    end
+    #解析多本书籍信息
+    def self.parse_books(book_xml)
+      xml_doc = Nokogiri::XML(book_xml)
+      books = Array.new
+      books_node = xml_doc.css('entry')
+      books_node.each do |book_node|
+        books.push parse_single_book(book_node)
+      end
+      books
+    end
+
+    private
+    def self.parse_single_book(book_node)
+      book = Book.new
+      els = book_node.css("db|attribute")
+      #给book赋值
+      els.each do |el|
+        if el['name'] == 'author-intro'
+          book.author_intro = el.content
+        else
+          book.send("#{el['name']}=",el.content)
+        end
+      end
+      title = book_node.css('title').first.content
+      content_nodes = book_node.css('content')
+      content = content_nodes.first.content if !content_nodes.blank?
+      imgs = book_node.css('link[rel=image]')
+      img = imgs.first['href'] if !imgs.blank?
+      book.title = title
+      book.content = content
+      book.image = img
+      book
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: douban-rails2.3
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Yuanyi Zhang chengdh
@@ -50,13 +50,15 @@ files:
 - douban-rails2.3-0.6.1.gem
 - douban-rails2.3-0.6.2.gem
 - douban-rails2.3-0.6.3.gem
+- douban-rails2.3-0.6.4.gem
 - douban-rails2.3.gemspec
 - generators/douban/douban_generator.rb
 - generators/douban/templates/douban.yml
 - generators/douban/templates/douban_controller.rb
 - generators/douban/templates/douban_helper.rb
-- generators/douban/templates/douban_init.rb
 - lib/douban.rb
+- lib/models/book.rb
+- lib/parser.rb
 has_rdoc: true
 homepage: http://github.com/yzhang/douban
 licenses: []

data/generators/douban/templates/douban_init.rb

@@ -1,7 +0,0 @@
-# Include hook code here
-douban_configs = YAML.load_file(File.join(RAILS_ROOT, 'config/douban.yml'))
-
-ENV['DOUBAN_APP_KEY'] = douban_configs[RAILS_ENV]['key'].to_s
-ENV['DOUBAN_APP_SECRET'] = douban_configs[RAILS_ENV]['secret']
-ENV['DOUBAN_BOOK_URL'] = douban_configs[RAILS_ENV]['book_url']
-ENV['DOUBAN_BOOKS_URL'] = douban_configs[RAILS_ENV]['books_url']