tmdb_trailer 0.2.5 → 0.2.6

data/Gemfile

@@ -7,6 +7,8 @@ gem "mongo"
 gem "bson_ext"
 gem "i18n"
 gem "json"
+gem "net-http-persistent"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
     json (1.4.6)
     mongo (1.2.1)
       bson (>= 1.2.1)
+    net-http-persistent (1.4.1)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.2.0)
@@ -34,5 +35,6 @@ DEPENDENCIES
   jeweler (~> 1.5.1)
   json
   mongo
+  net-http-persistent
   rcov
   rspec (~> 2.2.0)

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/tmdb_trailer.rb

@@ -1,13 +1,15 @@
 require 'pstore'
 require 'open-uri'
+require 'net/http/persistent'
+require 'mongo'
 require 'json'
 
 module TMDB
   class Trailer
+    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","")
-    attr_reader :current_page
-    attr_reader :coll
-    attr_accessor :country
+    NEXT_PAGE = 1
     # country - country code i.e "us" for united states, "hk" for hongkong
     # mode  - use "production" when using for production
     #       - use "test" for testing
@@ -39,17 +41,20 @@ module TMDB
           @pstore[@country] = 1
         end
       end
+
+      #initialize persistent http connection
+      @http = Net::HTTP::Persistent.new
     end
 
     # the most important method. It gets the page that api has to call, sends API request, store the result to mongo, then store the next page for api to call at a future time on pstore
     def populate
       page = get_page
-      (page..page+4).each do |current|
-        js = get_json(current)
-        break if js.length == 1
-        store_result(js)
-        @current_page = current + 1
-        remember_page
+      (page..page+4).each do |page|
+        movies = get_movies(page)
+        num_of_movies = movies.length 
+        break if num_of_movies == 1
+        store_result(movies)
+        remember_page(page + NEXT_PAGE)
       end
     end
 
@@ -64,15 +69,15 @@ module TMDB
     end
 
     # get the result of parsed json response of Movie.browse API call of TMDB
-    def get_json(page)
+    def get_movies(page)
       votes = @country == "us" ? 3 : 1
       @params = "countries=#{@country}&order_by=rating&" +
                 "min_votes=#{votes}&order=desc&page=#{page}&per_page=50"
       url = "#{@base_uri}#{API_KEY}?#{@params}"
-      http = open(url)
-      resp= http.read
-      js = JSON.parse(resp)
-      return js
+      uri = URI.parse(url)
+      response = @http.request(uri).body
+      movies = JSON.parse(response)
+      return movies
     end
 
     # store individual json result into MongoDB
@@ -98,15 +103,22 @@ module TMDB
       page = @country == "us" ? 50 : 1
       total = @country == "us" ? 2500 : 0
       loop do 
-        js = get_json(page) 
-        number_of_movies = js.length
-        break if number_of_movies == 1
+        movies = get_movies(page) 
+        num_of_movies = movies.length
+        break if num_of_movies == 1
         page += 1
-        total += number_of_movies 
+        total += num_of_movies
       end 
       return total 
     end
 
+    # get the page which the API should use the next it calls Movie.browse
+    def current_page
+      @pstore.transaction do
+        @pstore[@country]
+      end
+    end
+
     # if called, give a summary of progress of populating the database
     def report
       total = total_movies
@@ -122,22 +134,23 @@ module TMDB
       genres = []
       keywords = []
       url = "http://api.themoviedb.org/2.1/Movie.getInfo/en/json/#{API_KEY}/#{id}"
-      s = open(url).read
-      res = JSON.parse(s)
-      trailer = res[0]["trailer"] if res[0]["trailer"] 
-      res[0]["genres"].each do |genre|
+      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 = res[0]["keywords"]
-      res[0]["released"] =~ /^(\d*)/
+      keywords = movie[0]["keywords"]
+      movie[0]["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
+    def remember_page(page)
       @pstore.transaction do
-        @pstore[@country] = @current_page
+        @pstore[@country] = page
       end
     end
 

data/spec/tmdb_trailer_spec.rb

@@ -45,7 +45,7 @@ describe TMDB::Trailer do
 
     it "should grab json response from a given url" do
       page = @trailer.get_page
-      js = @trailer.get_json(page)
+      js = @trailer.get_movies(page)
       js.length.should eq(37)
     end
 
@@ -54,16 +54,16 @@ describe TMDB::Trailer do
       @trailer.populate
       pstore = PStore.new("test.pstore")
       pstore.transaction do
-        expected = pstore[country] + 0
-        @trailer.current_page.should eq(expected)
+        @expected = pstore[country] + 0
       end
+      @trailer.current_page.should eq(@expected)
     end
 
     it "should store results to mongodb" do
       doc = {}
       size_before = @trailer.coll.count
       page = @trailer.get_page
-      js = @trailer.get_json(page)
+      js = @trailer.get_movies(page)
       @trailer.store_result(js)
       @trailer.coll.count.should eq(size_before + js.length)
     end

data/tmdb_trailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmdb_trailer}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["redgetan"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-02-15}
   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 = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<net-http-persistent>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.10"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<net-http-persistent>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.10"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<net-http-persistent>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.2.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.10"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmdb_trailer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - redgetan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,8 +75,22 @@ dependencies:
   prerelease: false
   name: json
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  prerelease: false
+  name: net-http-persistent
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -87,12 +101,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  requirement: *id005
+  requirement: *id006
   prerelease: false
   name: rspec
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -103,12 +117,12 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  requirement: *id006
+  requirement: *id007
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -119,12 +133,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id007
+  requirement: *id008
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,7 +147,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id009
   prerelease: false
   name: rcov
 description: " Movie Trailer information will be stored in mongoDB. Information includes year released, movie genres, keywords, and country"