tmdb_trailer 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/tmdb_trailer.rb

@@ -9,30 +9,19 @@ module TMDB
     attr_reader :coll # MongoDB collection
     attr_accessor :country # country associated with Trailer instance
     API_KEY = File.read(File.join(File.expand_path(File.dirname(__FILE__)), "secret.txt")).gsub("\n","")
+    BASE_URI = "http://api.themoviedb.org/2.1/"
     NEXT_PAGE = 1
     # country - country code i.e "us" for united states, "hk" for hongkong
     # db_name - database name to store mongo documents, will create one for you if it doesnt exists
     def initialize(country,db_name)
-      @base_uri = "http://api.themoviedb.org/2.1/Movie.browse/en/json/"
       @country = country
-
-      #initialize the mongoDB connection 
-      @db = Mongo::Connection.new.db(db_name)
-      @pstore = PStore.new("#{db_name}.pstore")
-      @coll = @db["movies"]
-      
+      db = Mongo::Connection.new.db(db_name)
+      @coll = db["movies"]
       #if mongo collection does not exist, create index to avoid duplicate documents
-      if @coll.count == 0
-        @coll.create_index("name", :unique => true)
-      end
-
-      # initialize pstore as well
-      if @coll.find(:country=> @country).count == 0
-        @pstore.transaction do
-          @pstore[@country] = 1
-        end
-      end
-
+      @coll.create_index("name", :unique => true) if @coll.count == 0
+      # initialize pstore 
+      @pstore = PStore.new("#{db_name}.pstore")
+      @pstore.transaction { @pstore[@country] = 1 } if @coll.find(:country=> @country).count == 0
       #initialize persistent http connection
       @http = Net::HTTP::Persistent.new
     end
@@ -54,9 +43,7 @@ module TMDB
     #
     # i.e http://api.themoviedb.org/2.1/Movie.browse/en-US/json/{API_KEY}?countries=jp&order_by=rating&order=desc&min_votes=1&page=4&per_page=50 
     def get_page
-      @pstore.transaction do
-        return @pstore[@country]
-      end
+      @pstore.transaction { @pstore[@country] }
     end
 
     # get the result of parsed json response of Movie.browse API call of TMDB
@@ -64,7 +51,7 @@ module TMDB
       votes = @country == "us" ? 3 : 0
       @params = "countries=#{@country}&order_by=rating&" +
                 "min_votes=#{votes}&order=desc&page=#{page}&per_page=50"
-      url = "#{@base_uri}#{API_KEY}?#{@params}"
+      url = "#{BASE_URI}Movie.browse/en/json/#{API_KEY}?#{@params}"
       uri = URI.parse(url)
       response = @http.request(uri).body
       movies = JSON.parse(response)
@@ -105,44 +92,34 @@ module TMDB
 
     # get the page which the API should use the next it calls Movie.browse
     def current_page
-      @pstore.transaction do
-        @pstore[@country]
-      end
+      @pstore.transaction { @pstore[@country] }
     end
 
     # if called, give a summary of progress of populating the database
     def report
       total = total_movies
-      params = {}
-      params["country"] = @country
-      movies_in_mongo = @coll.find(params).count
-      report = "#{params["country"]} currently has populated #{movies_in_mongo} out of #{total} movies available on tmdb"
-      return report
+      movies_in_mongo = @coll.find(:country => @country).count
+      return "#{@country} currently has populated #{movies_in_mongo} out of #{total} movies available on tmdb"
     end
 
     # gets the trailer, genre, keyword, year information using Movie.getInfo API call
     def get_extra_info(id)
       genres = []
       keywords = []
-      url = "http://api.themoviedb.org/2.1/Movie.getInfo/en/json/#{API_KEY}/#{id}"
+      url = "#{BASE_URI}Movie.getInfo/en/json/#{API_KEY}/#{id}"
       uri = URI.parse(url)
       response = @http.request(uri).body
-      movie = JSON.parse(response)
-      trailer = movie[0]["trailer"] if movie[0]["trailer"] 
-      movie[0]["genres"].each do |genre|
-        genres << genre["name"]
-      end
-      keywords = movie[0]["keywords"]
-      movie[0]["released"] =~ /^(\d*)/
+      movie = JSON.parse(response)[0]
+      trailer, keywords = movie["trailer"], movie["keywords"]
+      movie["genres"].each {|g| genres << g["name"]}
+      movie["released"] =~ /^(\d*)/
       year = $1
       return trailer,genres,keywords,year
     end
 
     # stores locally the page which the API should use the next it calls Movie.browse
     def remember_page(page)
-      @pstore.transaction do
-        @pstore[@country] = page
-      end
+      @pstore.transaction { @pstore[@country] = page }
     end
 
   end

data/spec/test.pstore

@@ -1,2 +1,2 @@
 {
-"nzi"czi"bri"roi"usi
+"czi"nzi"bri"roi"usi

data/tmdb_trailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmdb_trailer}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["redgetan"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-02-23}
   s.description = %q{ Movie Trailer information will be stored in mongoDB. Information includes year released, movie genres, keywords, and country}
   s.email = %q{redge.tan@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmdb_trailer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - redgetan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-02-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency