osdb 0.0.6 → 0.0.7

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,28 +1,9 @@
 require 'rubygems'
 require 'rake'
+require 'rspec/core/rake_task'
+require 'bundler'
 
-# TODO: update rspec to 2.X
-# require 'spec/rake/spectask'
-# 
-# Spec::Rake::SpecTask.new(:spec) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.spec_files = FileList['spec/**/*_spec.rb']
-# end
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
 
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "osdb"
-    gem.summary = %Q{Ruby library to access OSDb services like OpenSubtitles.org}
-    gem.email = "jean.boussier @nospam@ gmail.com"
-    gem.homepage = "http://github.com/byroot/ruby-osdb"
-    gem.authors = ["Jean Boussier"]
-    gem.add_development_dependency "rspec", "~> 1.3"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install   jeweler"
-end
-
-task :default => :spec
+task :default => :spec

data/bin/getsub

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+# TODO: getsub is becomming a bit to complexe, rewrite it OO or move it in another gem
 require 'optparse'
 require 'uri'
 require 'rubygems'
@@ -60,25 +60,54 @@ def group_by_movie_name(subs)
 end
 
 def ask_user_to_identify_movie(movies)
-  puts "D'oh! You stumbled upon a hash conflict, please resolve it:"
-  puts
   movies.keys.each_with_index do |name, index|
     puts " #{index} - #{name}"
   end
-  puts
   print 'id: '
-  str = STDIN.gets
+  str = STDIN.gets # TODO: rule #1, never trust user input
+  puts
   movies[movies.keys[str.to_i]]
 end
 
+def identify_by_imdb!(server, movie)
+  puts "* could not find sub by hash, trying IMDB"
+  imdb_results = server.search_imdb(:query => movie.name)
+  if imdb_results.any?
+    if imdb_results.length == 1
+      imdb_result = imdb_results.first
+      puts "* found on IMDB with ID: #{imdb_result.imdbid}"
+    else
+      movies = Hash[imdb_results.map{ |r| [r.title, r] }]
+      imdb_result = ask_user_to_identify_movie(movies)
+    end
+    subs = server.search_subtitles(:sublanguageid => @options[:language], :imdbid => imdb_result.imdbid)
+    if subs.any?
+      select_and_download!(subs, movie)
+    else
+      puts "* no sub found for this movie"
+    end
+  else
+    puts "* no movie found on IMDB"
+  end
+end
+
 def select_sub(subs)
-  return subs.first if subs.length == 1
+  return subs.first if subs.length >= 1
   movies = group_by_movie_name(subs)
   return movies.values.first.max if movies.length == 1
+
+  puts "D'oh! You stumbled upon a hash conflict, please resolve it:"
+  puts
   selected_movie_subs = ask_user_to_identify_movie(movies)
   selected_movie_subs.max
 end
 
+def select_and_download!(subs, movie)
+  sub = select_sub(subs)
+  sub_path = movie.sub_path(sub.format)
+  download!(sub.url, sub_path)
+end
+
 def arg_files
   return ARGV unless @options[:dir]
   Dir.glob(File.join(@options[:dir], '**', "*.{#{OSDb::Movie::EXTENSIONS.join(',')}}"))
@@ -106,11 +135,9 @@ movies.each do |movie|
     puts "* search subs for: #{movie.path}"
     subs = server.search_subtitles(:moviehash => movie.hash, :moviebytesize => movie.size, :sublanguageid => @options[:language])
     if subs.any?
-      sub = select_sub(subs)
-      sub_path = movie.sub_path(sub.format)
-      download!(sub.url, sub_path)
+      select_and_download!(subs, movie)
     else
-      puts "* no sub found"
+      identify_by_imdb!(server, movie)
     end
     puts
   rescue Exception => e

data/lib/osdb/movie.rb

@@ -26,6 +26,10 @@ module OSDb
     def size
       @size ||= File.size(path)
     end
+
+    def name
+      @name ||= File.basename(path, File.extname(path))
+    end
     
     CHUNK_SIZE = 64 * 1024 # in bytes
     
@@ -54,4 +58,4 @@ module OSDb
     end
     
   end
-end
+end

data/lib/osdb/server.rb

@@ -1,12 +1,14 @@
+require 'ostruct'
+
 module OSDb
-  
+
   class LoginFailed < ::Exception
   end
-  
+
   class Server
-    
+
     attr_reader :username, :password, :language, :useragent, :client
-    
+
     def initialize(options={})
       @username = options[:username] || ''
       @password = options[:password] || ''
@@ -14,11 +16,11 @@ module OSDb
       @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))
     end
-    
+
     def token
       @token ||= login
     end
-    
+
     def login
       response = client.call('LogIn', username, password, language, useragent)
       if response['status'] != '200 OK'
@@ -26,24 +28,30 @@ module OSDb
       end
       response['token']
     end
-    
+
     def logout
       client.call('LogOut', token)
       @token = nil
     end
-    
+
     def check_movie_hash(*hashes)
       client.call('CheckMovieHash', token, hashes)
     end
-    
+
     def search_subtitles(*queries)
       subs = client.call('SearchSubtitles', token, queries)['data']
       subs ? subs.map{ |s| Sub.new(s) } : []
     end
-    
+
+    def search_imdb(options={})
+      query = options.delete(:query)
+      imdb = client.call('SearchMoviesOnIMDB', token, query)['data']
+      imdb ? imdb.map{ |i| OpenStruct.new(:imdbid => i['id'], :title => i['title']) } : []
+    end
+
     def info
       client.call('ServerInfo')
     end
-    
+
   end
-end
+end

data/lib/osdb/version.rb

@@ -0,0 +1,3 @@
+module OSDb
+  VERSION = '0.0.7'
+end

data/osdb.gemspec

@@ -1,54 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "osdb/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{osdb}
-  s.version = "0.0.6"
+  s.name        = "osdb"
+  s.version     = OSDb::VERSION
+  s.authors     = ["Jean Boussier"]
+  s.email       = ["jean.boussier @nospam@ gmail.com"]
+  s.homepage    = %q{http://github.com/byroot/ruby-osdb}
+  s.summary     = %q{Ruby library to access OSDb services like OpenSubtitles.org}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Jean Boussier}]
-  s.date = %q{2011-10-11}
-  s.email = %q{jean.boussier @nospam@ gmail.com}
-  s.executables = [%q{getsub}]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "Manifest",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/getsub",
-    "lib/osdb.rb",
-    "lib/osdb/language.rb",
-    "lib/osdb/movie.rb",
-    "lib/osdb/server.rb",
-    "lib/osdb/sub.rb",
-    "osdb.gemspec",
-    "spec/fixtures/somemovie.avi",
-    "spec/osdb/language_spec.rb",
-    "spec/osdb/movie_spec.rb",
-    "spec/osdb/server_spec.rb",
-    "spec/osdb/sub_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/byroot/ruby-osdb}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Ruby library to access OSDb services like OpenSubtitles.org}
+  s.rubyforge_project = "osdb"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
-  end
+  s.add_development_dependency 'rspec'
 end
-

data/spec/osdb/movie_spec.rb

@@ -7,5 +7,6 @@ describe OSDb::Movie do
   end
   
   its(:hash) { should == '243339b48f4e8741' }
+  its(:name) { should == 'somemovie' }
   
-end
+end

data/spec/osdb/server_spec.rb

@@ -1,44 +1,51 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe OSDb::Server do
-  
+
   before :all do
     @server = OSDb::Server.new(
-      :host => 'api.opensubtitles.org', 
+      :host => 'api.opensubtitles.org',
       :path => '/xml-rpc',
       :timeout => 60, # OS.org is very very slow ....
       :useragent => 'OS Test User Agent'
     )
   end
-  
+
   subject { @server }
-  
-  it 'should respond to #info' do
-    hash_including(
-      "seconds" => instance_of(Float),
-      "last_update_strings" => instance_of(Hash),
+
+  let(:expected_info) do
+    {
       "website_url"=>"http://www.opensubtitles.org",
       "contact"=>"admin@opensubtitles.org",
       "application"=>"OpenSuber v0.2",
       "xmlrpc_version"=>"0.1",
-      "xmlrpc_url"=>"http://api.opensubtitles.net/xml-rpc"
-    ).should == subject.info
+      "xmlrpc_url"=>"http://api.opensubtitles.org/xml-rpc"
+    }
   end
-  
+
+  it 'should respond to #info' do
+    info = subject.info
+    expected_info.each do |key, value|
+      info[key].should == value
+    end
+    info['seconds'].should be_a(Float)
+    info['last_update_strings'].should be_a(Hash)
+  end
+
   it 'should automatically call #login when token is needed' do
     subject.instance_variable_get('@token').should be_nil
     subject.token.should match(/[a-z0-9]{26}/)
     subject.instance_variable_get('@token').should == subject.token
   end
-  
+
   it 'should clear @login after #logout' do
     expect{
       subject.logout
     }.to change{ subject.instance_variable_get('@token') }.from(instance_of(String)).to(nil)
   end
-  
+
   describe "#check_movie_hash" do
-    
+
     it 'should identify movie' do
       subject.check_movie_hash('37d0c7d0cfcbe280')['data'].should == {
         "37d0c7d0cfcbe280" => {
@@ -49,11 +56,11 @@ describe OSDb::Server do
         }
       }
     end
-    
+
   end
-  
+
   describe '#search_subtitles' do
-    
+
     it 'can search by hash and size' do
       subs = subject.search_subtitles(:moviehash => 'bd71526264fd8bd9', :moviebytesize => '183406990', :sublanguageid => 'fre')
       subs.should be_a(Array)
@@ -63,7 +70,7 @@ describe OSDb::Server do
         sub.raw_data['MovieName'].should == 'How I Met Your Mother'
       end
     end
-    
+
     it 'can search by imdbid' do
       subs = subject.search_subtitles(:imdbid => "0117500", :sublanguageid => 'fre')
       subs.should be_a(Array)
@@ -73,7 +80,18 @@ describe OSDb::Server do
         sub.raw_data['MovieName'].should == 'The Rock'
       end
     end
-    
+
   end
-  
-end
+
+  describe "#search_imdb" do
+    it "can search imdb by title" do
+      imdb = subject.search_imdb(:query => "How I Met Your Mother")
+      imdb.length.should == 1
+      imdb.each do |movie|
+        movie.imdbid.should == '0460649'
+        movie.title.should == 'How I Met Your Mother'
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../lib/osdb'
-require 'spec/autorun'
+require 'rspec'
 
-# Spec Helpers
-Dir[File.dirname(__FILE__) + '/*_spec_helper.rb'].each do |f|
-  require File.expand_path(f)
-end
+RSpec.configure do |c|
+  c.mock_with :rspec
+end

metadata

@@ -1,36 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: osdb
-version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-17 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70177107254940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: *70177107254940
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: 
-email: jean.boussier @nospam@ gmail.com
-executables:
+email: 
+- jean.boussier @nospam@ gmail.com
+executables: 
 - getsub
 extensions: []
-extra_rdoc_files:
-- README.md
-files:
-- Manifest
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
+- .rspec
+- Gemfile
 - README.md
 - Rakefile
 - VERSION
@@ -40,6 +51,7 @@ files:
 - lib/osdb/movie.rb
 - lib/osdb/server.rb
 - lib/osdb/sub.rb
+- lib/osdb/version.rb
 - osdb.gemspec
 - spec/fixtures/somemovie.avi
 - spec/osdb/language_spec.rb
@@ -47,28 +59,40 @@ files:
 - spec/osdb/server_spec.rb
 - spec/osdb/sub_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/byroot/ruby-osdb
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.6
+
+rubyforge_project: osdb
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby library to access OSDb services like OpenSubtitles.org
-test_files: []
+test_files: 
+- spec/fixtures/somemovie.avi
+- spec/osdb/language_spec.rb
+- spec/osdb/movie_spec.rb
+- spec/osdb/server_spec.rb
+- spec/osdb/sub_spec.rb
+- spec/spec_helper.rb

data/Manifest

@@ -1,16 +0,0 @@
-Manifest
-README.md
-Rakefile
-bin/getsub
-lib/osdb.rb
-lib/osdb/language.rb
-lib/osdb/movie.rb
-lib/osdb/server.rb
-lib/osdb/sub.rb
-osdb.gemspec
-spec/fixtures/somemovie.avi
-spec/osdb/language_spec.rb
-spec/osdb/movie_spec.rb
-spec/osdb/server_spec.rb
-spec/osdb/sub_spec.rb
-spec/spec_helper.rb