picturehouse_uk 2.0.5 → 3.0.0

data/test/lib/picturehouse_uk/cinema_test.rb

@@ -22,13 +22,13 @@ describe PicturehouseUk::Cinema do
 
     it 'returns the correctly sized array' do
       PicturehouseUk::Internal::Website.stub :new, website do
-        subject.size.must_equal 22
+        subject.size.must_equal 12
       end
     end
 
     it 'returns the right cinemas' do
       PicturehouseUk::Internal::Website.stub :new, website do
-        subject.first.name.must_equal 'Clapham Picturehouse'
+        subject.first.name.must_equal "Duke of York's Picturehouse"
         subject.last.name.must_equal 'City Screen Picturehouse'
       end
     end
@@ -47,7 +47,7 @@ describe PicturehouseUk::Cinema do
         subject.brand.must_equal 'Picturehouse'
         subject.name.must_equal "Duke of York's Picturehouse"
         subject.slug.must_equal 'duke-of-yorks-picturehouse'
-        subject.url.must_equal "http://www.picturehouses.co.uk/cinema/#{id}/"
+        subject.url.must_equal "http://www.picturehouses.com/cinema/#{id}"
       end
     end
   end
@@ -57,7 +57,7 @@ describe PicturehouseUk::Cinema do
       {
         id:   'Dukes_At_Komedia',
         name: "Duke's At Komedia",
-        url:  '/cinema/Dukes_At_Komedia/'
+        url:  '/cinema/Dukes_At_Komedia'
       }
     end
 
@@ -68,7 +68,34 @@ describe PicturehouseUk::Cinema do
       subject.brand.must_equal 'Picturehouse'
       subject.name.must_equal "Duke's At Komedia"
       subject.slug.must_equal 'dukes-at-komedia'
-      subject.url.must_equal 'http://www.picturehouses.co.uk/cinema/Dukes_At_Komedia/'
+      subject.url.must_equal 'http://www.picturehouses.com/cinema/Dukes_At_Komedia'
+    end
+  end
+
+  describe '#adr' do
+    let(:options) do
+      {
+        id:   'Phoenix_Picturehouse',
+        name: "Pheonix Picturehouse",
+        url:  '/cinema/Phoenix_Picturehouse'
+      }
+    end
+
+    describe '#adr' do
+      subject { described_class.new(options).adr }
+
+      it 'returns address hash' do
+        PicturehouseUk::Internal::Website.stub :new, website do
+          subject.must_equal(
+            street_address:   '57 Walton Street',
+            extended_address: nil,
+            locality:         'Oxford',
+            region:           nil,
+            postal_code:      'OX2 6AE',
+            country:          'United Kingdom'
+          )
+        end
+      end
     end
   end
 
@@ -77,7 +104,7 @@ describe PicturehouseUk::Cinema do
       {
         id:   'Dukes_At_Komedia',
         name: "Duke's At Komedia",
-        url:  '/cinema/Dukes_At_Komedia/'
+        url:  '/cinema/Dukes_At_Komedia'
       }
     end
 
@@ -87,9 +114,10 @@ describe PicturehouseUk::Cinema do
       it 'returns address hash' do
         PicturehouseUk::Internal::Website.stub :new, website do
           subject.must_equal(
-            street_address:   '44-47 Gardner Street',
-            extended_address: 'North Laine',
+            street_address:   '44–47 Gardner Street',
+            extended_address: nil,
             locality:         'Brighton',
+            region:           'East Sussex',
             postal_code:      'BN1 1UN',
             country:          'United Kingdom'
           )
@@ -102,7 +130,7 @@ describe PicturehouseUk::Cinema do
 
       it 'returns first line of address' do
         PicturehouseUk::Internal::Website.stub :new, website do
-          subject.must_equal('44-47 Gardner Street')
+          subject.must_equal('44–47 Gardner Street')
         end
       end
     end
@@ -112,7 +140,7 @@ describe PicturehouseUk::Cinema do
 
       it 'returns second line of address' do
         PicturehouseUk::Internal::Website.stub :new, website do
-          subject.must_equal('North Laine')
+          subject.must_equal(nil)
         end
       end
     end
@@ -127,6 +155,16 @@ describe PicturehouseUk::Cinema do
       end
     end
 
+    describe '#region' do
+      subject { described_class.new(options).region }
+
+      it 'returns second line of address' do
+        PicturehouseUk::Internal::Website.stub :new, website do
+          subject.must_equal('East Sussex')
+        end
+      end
+    end
+
     describe '#postal_code' do
       subject { described_class.new(options).postal_code }
 
@@ -136,7 +174,6 @@ describe PicturehouseUk::Cinema do
         end
       end
     end
-
   end
 
   describe '#films' do
@@ -144,7 +181,7 @@ describe PicturehouseUk::Cinema do
       {
         id:   'Dukes_At_Komedia',
         name: "Duke's At Komedia",
-        url:  '/cinema/Dukes_At_Komedia/'
+        url:  '/cinema/Dukes_At_Komedia'
       }
     end
 
@@ -162,7 +199,7 @@ describe PicturehouseUk::Cinema do
       {
         id:   'Dukes_At_Komedia',
         name: "Duke's At Komedia",
-        url:  '/cinema/Dukes_At_Komedia/'
+        url:  '/cinema/Dukes_At_Komedia'
       }
     end
 
@@ -178,7 +215,7 @@ describe PicturehouseUk::Cinema do
       {
         id:   'Dukes_At_Komedia',
         name: "Duke's At Komedia",
-        url:  '/cinema/Dukes_At_Komedia/'
+        url:  '/cinema/Dukes_At_Komedia'
       }
     end
 
@@ -202,8 +239,8 @@ describe PicturehouseUk::Cinema do
       read_file("../../../fixtures/cinema/#{filename}.html")
     end
 
-    def contact_us(filename)
-      read_file("../../../fixtures/contact_us/#{filename}.html")
+    def info(filename)
+      read_file("../../../fixtures/info/#{filename}.html")
     end
 
     private

data/test/lib/picturehouse_uk/internal/parser/screenings_test.rb

@@ -0,0 +1,45 @@
+require_relative '../../../../test_helper'
+
+describe PicturehouseUk::Internal::Parser::Screenings do
+  let(:described_class) { PicturehouseUk::Internal::Parser::Screenings }
+
+  let(:website) { Minitest::Mock.new }
+
+  before do
+    WebMock.disable_net_connect!
+  end
+
+  %w(Duke_Of_Yorks Dukes_At_Komedia Pheonix_Oxford) do |cinema|
+    describe '#to_a' do
+      subject { described_class.new(cinema).to_a }
+
+      before { website.expect(:cinema, html(cinema), [cinema]) }
+
+      it 'returns an non-zero array of hashes' do
+        PicturehouseUk::Internal::Website.stub :new, website do
+          subject.must_be_instance_of(Array)
+          subject.size.must_be :>, 0
+
+          subject.each do |element|
+            element.must_be_instance_of(Hash)
+            element.keys.must_equal([:film_name, :dimension, :variant, :booking_url, :time])
+            element[:film_name].must_be_kind_of(String)
+            element[:dimension].must_match(/\A[23]d\z/)
+            element[:booking_url].must_match(/\Ahttps?\:\/\//)
+            element[:time].must_be_kind_of(Time)
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  def read_file(filepath)
+    File.read(File.expand_path(filepath, __FILE__))
+  end
+
+  def html(cinema)
+    read_file("../../../../../fixtures/cinema/#{cinema}.html")
+  end
+end

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

@@ -343,5 +343,21 @@ describe PicturehouseUk::Internal::TitleSanitizer do
         subject.must_equal('The Hobbit: The Battle of the Five Armies')
       end
     end
+
+    describe 'live' do
+      let(:title) { 'English National Opera: Carmen (Live)' }
+
+      it 'removes live suffix' do
+        subject.must_equal('English National Opera: Carmen')
+      end
+    end
+
+    describe 'remove [TBC] certificate' do
+      let(:title) { 'The Living Room with Gavin Clark [TBC]' }
+
+      it 'removes tbc cert' do
+        subject.must_equal('The Living Room with Gavin Clark')
+      end
+    end
   end
 end

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

@@ -6,19 +6,19 @@ describe PicturehouseUk::Internal::Website do
   describe '#cinema(id)' do
     subject { described_class.new.cinema('Duke_Of_Yorks') }
 
-    before { stub_get('cinema/Duke_Of_Yorks/', duke_of_yorks_html) }
+    before { stub_get('cinema/Duke_Of_Yorks', duke_of_yorks_html) }
 
     it 'returns a string' do
       subject.class.must_equal String
     end
   end
 
-  describe '#contact_us(id)' do
-    subject { described_class.new.contact_us('Duke_Of_Yorks') }
+  describe '#info(id)' do
+    subject { described_class.new.info('Duke_Of_Yorks') }
 
     before do
       stub_get(
-        'cinema/Duke_Of_Yorks/Hires_Info/Contact_Us/',
+        'cinema/info/Duke_Of_Yorks',
         duke_of_yorks_contact_us_html
       )
     end
@@ -45,7 +45,7 @@ describe PicturehouseUk::Internal::Website do
   end
 
   def duke_of_yorks_contact_us_html
-    read_file('../../../../fixtures/contact_us/Duke_Of_Yorks.html')
+    read_file('../../../../fixtures/info/Duke_Of_Yorks.html')
   end
 
   def home_html
@@ -57,7 +57,7 @@ describe PicturehouseUk::Internal::Website do
   end
 
   def stub_get(site_path, response_body)
-    url      = "http://www.picturehouses.co.uk/#{site_path}"
+    url      = "http://www.picturehouses.com/#{site_path}"
     response = { status: 200, body: response_body, headers: {} }
     stub_request(:get, url).to_return(response)
   end

data/test/lib/picturehouse_uk/screening_test.rb

@@ -19,7 +19,15 @@ describe PicturehouseUk::Screening do
 
     it 'returns correct number of screenings' do
       PicturehouseUk::Internal::Website.stub :new, website do
-        subject.count.must_equal 33
+        subject.count.must_equal 59
+      end
+    end
+
+    it 'has valid screenings' do
+      PicturehouseUk::Internal::Website.stub :new, website do
+        subject.map(&:showing_at).each do |time|
+          time.wont_equal Time.utc(1970, 1, 1, 0, 0)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picturehouse_uk
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Andy Croll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,29 +127,24 @@ files:
 - lib/picturehouse_uk.rb
 - lib/picturehouse_uk/cinema.rb
 - lib/picturehouse_uk/film.rb
-- lib/picturehouse_uk/internal/address_parser.rb
-- lib/picturehouse_uk/internal/cinema_page.rb
-- lib/picturehouse_uk/internal/film_with_screenings_parser.rb
+- lib/picturehouse_uk/internal/parser/address.rb
+- lib/picturehouse_uk/internal/parser/screenings.rb
 - lib/picturehouse_uk/internal/title_sanitizer.rb
 - lib/picturehouse_uk/internal/website.rb
 - lib/picturehouse_uk/screening.rb
 - lib/picturehouse_uk/version.rb
 - picturehouse_uk.gemspec
 - test/fixture_updater.rb
-- test/fixtures/address-fragments/duke-of-yorks.html
-- test/fixtures/address-fragments/hackney-picturehouse.html
 - 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/cinema/Dukes_At_Komedia.html
+- test/fixtures/cinema/Phoenix_Picturehouse.html
 - test/fixtures/home.html
+- test/fixtures/info/Duke_Of_Yorks.html
+- test/fixtures/info/Dukes_At_Komedia.html
+- test/fixtures/info/Phoenix_Picturehouse.html
 - test/lib/picturehouse_uk/cinema_test.rb
 - test/lib/picturehouse_uk/film_test.rb
-- test/lib/picturehouse_uk/internal/address_parser_test.rb
-- test/lib/picturehouse_uk/internal/cinema_page_test.rb
-- test/lib/picturehouse_uk/internal/film_with_screenings_parser_test.rb
+- test/lib/picturehouse_uk/internal/parser/screenings_test.rb
 - test/lib/picturehouse_uk/internal/title_sanitizer_test.rb
 - test/lib/picturehouse_uk/internal/website_test.rb
 - test/lib/picturehouse_uk/screening_test.rb
@@ -182,20 +177,16 @@ specification_version: 4
 summary: It's a scraper, but a nice one
 test_files:
 - test/fixture_updater.rb
-- test/fixtures/address-fragments/duke-of-yorks.html
-- test/fixtures/address-fragments/hackney-picturehouse.html
 - 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/cinema/Dukes_At_Komedia.html
+- test/fixtures/cinema/Phoenix_Picturehouse.html
 - test/fixtures/home.html
+- test/fixtures/info/Duke_Of_Yorks.html
+- test/fixtures/info/Dukes_At_Komedia.html
+- test/fixtures/info/Phoenix_Picturehouse.html
 - test/lib/picturehouse_uk/cinema_test.rb
 - test/lib/picturehouse_uk/film_test.rb
-- test/lib/picturehouse_uk/internal/address_parser_test.rb
-- test/lib/picturehouse_uk/internal/cinema_page_test.rb
-- test/lib/picturehouse_uk/internal/film_with_screenings_parser_test.rb
+- test/lib/picturehouse_uk/internal/parser/screenings_test.rb
 - test/lib/picturehouse_uk/internal/title_sanitizer_test.rb
 - test/lib/picturehouse_uk/internal/website_test.rb
 - test/lib/picturehouse_uk/screening_test.rb

data/lib/picturehouse_uk/internal/address_parser.rb

@@ -1,72 +0,0 @@
-module PicturehouseUk
-  # @api private
-  module Internal
-    # Parses a chunk of HTML to derive address
-    class AddressParser
-      # CSS for address lines
-      ADDRESS_LINES_CSS = '.cinemaListBox'
-
-      # regular expression for postal code
-      POSTCODE_REGEX = /[A-Z]{1,2}\d{1,2}[A-Z]?\s\d{1,2}[A-Z]{1,2}/
-
-      # @param [String] node the HTML to parse into an address
-      # @return [PicturehouseUk::Internal::AddressParser]
-      def initialize(html)
-        @html = html
-      end
-
-      # @return [Hash] contains :street_address, :extended_address, :locality,
-      # :postal_code, :country
-      # @note Uses the address naming from http://microformats.org/wiki/adr
-      def address
-        {
-          street_address: array[0],
-          extended_address: array.length > 3 ? array[1] : nil,
-          locality: array[-2],
-          postal_code: array[-1],
-          country: 'United Kingdom'
-        }
-      end
-
-      private
-
-      def array
-        @array ||= begin
-          if standard?
-            lines[0..postal_code_index(lines)]
-          else
-            # this is a horrendous hack for Hackney Picturehouse
-            doc.css('p').to_s.split('Box Office')[0].split('<br> ')[1..-1]
-          end
-        end
-      end
-
-      def doc
-        @doc ||= Nokogiri::HTML(@html)
-      end
-
-      def matched_lines
-        @matched_lines ||= begin
-          matched = doc.css(ADDRESS_LINES_CSS).map { |n| n.children[0].to_s }
-          matched.reject { |e| e == '' }
-        end
-      end
-
-      def postal_code_index(array)
-        array.index { |element| element.match(POSTCODE_REGEX) }
-      end
-
-      def lines
-        if matched_lines.length > 0 && matched_lines[0].match(/\d+\Z/) # komedia
-          ["#{matched_lines[0]} #{matched_lines[1]}"] + matched_lines[2..-1]
-        else
-          matched_lines
-        end
-      end
-
-      def standard?
-        lines && lines.length > 0
-      end
-    end
-  end
-end