picturehouse_uk 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 515cc194c2ddb6340b07b0a20c25f491aba6e7ac
-  data.tar.gz: c06643abffca387ca159f78a029532eddd304ec5
+  metadata.gz: 190e0e19a7e33fd30aa252d53617a8f3f6820ae2
+  data.tar.gz: 0a8ed252dfbf2d9a564a042ee01806b00f52a914
 SHA512:
-  metadata.gz: 73ed0a6bfd6be3231955f23dd16a0ba8bfece01d3774abb47043c5b278552a398fda1717fb04fb8be810a1f5f19ee98f6b806eaf86f7d09952e8fa2912329728
-  data.tar.gz: 5d69b824baf177025b9d685d3fdbfe1f26c009703c87c78a39ed2e2c6957f5efad41a85bae3b733319591312f90d36452978586238850d19d7cfbcde91f84a82
+  metadata.gz: bd685b9048d7a054fa0c712014f0d8fda32fb189ae180f0e1e890854fc0aed9eb0c6527333796a0f31933ffa2a91f5c3a34dafdb5dae73c7af76473631e102a7
+  data.tar.gz: a0bbdda9c956e867e5863991f981fa862d6a8f5a85250e079bc3c373a503fa750112eef17fbc602a802f2af340604898e7158aad7fb0775f4e33363dccccecfc

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v.2.0.2 -2014-10-19
+
+### Added
+- No screenings in York for 'basement events'
+- more flexible 2d removal
+- better title sanitizations
+- deal with ROH Encore
+- better spacing on 'event' titles
+
 ## v.2.0.1 -2014-10-19
 
 ### Added

data/lib/picturehouse_uk/internal/film_with_screenings_parser.rb

@@ -16,6 +16,7 @@ module PicturehouseUk
       # The film name
       # @return [String]
       def film_name
+        return if city_screen_basement_event?
         TitleSanitizer.new(raw_film_name).sanitized
       end
 
@@ -33,6 +34,10 @@ module PicturehouseUk
 
       private
 
+      def city_screen_basement_event?
+        raw_film_name.match(/\Abasement/)
+      end
+
       def dimension
         raw_film_name.match(/3d/i) ? '3d' : '2d'
       end
@@ -50,7 +55,7 @@ module PicturehouseUk
       end
 
       def screenings?
-        !!screening_nodes
+        !!screening_nodes && !city_screen_basement_event?
       end
     end
 

data/lib/picturehouse_uk/internal/title_sanitizer.rb

@@ -6,7 +6,7 @@ module PicturehouseUk
       # strings and regex to be removed
       REMOVE = [
         /\s\[(AS LIVE:\s*)?[ACPGU1258]+\]/, # regular certificate
-        /\s+[23][dD]/,                      # 2d or 3d from title
+        /\s+\(?[23][dD]\)?/,                # 2d or 3d from title
         /\s\[NO CERT\]/,                    # no certificate
         /\s\[\]/,                           # blank certificate
         /ourscreen\: /,                     # ourscreen
@@ -16,18 +16,23 @@ module PicturehouseUk
         /\s?\+\s?Q\&A\.?/i,                 # +Q&A
         /KIDS CLUB\s*/i,                    # kids club
         /DISCOVER TUE\s*/i,                 # discover tue
-        /FREE Screening\s*-\s*/i            # free screening
+        /FREE Screening\s*-\s*/i,           # free screening
+        /\s*-?\s*Big Scream\s*-?\s*/i,      # big scream
+        /\*?HOH Subtitled\*?/i,             # subtitled
+        /\s*\-?\s*Reminiscence/i,           # reminiscence
+        /\s*-?\s*Kids\'? Club\s*-?\s*/,     # kids club
       ]
 
       # regexes and their replacements
       REPLACE = {
-        /Met\.? Encore:\s*(.*)/ => 'Met Opera:',
+        /Met\.? Encore:\s*(.*)/ => 'Met Opera: ',
         /Met\.? Opera:\s*(.*)/  => 'Met Opera: ',
-        /NT Encore:\s*(.*)/     => 'National Theatre:',
-        /NT Live:\s*(.*)/       => 'National Theatre:',
-        /ROH\.? Live:\s*(.*)/   => 'Royal Opera House:',
-        /RSC\.? Live:\s*(.*)/   => 'Royal Shakespeare Company:',
-        /RSC\.? Encore:\s*(.*)/ => 'Royal Shakespeare Company:'
+        /NT Encore:\s*(.*)/     => 'National Theatre: ',
+        /NT Live:\s*(.*)/       => 'National Theatre: ',
+        /ROH\.? Live:\s*(.*)/   => 'Royal Opera House: ',
+        /ROH\.? Encore:\s*(.*)/ => 'Royal Opera House: ',
+        /RSC\.? Live:\s*(.*)/   => 'Royal Shakespeare Company: ',
+        /RSC\.? Encore:\s*(.*)/ => 'Royal Shakespeare Company: '
       }
 
       # @param [String] title a film title

data/lib/picturehouse_uk/version.rb

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

data/test/fixtures/cinema/York_Picturehouse/basement.html

@@ -0,0 +1,19 @@
+<div class="item" style="height:80px;">
+<div class="left a" style="height:80px;">
+<a href="/cinema/York_Picturehouse/film/Basement_Komedias_Krater_Comedy_Club/">
+<img src="/newman/static/atchs/Global/n9/n9jdm.jpeg" width="60" height="60" class="imageborder">
+</a>
+</div>
+<div class="left b" style="width:300px;">
+<a href="/cinema/York_Picturehouse/film/Basement_Komedias_Krater_Comedy_Club/" class="movielink" style="text-decoration:underline;">basement KOMEDIA'S KRATER COMEDY CLUB</a><br>
+<div class="clear"></div>
+<div class="padding txt1 film.subtitled" style="height:45px;overflow-y:hidden;padding-left:0;">
+<div class="filmrating" content_id="ee39d11f9ffdf541ec44dcc1f03d8d6c"></div>
+</div>
+</div>
+<div class="left" style="width:210px;">
+<a rel="nofollow" bookable="" href="/cinema/York_Picturehouse/film/Basement_Komedias_Krater_Comedy_Club/show/3tbuwr/" id="3tbuwr" class="button_time " epoch="1413743400.0">19:30
+</a>
+</div>
+<div style="clear:both;"></div>
+</div>

data/test/lib/picturehouse_uk/internal/film_with_screenings_parser_test.rb

@@ -23,6 +23,14 @@ describe PicturehouseUk::Internal::FilmWithScreeningsParser do
         subject.must_equal('The Judge')
       end
     end
+
+    describe 'passed basement from Cityscreen Picturehouse York' do
+      let(:film_html) { read_film_html('York_Picturehouse/basement') }
+
+      it 'returns nil' do
+        subject.must_equal(nil)
+      end
+    end
   end
 
   describe '#to_a' do
@@ -54,7 +62,7 @@ describe PicturehouseUk::Internal::FilmWithScreeningsParser do
       end
     end
 
-    describe 'passed film html from top of dbox cinema page' do
+    describe 'passed film html from bottom of cinema page' do
       let(:film_html)       { read_film_html('Duke_Of_Yorks/film_last') }
       let(:permitted_types) { %w(baby dbox hfr kids silver) }
 
@@ -67,6 +75,15 @@ describe PicturehouseUk::Internal::FilmWithScreeningsParser do
         end
       end
     end
+
+    describe 'passed basement from Cityscreen Picturehouse York' do
+      let(:film_html) { read_film_html('York_Picturehouse/basement') }
+
+      it 'returns an empty array' do
+        subject.must_be_instance_of(Array)
+        subject.must_be :empty?
+      end
+    end
   end
 
   private

data/test/lib/picturehouse_uk/internal/title_sanitizer_test.rb

@@ -22,6 +22,14 @@ describe PicturehouseUk::Internal::TitleSanitizer do
       end
     end
 
+    describe 'with (2d) in title' do
+      let(:title) { 'ParaNorman (2D)' }
+
+      it 'removes dimension' do
+        subject.must_equal('ParaNorman')
+      end
+    end
+
     describe 'with 3d in title' do
       let(:title) { 'Iron Man 3 3d' }
 
@@ -102,6 +110,38 @@ describe PicturehouseUk::Internal::TitleSanitizer do
       end
     end
 
+    describe 'with HOH Subtitled in the title' do
+      let(:title) { "'71 *HOH Subtitled*" }
+
+      it 'removes extra info' do
+        subject.must_equal("'71")
+      end
+    end
+
+    describe 'with Big Scream in the title' do
+      let(:title) { 'Big Scream - Effie Gray' }
+
+      it 'removes extra info' do
+        subject.must_equal('Effie Gray')
+      end
+    end
+
+    describe 'with kids club in the title' do
+      let(:title) { "ParaNorman (2D) - Kids' Club" }
+
+      it 'removes extra info' do
+        subject.must_equal('ParaNorman')
+      end
+    end
+
+    describe 'with reminiscence in the title' do
+      let(:title) { "Rosemary's Baby - Reminiscence" }
+
+      it 'removes extra info' do
+        subject.must_equal("Rosemary's Baby")
+      end
+    end
+
     describe 'Bolshoi screening' do
       let(:title) { 'Bolshoi: Spartacus [NO CERT]' }
 
@@ -183,5 +223,13 @@ describe PicturehouseUk::Internal::TitleSanitizer do
         subject.must_equal('Royal Shakespeare Company: Richard II')
       end
     end
+
+    describe 'Royal Opera House encore screening' do
+      let(:title) { 'ROH Encore: Swan Lake' }
+
+      it 'removes prefix' do
+        subject.must_equal('Royal Opera House: Swan Lake')
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picturehouse_uk
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andy Croll
@@ -141,6 +141,7 @@ files:
 - test/fixtures/cinema/Duke_Of_Yorks.html
 - test/fixtures/cinema/Duke_Of_Yorks/film_last.html
 - test/fixtures/cinema/Duke_Of_Yorks/film_second.html
+- test/fixtures/cinema/York_Picturehouse/basement.html
 - test/fixtures/contact_us/Duke_Of_Yorks.html
 - test/fixtures/contact_us/Dukes_At_Komedia.html
 - test/fixtures/home.html
@@ -186,6 +187,7 @@ test_files:
 - test/fixtures/cinema/Duke_Of_Yorks.html
 - test/fixtures/cinema/Duke_Of_Yorks/film_last.html
 - test/fixtures/cinema/Duke_Of_Yorks/film_second.html
+- test/fixtures/cinema/York_Picturehouse/basement.html
 - test/fixtures/contact_us/Duke_Of_Yorks.html
 - test/fixtures/contact_us/Dukes_At_Komedia.html
 - test/fixtures/home.html