movlog 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1994033597fd6c1f1be9b75f998939f88a0b0156
-  data.tar.gz: c4e7cda4def3d1149f553af8bc7937037bb06a48
+  metadata.gz: 88e2f1c152861fc072c2866f74efd96334a3bf1f
+  data.tar.gz: 07d881d6457b555ee1dbdf3fd928c4f749a30029
 SHA512:
-  metadata.gz: 944b3e8dbf997bb1a389e713bd787d9e0cdfa8ab72719a95c857980af08a8d16919ce16a12e8cda09de1a7331dd101b999fd3c0c2648291c3ce4a4b2336171ce
-  data.tar.gz: b1b72d62056e9100bcd56fe8cbe2ba0211729dc6e9bdfdca1b465713a0f3ed6bc3d83b5232d25ca5c488d9009f5286ebda7034562832aef45fbfd73997ad7722
+  metadata.gz: 8e1f322f41da7fe17eb18c0ba026b0b8cf8741871a8b05fa97dd8d688c60698a371ae63359acc2539e5e79a6e95df830e262d16990ede66307377d05ef604dea
+  data.tar.gz: c2a7ed53192338ac5173cdea886babcfb7ffdd8d282e776b607bddca9658669cbe2a1d9b59a701e3005a29e70230004dbe3664a1bfd1dc883c781a551ce10669

data/lib/movlog/movie.rb

@@ -4,27 +4,44 @@ require_relative 'omdb_api'
 module Movlog
   # Movie info
   class Movie
-    attr_reader :imdb_id, :title, :year, :actors, :poster, :plot, :location
+    attr_reader :imdb_id, :type, :title, :year, :poster
+    attr_reader :rating, :plot, :runtime
+    attr_reader :awards, :director, :actors
+    attr_reader :country, :language
     attr_reader :response
-    
+    attr_reader :location
+
     def initialize(data:)
-      @imdb_id = data['imdbID']
-      @title = data['Title']
-      @year = data['Year']
-      @actors = data['Actors']
-      @poster = data['Poster']
-      @plot = data['Plot']
-      @response = data['Response']
+      @imdb_id = data[:imdb_id]
+      @title = data[:title]
+      @year = data[:year]
+      @type = data[:type]
+      @poster = data[:poster]
     end
 
-    def self.find(t:)
-      movie_data = OmdbApi.movie_info(t)
-      new(data: movie_data)
+    def self.find(data)
+      new(data: data)
     end
 
     def get_location
       return @location if @location
       @location = OmdbApi.location(@imdb_id)
     end
+
+    def get_details
+      movie_details = OmdbApi.movie_info(t)
+      parse_details(details: movie_details)
+    end
+
+    def parse_details(details:)
+      @rating = details['imdbRating']
+      @plot = details['Plot']
+      @runtime = details['Runtime']
+      @awards = details['Awards']
+      @director = details['Director']
+      @actors = details['Actors']
+      @country = details['Country']
+      @language = details['Language']
+    end
   end
 end

data/lib/movlog/movies.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require_relative 'omdb_api'
+
+module Movlog
+  # Movies search
+  class Movies
+    attr_reader :movies
+    attr_reader :num
+    attr_reader :response
+
+    def initialize(data:)
+      @movies = parse_movie(data['Search'])
+      @num = data['totalResults']
+      @response = data['Response']
+    end
+
+    def self.find(s:)
+      search_result = OmdbApi.search_movie(s)
+      new(data: search_result)
+    end
+
+    def parse_movie(result)
+      result.map do |movie|
+        Movie.find(imdb_id: movie['imdbID'], title: movie['Title'],
+          year: movie['Year'], poster: movie['Poster'], type: movie['Type']
+        )
+      end
+    end
+  end
+end

data/lib/movlog/omdb_api.rb

@@ -20,25 +20,31 @@ module Movlog
           t: t,
           y: '',
           plot: 'short',
+          type: 'movie',
           r: 'json'
         }
       )
-      JSON.load(movie_response.to_s)
+      JSON.parse(movie_response.to_s)
+    end
+
+    def self.search_movie(s)
+      movie_response = HTTP.get(
+        OMDB_URL,
+        params: {
+          s: s,
+          type: 'movie',
+          r: 'json'
+        }
+      )
+      JSON.parse(movie_response.to_s)
     end
 
     def self.location(movie_id)
-      
       page_url = "http://www.imdb.com/title/#{movie_id}/locations?ref_=tt_dt_dt"
-
-      # Fetch and parse HTML document
       location_arr = []
-
       doc = Nokogiri::HTML(open(page_url))
-
       doc.search('//div[@class="soda sodavote odd"]/dt/a').each { |link| location_arr << link.content}
-
       doc.search('//div[@class="soda sodavote even"]/dt/a').each { |link| location_arr <<  link.content}
-
       location_arr.to_json
     end
   end

data/lib/movlog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Movlog
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/fixtures/cassettes/omdb_api.yml

@@ -1873,4 +1873,154 @@ http_interactions:
         KCJiZSIpOwogICAgfQo8L3NjcmlwdD4KCiAgICA8L2JvZHk+CjwvaHRtbD4K
     http_version: 
   recorded_at: Thu, 03 Nov 2016 11:32:43 GMT
+- request:
+    method: get
+    uri: http://www.omdbapi.com/?r=json&s=hobbit&type=movie
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Connection:
+      - close
+      Host:
+      - www.omdbapi.com
+      User-Agent:
+      - http.rb/2.1.0
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 23 Dec 2016 09:41:35 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '2050'
+      Connection:
+      - close
+      Set-Cookie:
+      - __cfduid=d5ce0b88a3d8304d4743d2d5dacf3a1b31482486095; expires=Sat, 23-Dec-17
+        09:41:35 GMT; path=/; domain=.omdbapi.com; HttpOnly
+      Cache-Control:
+      - public, max-age=86400
+      Expires:
+      - Sat, 24 Dec 2016 09:41:35 GMT
+      Last-Modified:
+      - Fri, 23 Dec 2016 09:41:33 GMT
+      Vary:
+      - "*"
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Access-Control-Allow-Origin:
+      - "*"
+      Cf-Cache-Status:
+      - MISS
+      Server:
+      - cloudflare-nginx
+      Cf-Ray:
+      - 315adbce2383469e-TPE
+    body:
+      encoding: UTF-8
+      string: '{"Search":[{"Title":"The Hobbit: An Unexpected Journey","Year":"2012","imdbID":"tt0903624","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BMTcwNTE4MTUxMl5BMl5BanBnXkFtZTcwMDIyODM4OA@@._V1_SX300.jpg"},{"Title":"The
+        Hobbit: The Desolation of Smaug","Year":"2013","imdbID":"tt1170358","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BMzU0NDY0NDEzNV5BMl5BanBnXkFtZTgwOTIxNDU1MDE@._V1_SX300.jpg"},{"Title":"The
+        Hobbit: The Battle of the Five Armies","Year":"2014","imdbID":"tt2310332","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BODAzMDgxMDc1MF5BMl5BanBnXkFtZTgwMTI0OTAzMjE@._V1_SX300.jpg"},{"Title":"The
+        Hobbit","Year":"1977","imdbID":"tt0077687","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BMjA0ODY3NTkwOF5BMl5BanBnXkFtZTcwODU3NzIyMQ@@._V1_SX300.jpg"},{"Title":"The
+        Hobbit","Year":"1966","imdbID":"tt1686804","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BYTU4OTUwYmQtYjVhZS00ZGRkLWExY2EtYzY5NzkzZGY4YmU1XkEyXkFqcGdeQXVyMjMyNTkxNzY@._V1_SX300.jpg"},{"Title":"A
+        Day in the Life of a Hobbit","Year":"2002","imdbID":"tt0473467","Type":"movie","Poster":"http://ia.media-imdb.com/images/M/MV5BMTk3ODI5Nzk4Nl5BMl5BanBnXkFtZTcwMDE5MTcyMQ@@._V1_SX300.jpg"},{"Title":"The
+        Hobbit: An Unexpected Journey - The Company of Thorin","Year":"2013","imdbID":"tt3345514","Type":"movie","Poster":"N/A"},{"Title":"Secrets
+        of Middle-Earth: Inside Tolkien''s ''The Hobbit''","Year":"2003","imdbID":"tt0401776","Type":"movie","Poster":"http://ia.media-imdb.com/images/M/MV5BMTc4MzUxMDU3Nl5BMl5BanBnXkFtZTcwNjYxMzQyMQ@@._V1_SX300.jpg"},{"Title":"The
+        Hobbit: The Swedolation of Smaug","Year":"2014","imdbID":"tt4171362","Type":"movie","Poster":"https://images-na.ssl-images-amazon.com/images/M/MV5BMzQxMTkyYmQtMWZmYi00NzJmLTg3MDItZmEyZDQ3NmE5OWE4XkEyXkFqcGdeQXVyMjMyNTkxNzY@._V1_SX300.jpg"},{"Title":"The
+        Hobbit Enigma","Year":"2008","imdbID":"tt1297277","Type":"movie","Poster":"N/A"}],"totalResults":"35","Response":"True"}'
+    http_version: 
+  recorded_at: Fri, 23 Dec 2016 09:41:35 GMT
+- request:
+    method: get
+    uri: http://www.imdb.com/title//locations?ref_=tt_dt_dt
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Fri, 23 Dec 2016 10:28:52 GMT
+      Server:
+      - HTTPDaemon
+      Cache-Control:
+      - private
+      Content-Type:
+      - text/html; charset=iso-8859-1
+      Set-Cookie:
+      - uu=BCYj5RXZmurLubyUGTBj5f-gXmP6umTkO2NkvdIIZ5oZL_n_M5Jbpvl-jGK7idbOqjdC3ULYtZirybtZRIdIYQbTnmaBtu-hb--mvSvEN-7APoyMwNNvLJjy1jdB76t131vLT0-mowwevTV4JnOQSmXgAPd911eRoj_LV-UIAbKyfK0;expires=Thu,
+        30 Dec 2037 00:00:00 GMT;path=/;domain=.imdb.com
+      - uu=BCYqiiuovIxN22VlWKqAuCNDt2T6umTkO2NkvdIIZ5oZL_m0oN8eAYT_SNL8Ve2tgfPjsOBWlYDIOPDw-e83vr7QTh-0cPejvyKxKtcRqdQPOlNE1uW_1uqTm-FjI0WTGtfIWNApNJiPGtpWOzmQNnrMBTuYEmZu-khW8DUex-tFQjwxLlxQ3cEQiTa5LvWVpbiTKzsZ-BdbzmfFZKEVtw6RIcD6wDBvN0LFn-syb7Y1TFkcPAuUe2vJbhsWGe7O7dC2;expires=Thu,
+        30 Dec 2037 00:00:00 GMT;path=/;domain=.imdb.com
+      Vary:
+      - Accept-Encoding,User-Agent
+      P3p:
+      - policyref="http://i.imdb.com/images/p3p.xml",CP="CAO DSP LAW CUR ADM IVAo
+        IVDo CONo OTPo OUR DELi PUBi OTRi BUS PHY ONL UNI PUR FIN COM NAV INT DEM
+        CNT STA HEA PRE LOC GOV OTC "
+      Content-Length:
+      - '1189'
+    body:
+      encoding: ASCII-8BIT
+      string: "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n  <meta charset=\"utf-8\"
+        />\n  <title>404 Error</title>\n</head>\n<body>\n\n<style>\nhtml, body {\n
+        \ height: 100%;\n}\nbody {\n  margin: auto;\n  width: 1008px;\n  background-color:
+        #D4D9DD;\n  font-family: Verdana, Arial, sans-serif;\n}\na {\n  text-decoration:
+        none;\n}\na:hover {\n  text-decoration: underline;\n}\na:link, a:hover, a:visited
+        {\n  color: #136CB2;\n}\na:active {\n  color: #E7BE00;\n}\n#error {\n  height:
+        100%;\n  background-color: white;\n  border-left: 1px solid #999999;\n  border-right:
+        1px solid #999999;\n  box-shadow: 0 0 5px 5px #C5CACD;\n}\n.error_message
+        {\n  color: #999999;\n  font-size: 17.5px;\n  padding: 30px 70px 20px;\n}\n.error_bubble
+        {\n  font-family: Arial, helvetica, sans-serif;\n  font-weight: bold;\n  border-radius:
+        8px;\n  -moz-border-radius: 8px;\n  margin: 0 70px 0 70px;\n  padding: 50px;\n}\n.error_bubble
+        div {\n  display: inline-block;\n  vertical-align: middle;\n}\n.error_quote
+        {\n  color: #FFFFFF;\n  font-size: 30px;\n  line-height: 1.35em;\n  padding-left:
+        50px;\n  width: 500px;\n}\n.error_code {\n  font-size: 100px;\n  line-height:
+        50px;\n  margin-top:8px\n}\n.error_arrow {\n  border-color: #DECA16 transparent
+        transparent transparent;\n  border-style: solid;\n  border-width: 21px 0px
+        0px 32px;\n  height: 0;\n  left: 700px;\n  line-height: 0;\n  position: relative;\n
+        \ top: -1px;\n  width: 0;\n}\n.error_code > span {\n  font-size: 50px;\n}\n.error_attrib
+        {\n  color: #999999;\n  float: right;\n  font-size: 14px;\n  font-style: italic;\n
+        \ padding: 10px 70px 36px;\n}\n.error_code_404 .error_bubble {\n  background:
+        none repeat scroll 0% 0% #DECA16;\n  border: 1px solid #DECA16;\n}\n.error_code_500
+        .error_bubble {\n  background: none repeat scroll 0% 0% #EDCA24;\n  border:
+        1px solid #EDCA24;\n}\n.error_code_404 .error_code {\n  color: #BFAD13;\n}\n.error_code_500
+        .error_code {\n  color: #CCAD1F;\n}\n.error_code_500 .error_arrow {\n  border-color:
+        #EDCA24 transparent transparent transparent;\n}\na.btn {\n  background-repeat:
+        repeat-x; \n  background-color: #ECE2C6;\n  background-image: linear-gradient(rgba(255,255,255,.8)
+        5%, rgba(255,255,255,0.0) 70%, rgba(255,255,255,0.8) 100%); \n  background-image:
+        -moz-linear-gradient(rgba(255,255,255,.8) 5%, rgba(255,255,255,0.0) 70%, rgba(255,255,255,0.8)
+        100%); \n  background-image: -webkit-linear-gradient(rgba(255,255,255,.8)
+        5%, rgba(255,255,255,0.0) 70%, rgba(255,255,255,0.8) 100%); \n  background-image:
+        -ms-linear-gradient(rgba(255,255,255,.8) 5%, rgba(255,255,255,0.0) 70%, rgba(255,255,255,0.8)
+        100%); \n  border-color: #E0E0E0 #C0C0C0 #C0C0C0 #E0E0E0;\n  border-radius:
+        3px 3px 3px 3px;\n  border-style: solid;\n  border-width: 1px;\n  color: #000000;\n
+        \ cursor: pointer;\n  float: right;\n  margin-right: 70px;\n  margin-top:
+        26px;\n  padding: 0.3em 0.6em;\n  text-decoration: none;\n}\na.btn:hover {\n
+        \ background-image: none;\n  border-color: #E6B800;\n}\n.clear {\n  clear:
+        both;\n}\n</style>\n<div id=\"error\" class=\"error_code_404\">\n    <div
+        class=\"error_message\">\n        The requested URL was not found on our server.
+        <a href=\"/\">Go to the IMDb homepage</a> &raquo;\n    </div>\n    <div class=\"error_bubble\">\n
+        \       <div class=\"error_code\">404<br><span>ERROR</span></div>\n        <div
+        class=\"error_quote\">What's on the page?!</div>\n    </div>\n    <div class=\"error_arrow\"></div>\n
+        \   <div class=\"error_attrib\">        <span>Detective David Mills, </span>
+        \       <a href=\"/title/tt0114369/\">Se7en (1995)</a>\n    </div>\n    <div
+        class=\"clear\"></div>\n</div>\n\n\n\n</body>\n</html>\n"
+    http_version: 
+  recorded_at: Fri, 23 Dec 2016 10:28:53 GMT
 recorded_with: VCR 3.0.3

data/spec/omdb_spec.rb

@@ -9,7 +9,7 @@ describe 'OMDB specifications' do
 
   before do
     VCR.insert_cassette CASSETTE_FILE_1, record: :new_episodes
-    @movie = Movlog::Movie.find(t: OMDB_KEYWORD)
+    @movies = Movlog::Movies.find(s: OMDB_KEYWORD)
   end
 
   after do
@@ -17,15 +17,11 @@ describe 'OMDB specifications' do
   end
 
   it 'should get the data of a movie' do
-    @movie.imdb_id.length.must_be :>, 0
-    @movie.title.length.must_be :>, 0
-    @movie.year.length.must_be :>, 0
-    @movie.actors.length.must_be :>, 0
-    @movie.poster.length.must_be :>, 0
-    @movie.plot.length.must_be :>, 0
+    @movies.movies.length.must_be :>, 0
+    @movies.num.to_i.must_be :>, 0
   end
 
   it 'should get the filming location of a movie' do
-    @movie.get_location.length.must_be :>, 0
+    @movies.movies.first.get_location.length.must_be :>, 0
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: movlog
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andy Wen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -198,6 +198,7 @@ files:
 - lib/movlog/airport.rb
 - lib/movlog/geonames_api.rb
 - lib/movlog/movie.rb
+- lib/movlog/movies.rb
 - lib/movlog/omdb_api.rb
 - lib/movlog/room.rb
 - lib/movlog/route.rb