osdb 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 92d5c8afe4f667570f34fc70eb58f92fc18b8992
+  data.tar.gz: e9d13b0eef33b5575c8c3e7cf0e63f856331587e
+SHA512:
+  metadata.gz: 5ab8e63b010b4351cbf20b678456d5ae68a41e240eafc6ee6444d5102b8378b19886374b8ea342a6d9398f8a40401dce341e608dc25e8df8310aa37a06e9a80d
+  data.tar.gz: 4d3db1f8c1e04e7adc99e490f7d8bba4d5df4d889ef76f310649f85f105e8e1fbbc17c3a31a75d7ff417c86bd9044fac63189e858f6eacbf4af2aca29e400432

data/bin/getsub

@@ -86,6 +86,7 @@ class GetSub
   end
 
   def report_exception(exception)
+    puts
     puts "Something crashed."
     puts "Feel free to report the error here: https://github.com/byroot/ruby-osdb/issues"
     puts "With the following debug informations:"
@@ -132,39 +133,24 @@ class GetSub
 
   def server
     @server ||= OSDb::Server.new(
-      :host => 'api.opensubtitles.org',
-      :path => '/xml-rpc', 
       :timeout => 90, 
       :useragent => "SubDownloader 2.0.10" # register useragent ? WTF ? too boring.
     ) 
   end
 
   def download_sub!(sub, movie_file)
-    sub_path = movie_file.sub_path(sub.format)
-    download!(sub.url, sub_path)
-  end
-
-  def curl_available?
-    %x{ curl --version 2> /dev/null > /dev/null }
-    $?.success?
-  end
-
-  def wget_available?
-    %x{ wget --version 2> /dev/null > /dev/null }
-    $?.success?
-  end
+    local_path = movie_file.sub_path(sub.format)
+    print "* download #{sub.url} to #{local_path} ... "
+    content = sub.body
+    unless content
+      puts "failed"
+      return
+    end
 
-  def download!(url, local_path)
-    # TODO: use Net::HTTP and ZLib to avoid shell dependency
-    puts "* download #{url} to #{local_path}"
-    if curl_available?
-      %x{ curl -s '#{url}' | gunzip > "#{local_path}" }
-    elsif wget_available?
-      %x{ wget -O - -q '#{url}' | gunzip > "#{local_path}"}
-    else
-      puts "Can't found any curl or wget please install one of them or manualy download your sub"
-      puts url
+    File.open(movie_file.sub_path(sub.format), 'w+') do |file|
+      file.write(content)
     end
+    puts "done"
   end
 
 end

data/lib/osdb.rb

@@ -2,6 +2,8 @@ require 'xmlrpc/client'
 
 module OSDb
   base_path = File.expand_path(File.dirname(__FILE__) + '/osdb')
+  require "#{base_path}/xmlrpc_monkey_patch"
+
   autoload :Finder,         "#{base_path}/finder"
   autoload :Language,       "#{base_path}/language"
   autoload :Movie,          "#{base_path}/movie"

data/lib/osdb/server.rb

@@ -9,12 +9,21 @@ module OSDb
 
     attr_reader :username, :password, :language, :useragent, :client
 
+    CLIENT_ARGS = [:host, :path, :port, :proxy_host, :proxy_port, :http_user, :http_password, :use_ssl, :timeout]
+
+    DEFAULT_OPTIONS = {
+      :host => 'api.opensubtitles.org',
+      :path => '/xml-rpc',
+      :timeout => 10
+    }.freeze
+
     def initialize(options={})
       @username = options[:username] || ''
       @password = options[:password] || ''
       @language = options[:language] || 'eng'
       @useragent = options[:useragent] || 'ruby-osdb v0.1'
-      @client = ::XMLRPC::Client.new(*options.values_at(:host, :path, :port, :proxy_host, :proxy_port, :http_user, :http_password, :use_ssl, :timeout))
+      options = DEFAULT_OPTIONS.merge(options)
+      @client = ::XMLRPC::Client.new(*options.values_at(*CLIENT_ARGS))
     end
 
     def token

data/lib/osdb/sub.rb

@@ -1,4 +1,7 @@
 require 'uri'
+require 'net/http'
+require 'zlib'
+require 'stringio'
 
 module OSDb
 
@@ -35,6 +38,18 @@ module OSDb
       user_ranks.empty? ? 1 : 2
     end
 
+    def body
+      @body ||= fetch_body
+    end
+
+    def fetch_body
+      StringIO.open do |buffer|
+        buffer.write(Net::HTTP.get(url))
+        buffer.rewind
+        return Zlib::GzipReader.new(buffer).read
+      end
+    end
+
   end
 
 end

data/lib/osdb/version.rb

@@ -1,3 +1,3 @@
 module OSDb
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/osdb/xmlrpc_monkey_patch.rb

@@ -0,0 +1,88 @@
+# OpenSubtitle.org return invalid content-length that mek the stdlib xmlrpc client raise
+# This is a dirty monkey patch to workaround this. :'(
+
+module XMLRPC
+  class Client
+    def do_rpc(request, async=false)
+      header = {
+       "User-Agent"     =>  USER_AGENT,
+       "Content-Type"   => "text/xml; charset=utf-8",
+       "Content-Length" => request.bytesize.to_s,
+       "Connection"     => (async ? "close" : "keep-alive")
+      }
+
+      header["Cookie"] = @cookie        if @cookie
+      header.update(@http_header_extra) if @http_header_extra
+
+      if @auth != nil
+        # add authorization header
+        header["Authorization"] = @auth
+      end
+
+      resp = nil
+      @http_last_response = nil
+
+      if async
+        # use a new HTTP object for each call
+        http = net_http(@host, @port, @proxy_host, @proxy_port)
+        http.use_ssl = @use_ssl if @use_ssl
+        http.read_timeout = @timeout
+        http.open_timeout = @timeout
+
+        # post request
+        http.start {
+          resp = http.request_post(@path, request, header)
+        }
+      else
+        # reuse the HTTP object for each call => connection alive is possible
+        # we must start connection explicitely first time so that http.request
+        # does not assume that we don't want keepalive
+        @http.start if not @http.started?
+
+        # post request
+        resp = @http.request_post(@path, request, header)
+      end
+
+      @http_last_response = resp
+
+      data = resp.body
+
+      if resp.code == "401"
+        # Authorization Required
+        raise "Authorization failed.\nHTTP-Error: #{resp.code} #{resp.message}"
+      elsif resp.code[0,1] != "2"
+        raise "HTTP-Error: #{resp.code} #{resp.message}"
+      end
+
+      # assume text/xml on instances where Content-Type header is not set
+      ct_expected = resp["Content-Type"] || 'text/xml'
+      ct = parse_content_type(ct_expected).first
+      if ct != "text/xml"
+        if ct == "text/html"
+          raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
+        else
+          raise "Wrong content-type (received '#{ct}' but expected 'text/xml')"
+        end
+      end
+
+      expected = resp["Content-Length"] || "<unknown>"
+      if data.nil? or data.bytesize == 0
+        raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
+      elsif expected != "<unknown>" and expected.to_i != data.bytesize and resp["Transfer-Encoding"].nil?
+        # HACK: here is the monkey patched line
+        # raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
+      end
+
+      set_cookies = resp.get_fields("Set-Cookie")
+      if set_cookies and !set_cookies.empty?
+        require 'webrick/cookie'
+        @cookie = set_cookies.collect do |set_cookie|
+          cookie = WEBrick::Cookie.parse_set_cookie(set_cookie)
+          WEBrick::Cookie.new(cookie.name, cookie.value).to_s
+        end.join("; ")
+      end
+
+      return data
+    end
+  end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: osdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,6 +101,7 @@ files:
 - lib/osdb/sub.rb
 - lib/osdb/subtitle_finder.rb
 - lib/osdb/version.rb
+- lib/osdb/xmlrpc_monkey_patch.rb
 - osdb.gemspec
 - spec/fixtures/http/check_movie_hash.yml
 - spec/fixtures/http/get_imdb_movie_details.yml
@@ -127,33 +119,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/byroot/ruby-osdb
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4594447033621309387
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4594447033621309387
 requirements: []
 rubyforge_project: osdb
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby library to access OSDb services like OpenSubtitles.org
 test_files:
 - spec/fixtures/http/check_movie_hash.yml