picturehouse_uk 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7f47e1bf37f9995c5ca275813ffe5d8730596e
-  data.tar.gz: 8d63a6095235389577e80de18d76552f89c6293e
+  metadata.gz: 9b2b5301da3720096e032a4724f261260088819f
+  data.tar.gz: 22d763115ac63d96bce5b56853c42a7c7ed7bf68
 SHA512:
-  metadata.gz: b068354d804434d10beec8e9319e7c5de342301c37737979697f977e23d93381de264e7a1ee31607f941020507d1fd0947493635438aa53920e3aca3ee42229b
-  data.tar.gz: 56f8adab48cd13a255b6c3099f95f61fab02c7afd604c2312a3be0b7b38fce6f68deef39d6677ae268eea541468756c4ce003f5a09aff31b99fdc15879f70ba2
+  metadata.gz: be35d4ae43654002ab6946598a660a5a3c52d0918305a4b7d958ca815567dbfa173e507c43b2797937486d4daa8881308ec4c500fa20a85461cdb07c0472529a
+  data.tar.gz: 057eca9caad7fc07ef6c14b3af858ee954ea7176a956b04f1d2cf7c91ab8afda4ac53e1cd19995cfac814b371c47e99e5c4de9b5bea5b43217750b4e6fca8f73

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [3.0.14] - 2015-05-17
+
+### Fixed
+- Films for the following year incorrectly dated
+
+### Changed
+- Internal date calculation method changed for screenings
+
 ## [3.0.13] - 2015-05-06
 
 ### Added

data/lib/picturehouse_uk/internal/parser/screenings.rb

@@ -6,39 +6,35 @@ module PicturehouseUk
       # Parses screenings page into an array of hashes for an individual cinema
       Screenings = Struct.new(:cinema_id) do
         # css for a day of films & screenings
-        LISTINGS = '#today .listings > li, #this-week .listings > li, #further-ahead .listings > li'
+        LISTINGS = '.listings li:not(.dark)'
+        DATE = '.nav-collapse.collapse'
 
         # parse the cinema page into an array of screenings attributes
         # @return [Array<Hash>]
         def to_a
-          date = Date.today
-          doc.css(LISTINGS).each_with_object([]) do |node, result|
-            if date?(node.text)
-              date = date_parse(node.text)
-            else
-              result << FilmWithShowtimes.new(node, date).to_a
-            end
-          end.flatten
+          doc.css(LISTINGS).flat_map do |node|
+            FilmWithShowtimes.new(node, date_from_html(node.css(DATE).to_s)).to_a
+          end
         end
 
         private
 
-        def date_parse(text)
-          Date.parse(text)
-        rescue ArgumentError
-          nil
+        def date_from_html(html)
+          if !!html.match(/listings-further-ahead-today/)
+            Date.now
+          else
+            html.match(/listings-further-ahead-(\d{4})(\d{2})(\d{2})/) do |m|
+              Date.new(m[1].to_i, m[2].to_i, m[3].to_i)
+            end
+          end
         end
 
         def doc
           @doc ||= Nokogiri::HTML(page)
         end
 
-        def date?(text)
-          !!text.match(/(Mon|Tues|Wednes|Thurs|Fri|Satur|Sun)day \d{1,2}(st|nd|th) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/)
-        end
-
         def page
-          @page ||= PicturehouseUk::Internal::Website.new.cinema(cinema_id)
+          @page ||= PicturehouseUk::Internal::Website.new.whats_on(cinema_id)
         end
       end
     end

data/lib/picturehouse_uk/internal/website.rb

@@ -12,6 +12,14 @@ module PicturehouseUk
         get("cinema/#{id}")
       end
 
+      # get the cinema screenings page for passed id
+      # @return [String]
+      def whats_on(id)
+        get("cinema/#{id}/Whats_On")
+      rescue OpenURI::HTTPError
+        ''
+      end
+
       # get the cinema contact information page for passed id
       # @return [String]
       def info(id)

data/lib/picturehouse_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for http://www.picturehouses.co.uk
-# @version 3.0.13
+# @version 3.0.14
 module PicturehouseUk
   # Gem version
-  VERSION = '3.0.13'
+  VERSION = '3.0.14'
 end

data/test/fixture_updater.rb

@@ -21,6 +21,11 @@ File.open(fixture('info/Duke_Of_Yorks'), 'w') do |file|
   file.write PicturehouseUk::Internal::Website.new.info('Duke_Of_Yorks')
 end
 
+File.open(fixture('whats_on/Duke_Of_Yorks'), 'w') do |file|
+  puts '* Duke of Yorks Whats On'
+  file.write PicturehouseUk::Internal::Website.new.whats_on('Duke_Of_Yorks')
+end
+
 # KOMEDIA
 
 File.open(fixture('cinema/Dukes_At_Komedia'), 'w') do |file|
@@ -33,6 +38,11 @@ File.open(fixture('info/Dukes_At_Komedia'), 'w') do |file|
   file.write PicturehouseUk::Internal::Website.new.info('Dukes_At_Komedia')
 end
 
+File.open(fixture('whats_on/Dukes_At_Komedia'), 'w') do |file|
+  puts '* Dukes at Komedia Whats On'
+  file.write PicturehouseUk::Internal::Website.new.whats_on('Dukes_At_Komedia')
+end
+
 # PHEONIX OXFORD
 
 File.open(fixture('cinema/Phoenix_Picturehouse'), 'w') do |file|
@@ -45,9 +55,19 @@ File.open(fixture('info/Phoenix_Picturehouse'), 'w') do |file|
   file.write PicturehouseUk::Internal::Website.new.info('Phoenix_Picturehouse')
 end
 
+File.open(fixture('whats_on/Phoenix_Picturehouse'), 'w') do |file|
+  puts '* Pheonix Oxford Whats On'
+  file.write PicturehouseUk::Internal::Website.new.whats_on('Phoenix_Picturehouse')
+end
+
 # NATIONAL MEDIA MUSEUM (IMAX)
 
 File.open(fixture('cinema/National_Media_Museum'), 'w') do |file|
   puts '* National Media Museum'
   file.write PicturehouseUk::Internal::Website.new.cinema('National_Media_Museum')
 end
+
+File.open(fixture('whats_on/National_Media_Museum'), 'w') do |file|
+  puts '* National Media Museum Whats On'
+  file.write PicturehouseUk::Internal::Website.new.whats_on('National_Media_Museum')
+end