osdb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204d2207f396150f87977719e16485bd0e830b7f
-  data.tar.gz: 84f0235da1e9a1eb2238732040928ecdb4f3a977
+  metadata.gz: ccd833aca59822350715a77fff9a80563abe06f8
+  data.tar.gz: b2c7ec119cd561acdc0c91753b3a4b5e0457d960
 SHA512:
-  metadata.gz: 84e02bad15fa10fb8fe2aefc81caf37382e6895ca2b86a8b3b9b1bdcc7b64c215fd59e8339e04100efd20917cd9f16fcae3a4e43cb4db628661105dc0f341484
-  data.tar.gz: 279a878698b6a7e9497f6af691c8b3c302d84818f8bbd4c9171b12827a9d8147fe9a00fdbea15bac3a2c7709fc21d07ae774688c71630da20c06cd718497b193
+  metadata.gz: b66f1b6b070f894f3e4242c839aa7a4ef36e2f69cc32edd836901604aca26609ce8ed7d2e5f7a84c3613fee48aabfca415e415d0787543bdc820399b09800f4e
+  data.tar.gz: 75c1533ee90c02349c4f7b8649faae937e59d589074fa8829616bc190da42ac72333ce8764f6a761367ddf3c3d78339ff86c9f6f60752eaf5126599d9629e8bc

data/.travis.yml

@@ -1,9 +1,7 @@
+sudo: false
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - 2.2
   - rbx
   - jruby
-  - ree
-

data/Gemfile

@@ -1,3 +1,9 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec
+
+
+gem 'rake'
+gem 'rspec', '< 2.99'
+gem 'webmock', '~> 1.8.11'
+gem 'vcr', '~> 2.3.0'

data/lib/osdb/search/imdb.rb

@@ -10,6 +10,9 @@ module OSDb
 
       def search_subs_for(movie, language)
         imdb_results = @server.search_imdb(:query => movie.name)
+        return if imdb_results.size == 0
+        return if imdb_results.class != Hash
+        return if imdb_results[:imdbid] == nil
         if imdb_result = @selector.chose(imdb_results)
           @server.search_subtitles(
             :sublanguageid => language,

data/lib/osdb/selector/movie.rb

@@ -9,16 +9,14 @@ module OSDb
 
       def select(subs, movie)
         subs_by_movie = group_by_movie_name(subs)
-
         return subs if subs_by_movie.length <= 1
-
         movie_names = subs_by_movie.keys
         movie_name = @movie_finder.chose(movie_names)
         subs_by_movie[movie_name] || []
       end
 
       def group_by_movie_name(subs)
-        subs.inject({}) do |hash, sub| 
+        subs.inject({}) do |hash, sub|
           hash[sub.movie_name] ||= []
           hash[sub.movie_name] << sub
           hash

data/lib/osdb/server.rb

@@ -55,7 +55,7 @@ module OSDb
     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']) } : []
+      imdb.size > 0 ? imdb.map{ |i| OpenStruct.new(:imdbid => i['id'], :title => i['title']) } : []
     end
 
     def info

data/lib/osdb/subtitle_finder.rb

@@ -11,16 +11,15 @@ module OSDb
     def find_sub_for(movie, language)
       @search_engines.each do |engine|
         subs = engine.search_subs_for(movie, language)
-
-        subs = @selectors.inject(subs) do |subs, selector|
-          selector.select(subs, movie)
-        end
-
-        @finders.each do |finder|
-          sub = finder.chose(subs)
-          return sub if sub
+        unless subs.nil?
+          subs = @selectors.inject(subs) do |subs, selector|
+            selector.select(subs, movie)
+          end
+          @finders.each do |finder|
+            sub = finder.chose(subs)
+            return sub if sub
+          end
         end
-
       end
 
       nil

data/lib/osdb/version.rb

@@ -1,3 +1,3 @@
 module OSDb
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/osdb.gemspec

@@ -17,10 +17,4 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.license       = 'MIT'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'webmock', '~> 1.8.11'
-  s.add_development_dependency 'vcr', '~> 2.3.0'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../lib/osdb'
 require 'rspec'
-require 'rspec/its'
 
 require 'webmock/rspec'
 require 'vcr'

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: osdb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.11
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+date: 2015-12-24 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - jean.boussier @nospam@ gmail.com
@@ -152,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: osdb
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby library to access OSDb services like OpenSubtitles.org