kandianying 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8543cbbbdef138447df2a0c72440176f541236
-  data.tar.gz: 3e54ddd7955b093e1f6141604c07eda379f49dd1
+  metadata.gz: d16fe1b8b27ad6f575ed6e12b92e244dd64c4402
+  data.tar.gz: ac70497b5450250a5d9ad9a5e3c3ad19b0802fe0
 SHA512:
-  metadata.gz: a71a2984902e8c134f41742a95ef0f573c7fbdb4304395802c2a7444289d54f58cd244bbf4c92457b6402750ca9f65ba0583e2a523f3bf2cd5a07cc2111848f9
-  data.tar.gz: 2fa04974fd39eaca35e50b42d19dc00bcb57bc9ca8d800070456908ca5aec840807414c1ac76dc2082b89e115a40209ab57c6d837bf1c19a0b5277706f1d61e2
+  metadata.gz: 6837f76db4416653311efa7dc798e13acb18f54f75a0274c7a6ed91ad1f0dfcba029fcf0871bd01c0f9d40b020ee4310a612a6791a2050cf460726118313d832
+  data.tar.gz: 4765e731a2c172515b740650bb60338460470dec84b688ab489ff0015f04d81a0a0037db3e987607c745b21085d820964c6559fa62fd8607a0a2b7c995afd4cd

data/kandianying.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
   s.add_runtime_dependency 'nokogiri'
+  s.add_runtime_dependency 'concurrent-ruby'
 end

data/lib/kandianying/ambassador.rb

@@ -2,55 +2,30 @@ require 'open-uri'
 require 'nokogiri'
 require 'json'
 require 'yaml'
+require 'concurrent'
+require_relative 'ambassador_scrape'
+require_relative 'search'
 
 # Scraper for Ambassador
 module Ambassador
-  AMBASSADOR_THEATER_ID_URL = 'http://www.ambassador.com.tw/showtime_list.html'
-  AMBASSADOR_THEATER_ID_XPATH = "//*[@class='list-group sidebar-nav-v1']//li//a"
-  AMBASSADOR_TIME_API = 'http://cinemaservice.ambassador.com.tw/ambassadorsite.webapi/api/Movies/GetScreeningDateListForTheater/?'
-  AMBASSADOR_FILM_API = 'http://cinemaservice.ambassador.com.tw/ambassadorsite.webapi/api/Movies/GetShowtimeListForTheater/?'
   # Class for Vieshow films
   class Ambassador
-    attr_reader :movie_table
-    attr_reader :theater_id_table
-    def initialize
+    include AmbassadorScrape, Search
+    attr_reader :movie_table, :theater_id_table, :cinema_name
+
+    def initialize(id)
       @movie_table = {}
       @theater_id_table = fetch_theater_id_table(AMBASSADOR_THEATER_ID_URL)
       theater_id_table.each do |theater_id, theater_name|
+        next unless theater_id.include? id
         date_list = fetch_theater_date(theater_id)
+        @cinema_name = theater_name
         @movie_table[theater_name] = fetch_movie_info(theater_id, date_list)
       end
     end
 
-    def fetch_movie_info(theater_id, date_list)
-      movie_info = Hash.new { |h, k| h[k] = {} }
-      date_list.each do |date|
-        ur = "#{AMBASSADOR_FILM_API}theaterId=#{theater_id}&showingDate=#{date}"
-        movies = JSON.parse(Nokogiri::HTML(open(ur)).text)
-        movies.each do |movie|
-          name = movie['ForeignName']
-          time = movie['PeriodShowtime'].first['Showtimes']
-          movie_info[name][date] = time
-        end
-      end
-      movie_info
-    end
-
-    def fetch_theater_date(theater_id)
-      url = "#{AMBASSADOR_TIME_API}theaterId=#{theater_id}"
-      JSON.parse(Nokogiri::HTML(open(url)).text)
-    end
-
-    def fetch_theater_id_table(url)
-      theater_id_list = {}
-      open_doc = Nokogiri::HTML(open(url))
-      theater = open_doc.xpath(AMBASSADOR_THEATER_ID_XPATH)
-      theater.each do |t|
-        theater_id = t.attributes['href'].value.split("'")[1]
-        theater_name = t.text
-        theater_id_list[theater_id] = theater_name
-      end
-      theater_id_list
+    def movie_names
+      @movie_table.values[0].keys
     end
 
     def to_json

data/lib/kandianying/ambassador_scrape.rb

@@ -0,0 +1,48 @@
+# Helper module to get data from Ambassador
+module AmbassadorScrape
+  AMBASSADOR_THEATER_ID_URL = 'http://www.ambassador.com.tw/showtime_list.html'
+  AMBASSADOR_THEATER_ID_XPATH = "//*[@class='list-group sidebar-nav-v1']//li//a"
+  AMBASSADOR_TIME_API = 'http://cinemaservice.ambassador.com.tw/ambassadorsite.webapi/api/Movies/GetScreeningDateListForTheater/?'
+  AMBASSADOR_FILM_API = 'http://cinemaservice.ambassador.com.tw/ambassadorsite.webapi/api/Movies/GetShowtimeListForTheater/?'
+
+  def fetch_movie_info(theater_id, date_list)
+    movie_info = Hash.new { |hash, key| hash[key] = {} }
+    date_list.map do |date|
+      url = "#{AMBASSADOR_FILM_API}theaterId=#{theater_id}&showingDate=#{date}"
+      # concurrent_retrieve_info(url, date, movie_info)
+      JSON.parse(Nokogiri::HTML(open(url)).text).map do |movie|
+        name = movie['ForeignName']
+        time = movie['PeriodShowtime'].first['Showtimes']
+        movie_info[name][date] = time
+      end
+    end # .map(&:execute).map(&:value)
+    movie_info # .sort.to_h
+  end
+
+  def concurrent_retrieve_info(url, date, movie_info)
+    Concurrent::Future.new do
+      JSON.parse(Nokogiri::HTML(open(url)).text).map do |movie|
+        name = movie['ForeignName']
+        time = movie['PeriodShowtime'].first['Showtimes']
+        movie_info[name][date] = time
+      end
+    end
+  end
+
+  def fetch_theater_date(theater_id)
+    url = "#{AMBASSADOR_TIME_API}theaterId=#{theater_id}"
+    JSON.parse(Nokogiri::HTML(open(url)).text)
+  end
+
+  def fetch_theater_id_table(url)
+    theater_id_list = {}
+    open_doc = Nokogiri::HTML(open(url))
+    theater = open_doc.xpath(AMBASSADOR_THEATER_ID_XPATH)
+    theater.each do |t|
+      theater_id = t.attributes['href'].value.split("'")[1]
+      theater_name = t.text
+      theater_id_list[theater_id] = theater_name
+    end
+    theater_id_list
+  end
+end

data/lib/kandianying/{vieshow_search.rb → search.rb}

@@ -1,5 +1,5 @@
 # Helper module to search for films
-module VieshowSearch
+module Search
   NO_FILM = 'Film currently not on show'
   AN_HOUR = 1 / 24.to_f
   TIMEZONE = '+8'
@@ -32,7 +32,7 @@ module VieshowSearch
   def time_after(date, times, time_preferrence)
     times.select do |time|
       time if (MIDNIGHT.include? time[0..1]) ||
-              (DateTime.parse("#{date}#{time}#{TIMEZONE}") >= time_preferrence)
+              (DateTime.parse("#{date} #{time}#{TIMEZONE}") >= time_preferrence)
     end
   end
 

data/lib/kandianying/version.rb

@@ -1,5 +1,5 @@
 # Versioning
 module KanDianYing
-  VERSION = '0.0.7'
-  DATE    = '2015-11-04'
+  VERSION = '0.0.8'
+  DATE    = '2015-11-14'
 end

data/lib/kandianying/vieshow.rb

@@ -2,7 +2,7 @@ require 'open-uri'
 require 'nokogiri'
 require 'json'
 require_relative './vieshow_scrape'
-require_relative './vieshow_search'
+require_relative './search'
 
 # Scraper for VieShow
 module VieShow
@@ -10,7 +10,7 @@ module VieShow
 
   # Class for Vieshow films
   class Vieshow
-    include VieshowScrape, VieshowSearch
+    include VieshowScrape, Search
     # initialize movie_table with ID
     def initialize(vis_cinema_id)
       vis_cinema_id = vis_cinema_id.to_s

data/spec/ambassador_spec.rb

@@ -1,6 +1,7 @@
 require './spec/support/vcr_setup'
 
-AMBASSADOR_TEST_SITES = %w(38897fa9-094f-4e63-9d6d-c52408438cb6)
+AMBASSADOR_TEST_SITES = %w(38897fa9-094f-4e63-9d6d-c52408438cb6
+                           5c2d4697-7f54-4955-800c-7b3ad782582c)
 # FAIL_SITES = %w(0 16)
 AMBASSADOR_FIXTURES = './spec/fixtures/ambassador_'
 
@@ -8,24 +9,64 @@ describe 'Get film information' do
   AMBASSADOR_TEST_SITES.each do |site|
     it "must return same list of movies for #{site}" do
       VCR.use_cassette("ambassador_name_#{site}") do
-        cinema = HsinChuMovie::Ambassador.new
-        name = cinema.theater_id_table[site]
+        cinema = HsinChuMovie::Ambassador.new site
         site_names = yml_load("#{AMBASSADOR_FIXTURES}name_#{site}.yml")
-        site_names.must_equal cinema.movie_table[name].keys
+        site_names.must_equal cinema.movie_names
       end
     end
 
     it "must return same table for #{site}" do
       VCR.use_cassette("ambassador_table_#{site}") do
-        cinema = HsinChuMovie::Ambassador.new
-        name = cinema.theater_id_table[site]
+        cinema = HsinChuMovie::Ambassador.new site
         site_table = yml_load("#{AMBASSADOR_FIXTURES}table_#{site}.yml")
-        site_table.must_equal cinema.movie_table[name]
+        site_table.must_equal cinema.movie_table
       end
     end
   end
 end
 
+describe 'Get films after a given time on given day' do
+  AMBASSADOR_TEST_SITES.each do |site|
+    it "should only return films after a time for #{site}" do
+      VCR.use_cassette("ambassador_table_#{site}") do
+        cinema = HsinChuMovie::Ambassador.new site
+        time = DateTime.now.new_offset(TAIWAN_TIME)
+        time += GIVEN_DAY.sample
+        time_s = time.to_s
+        time_s[SEC_PART] = ZERO_SEC
+        day_films = cinema.films_on_day(time_s)
+        after_films = cinema.films_after_time(time_s)
+        # comparison_time is an hour earlier than specified time
+        comparison_time = (time - AN_HOUR).to_s[HOUR_MIN]
+        day_films.each do |film, date_times|
+          date_times.each do |date, show_times|
+            if after_films[film].nil?
+              # If empty, all show times must be less than comparison time
+              show_times.each do |show_time|
+                show_time.must_be :<, comparison_time
+              end
+            else
+              after_show_times = after_films[film][date]
+              after_show_times.each do |ast|
+                # On day show times must include after request show times
+                show_times.must_include ast
+                # After show times must be greater than comparison time
+                if (ast < comparison_time) &&
+                   (MIDNIGHT.include? ast[HOUR_PART])
+                  # Movies airing from midnight onwards are group with past day
+                  ast[HOUR_PART] = "#{ast[HOUR_PART].to_i + ADD_24}"
+                end
+                ast.must_be :>=, comparison_time
+              end
+              show_times -= after_films[film][date]
+              # Any show time not returned must be less than comparison time
+              show_times.each do |show_time|
+                show_time.must_be :<, comparison_time
+              end
+            end; end; end; end; end
+  end
+end
+
 # describe 'Outside of 1 and 14 must fail' do
 #   FAIL_SITES.each do |site|
 #     it "must fail for #{site}" do

data/spec/fixtures/ambassador_name_38897fa9-094f-4e63-9d6d-c52408438cb6.yml

@@ -1,7 +1,4 @@
 ---
-- The Little Prince
-- Crimson Peak
-- Bridge of Spies
-- The Martian
-- THE INTERN
+- SCOUTS GUIDE TO THE ZOMBIE APOCALYPSE
 - Spectre
+- The Little Prince

data/spec/fixtures/ambassador_name_5c2d4697-7f54-4955-800c-7b3ad782582c.yml

@@ -0,0 +1,9 @@
+---
+- SCOUTS GUIDE TO THE ZOMBIE APOCALYPSE
+- Queen Stain
+- BUS657
+- Spectre
+- Burnt
+- The Little Prince
+- THE INTERN
+- 'The Hunger Games: Mockingjay - Part 2'

data/spec/fixtures/ambassador_table_38897fa9-094f-4e63-9d6d-c52408438cb6.yml

@@ -1,68 +1,131 @@
 ---
-The Little Prince:
-  2015/10/28:
-  - '12:50'
-  - '17:30'
-  2015/10/29:
-  - '12:00'
-  - '17:10'
-Crimson Peak:
-  2015/10/28:
-  - '17:30'
-  2015/10/29:
-  - '12:50'
-  - '15:00'
-  - '16:40'
-Bridge of Spies:
-  2015/10/28:
-  - '12:40'
-  - '19:40'
-  2015/10/29:
-  - '12:10'
-  - '16:50'
-  - '18:50'
-  - '21:20'
-The Martian:
-  2015/10/28:
-  - '12:30'
-  - '17:30'
-  - '20:00'
-  2015/10/29:
-  - '14:00'
-  - '16:30'
-  - '19:00'
-  - '21:30'
-THE INTERN:
-  2015/10/28:
-  - '12:20'
-  - '16:30'
-  - '18:40'
-  - '20:50'
-  2015/10/29:
-  - '12:30'
-  - '14:40'
-  - '19:20'
-  - '21:30'
-Spectre:
-  2015/11/05:
-  - '12:40'
-  - '15:20'
-  - '18:00'
-  - '20:40'
-  2015/11/06:
-  - '12:40'
-  - '15:20'
-  - '18:00'
-  - '20:40'
-  2015/11/07:
-  - '10:50'
-  - '13:30'
-  - '16:10'
-  - '18:50'
-  - '21:30'
-  2015/11/08:
-  - '10:50'
-  - '13:30'
-  - '16:10'
-  - '18:50'
-  - '21:30'
+國賓影城@新竹環球世博店:
+  SCOUTS GUIDE TO THE ZOMBIE APOCALYPSE:
+    2015/11/14:
+    - '10:30'
+    - '12:20'
+    - '14:10'
+    - '16:00'
+    - '17:50'
+    - '19:40'
+    - '21:30'
+    2015/11/15:
+    - '10:30'
+    - '12:20'
+    - '14:10'
+    - '16:00'
+    - '17:50'
+    - '19:40'
+    - '21:30'
+    2015/11/16:
+    - '12:00'
+    - '13:50'
+    - '15:40'
+    - '17:30'
+    - '19:20'
+    - '21:10'
+    2015/11/17:
+    - '12:00'
+    - '13:50'
+    - '15:40'
+    - '17:30'
+    - '19:20'
+    - '21:10'
+    2015/11/18:
+    - '12:00'
+    - '13:50'
+    - '15:40'
+    - '17:30'
+    - '19:20'
+    - '21:10'
+    2015/11/19:
+    - '12:00'
+    - '13:50'
+    - '15:40'
+    - '17:30'
+    - '19:20'
+    - '21:10'
+  Spectre:
+    2015/11/14:
+    - '10:20'
+    - '11:30'
+    - '13:00'
+    - '14:10'
+    - '16:40'
+    - '17:40'
+    - '18:50'
+    - '20:20'
+    - '21:30'
+    2015/11/15:
+    - '10:20'
+    - '11:30'
+    - '13:00'
+    - '14:10'
+    - '16:40'
+    - '17:40'
+    - '18:50'
+    - '20:20'
+    - '21:30'
+    2015/11/16:
+    - '11:30'
+    - '12:30'
+    - '14:10'
+    - '15:10'
+    - '16:20'
+    - '17:50'
+    - '18:50'
+    - '20:30'
+    - '21:30'
+    2015/11/17:
+    - '11:30'
+    - '12:30'
+    - '14:10'
+    - '15:10'
+    - '16:10'
+    - '17:50'
+    - '18:50'
+    - '20:30'
+    - '21:30'
+    2015/11/18:
+    - '11:30'
+    - '12:30'
+    - '14:10'
+    - '15:10'
+    - '16:20'
+    - '17:50'
+    - '18:50'
+    - '20:30'
+    - '21:30'
+    2015/11/19:
+    - '11:30'
+    - '12:30'
+    - '14:10'
+    - '15:10'
+    - '16:20'
+    - '17:50'
+    - '18:50'
+    - '20:30'
+    - '21:30'
+  The Little Prince:
+    2015/11/14:
+    - '10:40'
+    - '12:40'
+    - '15:40'
+    - '16:50'
+    2015/11/15:
+    - '10:40'
+    - '12:40'
+    - '15:40'
+    - '16:50'
+    2015/11/16:
+    - '12:20'
+    - '16:50'
+    2015/11/17:
+    - '12:10'
+    - '16:50'
+    2015/11/18:
+    - '12:20'
+    - '16:50'
+    2015/11/19:
+    - '12:20'
+    - '16:50'