unified_db 0.1.1 → 0.2.0

data/lib/unified_db/backend/imdb.rb

@@ -1,9 +1,10 @@
+require 'imdb'
 require 'imdb_party'
 
 module UnifiedDB
   module Backend
     class IMDB < Base
-    
+
       def find_by_id(id)
         movie = handler.find_movie_by_id(id)
         @result = Result::ID.new(
@@ -22,25 +23,29 @@ module UnifiedDB
       rescue
         raise ApiError, 'not found'
       end
-    
+
       def find_by_title(title)
-        movies = handler.find_by_title(title)
+        # movies = handler.find_by_title(title)
+        movies = Imdb::Search.new(title).movies
         movies.each do |movie|
+          id = "tt#{movie.id}"
+          title1, year, title2 = movie.title.match(/(.*) \(([0-9]{4})\)(.*)/)[1..3] rescue next
           @result << Result::Title.new(
-            :id => movie[:imdb_id],
-            :title => movie[:title],
-            :year => movie[:year])
+            :id => id,
+            :title => [title1.to_s.strip, title2.to_s.strip].join(" ").strip,
+            :year => year)
         end
+        result
       end
-    
+
       private
-    
+
       def service; 'imdb'; end
-    
+
       def handler
         @handler ||= ImdbParty::Imdb.new(:anonymize => true)
       end
-    
+
     end
   end
 end

data/lib/unified_db/backend/tvdb.rb

@@ -3,11 +3,11 @@ require 'tvdb_party'
 module UnifiedDB
   module Backend
     class TVDB < Base
-    
+
       def find_by_id(id)
         movie = handler.get_series_by_id(id)
         raise if movie.nil?
-        
+
         @result = Result::ID.new(
           :id => movie.id,
           :title => movie.name,
@@ -24,7 +24,7 @@ module UnifiedDB
       rescue
         raise ApiError, 'not found'
       end
-    
+
       def find_by_title(title)
         movies = handler.search(title)
         movies.each do |movie|
@@ -33,22 +33,23 @@ module UnifiedDB
             :title => movie['SeriesName'],
             :year => movie['FirstAired'].to_s.split('-')[0])
         end
+        result
       end
-    
+
       private
-    
+
       def service; 'tvdb'; end
-    
+
       def handler
-        raise ApiError, 'no TVDB secret provided' if UnifiedDB.tvdb_secret.nil? 
+        raise ApiError, 'no TVDB secret provided' if UnifiedDB.tvdb_secret.nil?
         @handler ||= TvdbParty::Search.new(UnifiedDB.tvdb_secret)
       end
-        
+
       def format_posters(posters)
         list = posters.select { |poster| ['season', 'poster'].include? poster.banner_type }
         list.sort { |a,b| b.banner_type <=> a.banner_type }.collect(&:url)
       end
-    
+
     end
   end
 end

data/lib/unified_db/version.rb

@@ -1,5 +1,5 @@
 module UnifiedDB
-  
-  VERSION = '0.1.1'
-  
+
+  VERSION = '0.2.0'
+
 end

data/spec/unified_db/backend/tvdb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe UnifiedDB::Backend::TVDB do
   subject { described_class.new }
-  
+
   it "should return valid find by title" do
     result = subject.find(:title => 'StarGate SG-1')
     result.class.should eql(Hash)
@@ -11,30 +11,30 @@ describe UnifiedDB::Backend::TVDB do
     result[:service].should eql('tvdb')
     result[:result].class.should eql(Array)
     result[:result].size.should eql 1
-    
+
     first_result = result[:result].first
     first_result.class.should eql(UnifiedDB::Result::Title)
     first_result.id.should eql('72449')
     first_result.title.should eql('Stargate SG-1')
     first_result.year.should eql('1997')
-    
+
     encoded = Yajl::Encoder.new.encode result
     decoded = Yajl::Parser.new.parse encoded
-    
+
     decoded.class.should eql(Hash)
     do_sort(decoded.keys).should eql(['result', 'service', 'status'])
     decoded['status'].should eql('success')
     decoded['service'].should eql('tvdb')
     decoded['result'].class.should eql(Array)
     decoded['result'].size.should eql 1
-    
+
     first_result = decoded['result'].first
     first_result.class.should eql(Hash)
     first_result['id'].should eql('72449')
     first_result['title'].should eql('Stargate SG-1')
     first_result['year'].should eql('1997')
   end
-  
+
   it "should return empty array if invalid find by title specified" do
     result = subject.find(:title => "qwertyuiopasdfghjkllzxcvbnm")
     result.class.should eql(Hash)
@@ -44,15 +44,15 @@ describe UnifiedDB::Backend::TVDB do
     result[:result].class.should eql(Array)
     result[:result].size.should eql(0)
   end
-    
-  
+
+
   it "should return valid find by id" do
     result = subject.find(:id => '72449')
     result.class.should eql(Hash)
     do_sort(result.keys).should eql([:result, :service, :status])
     result[:status].should eql('success')
     result[:service].should eql('tvdb')
-    
+
     result[:result].class.should eql(UnifiedDB::Result::ID)
     result[:result].id.should eql('72449')
     result[:result].title.should eql('Stargate SG-1')
@@ -65,13 +65,13 @@ describe UnifiedDB::Backend::TVDB do
     result[:result].rating.should be < 10
     result[:result].runtime.should eql(60)
     result[:result].actors.class.should eql(Array)
-    result[:result].actors.first.should eql({"Richard Dean Anderson"=>"Col./Gen. Jack O'Neill"})
+    result[:result].actors.first.should eql({"Christopher Judge"=>"Teal'c"})
     result[:result].directors.should eql([])
     result[:result].writers.should eql([])
     result[:result].posters.class.should eql(Array)
     result[:result].posters.size.should be > 0
   end
-  
+
   it "should return error if id was not found" do
     result = subject.find(:id => '72449123')
     result.class.should eql(Hash)
@@ -79,5 +79,5 @@ describe UnifiedDB::Backend::TVDB do
     result[:status].should eql('error')
     result[:reason].should eql('not found')
   end
-  
+
 end

data/unified_db.gemspec

@@ -11,10 +11,12 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/imanel/unifieddb"
   s.summary     = %q{Scrapper for multiple Movie Databases}
   s.description = %q{Scrapper for multiple Movie Databases}
-  
+
   s.add_dependency 'yajl-ruby'
-  s.add_dependency 'imdb_party', '~> 0.6.0'
-  s.add_dependency 'tvdb_party', '~> 0.6.0'
+  s.add_dependency 'imdb', '~> 0.6.8'
+  s.add_dependency 'httparty', '0.8.1'
+  s.add_dependency 'imdb_party', '0.6.1'
+  s.add_dependency 'tvdb_party', '0.6.2'
   s.add_development_dependency 'rspec', '~> 2.0'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,68 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: unified_db
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000 +02:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &70329097056220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: imdb
   prerelease: false
-  version_requirements: *70329097056220
-- !ruby/object:Gem::Dependency
-  name: imdb_party
-  requirement: &70329097055680 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 6
+        - 8
+        version: 0.6.8
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: httparty
   prerelease: false
-  version_requirements: *70329097055680
-- !ruby/object:Gem::Dependency
-  name: tvdb_party
-  requirement: &70329097055120 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: imdb_party
   prerelease: false
-  version_requirements: *70329097055120
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: tvdb_party
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
+        version: 0.6.2
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70329097054580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *70329097054580
+  version_requirements: *id006
 description: Scrapper for multiple Movie Databases
-email:
+email: 
 - bernard.potocki@imanel.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -84,32 +141,40 @@ files:
 - spec/unified_db/backend/imdb_spec.rb
 - spec/unified_db/backend/tvdb_spec.rb
 - unified_db.gemspec
-has_rdoc: true
 homepage: http://github.com/imanel/unifieddb
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Scrapper for multiple Movie Databases
-test_files:
+test_files: 
 - spec/spec_helper.rb
 - spec/support/do_sort.rb
 - spec/unified_db/backend/imdb_spec.rb