odeon_uk 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDQxYWI5ZWRlNDQ1YThkYjc2NzU5MWJlNTA5ZTM3MGQyMzE3ZDVhOA==
-  data.tar.gz: !binary |-
-    ZGRjMjg4Y2M5YTMxZDU5MWQ2ZDIxZTUyMDAyODk3ZWFlZDcwODdmOA==
+SHA1:
+  metadata.gz: 787cfcc04a2f7849b9c3304f21cd16d7eb81b996
+  data.tar.gz: 07102569cea2b7440d777efb4498ba68531ca5c9
 SHA512:
-  metadata.gz: !binary |-
-    YjQ0ZGEzOTAwNzczOWVkZmY1NjkzODYyYThiMWQ4NGYxNjMzOWUxOGEzYzAw
-    YzQwYzE3YzQ4ZmJhZWU2MTdmMWI2ZjZmMjUxZDQ0OTA1MWY5N2VkMDVlZjMz
-    ZjNlYzdjOTdhNzk2M2NmYWMzYmIwZTVhMjBkODcyMTJkYTEyOTc=
-  data.tar.gz: !binary |-
-    NjdmNWExNzI5NWJhYTg4YjQzOTdkMTRkYjQ5ZjVjNzMyOTM2YWM3NTY5M2Vk
-    ZmNhYTVmZTdhMmZhNWU1M2JjZTRiYzA4YWMzZDFhY2Q5MzYyMTZmNWIxMTlk
-    YjYyODFjMWNiNzZlZWQ2OWQxMjRhZGUyOTM2OWQ3MGU1OTJmMTQ=
+  metadata.gz: 95d5c1d98b49227629ba71b721e6a85a5a9b17a896ed96fca5069aaddb92851b000e4020fe54e5b38492d056e6d367e255a5afeb25a6e184e9c5b4b383d779aa
+  data.tar.gz: 5fd9744901a138189b9bf8267b67c5fa9523640b97f0d964e24c28992f2261b82cafe3baa9ddb444783d80b942226303701c486d15b8cd762005b1c257972b24

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+
+- Added changelog
+
+## 1.1.3, _8th Nov 2013_
+
+- MIT license
+
+## 1.1.2, _6th Nov 2013_
+
+- version bump for fixing CI
+- using UTC parsing
+
+## 1.1.1, _6th Nov 2013_
+
+- version bump for fixing CI
+
+## 1.1.0, _5th Nov 2013_
+
+First ready-for-public release
+
+- added booking url to screenings
+- screenings created with UTC Time objects not strings
+- Removed 'London -' prefix from some cinema names
+- added cinema addresses
+
+## 1.0.0
+
+- Get films and screenings out of a cinema

data/README.md

@@ -2,6 +2,7 @@
 
 A simple gem to parse the [Odeon UK website](http://odeon.co.uk) and spit out useful formatted info.
 
+[![Gem Version](https://badge.fury.io/rb/odeon_uk.png)](http://badge.fury.io/rb/odeon_uk)
 [![Code Climate](https://codeclimate.com/github/andycroll/odeon_uk.png)](https://codeclimate.com/github/andycroll/odeon_uk)
 [![Build Status](https://travis-ci.org/andycroll/odeon_uk.png?branch=master)](https://travis-ci.org/andycroll/odeon_uk)
 
@@ -49,13 +50,13 @@ cinema.films
 #=> [<OdeonUk::Film name="Iron Man 3">, <OdeonUk::Film name="Star Trek: Into Darkness">]
 
 cinema.screenings
-#=> [<OdeonUk::Screening film="About Time" when="2013-09-09 11:00 UTC" varient="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" varient="kids">, <OdeonUk::Screening ..>, <OdeonUk::Screening ...>]
+#=> [<OdeonUk::Screening film="About Time" when="2013-09-09 11:00 UTC" variant="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" variant="kids">, <OdeonUk::Screening ..>, <OdeonUk::Screening ...>]
 
 cinema.screenings_of 'Iron Man 3'
-#=> [<OdeonUk::Screening film="Iron Man 3" when="2013-09-09 11:00 UTC" varient="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" varient="kids">]
+#=> [<OdeonUk::Screening film="Iron Man 3" when="2013-09-09 11:00 UTC" variant="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" variant="kids">]
 
 cinema.screenings_of <OdeonUk::Film name="Iron Man 3">
-#=> [<OdeonUk::Screening film="Iron Man 3" when="2013-09-09 11:00 UTC" varient="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" varient="kids">]
+#=> [<OdeonUk::Screening film="Iron Man 3" when="2013-09-09 11:00 UTC" variant="3d">, <OdeonUk::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" variant="kids">]
 ```
 
 ### Film

data/lib/odeon_uk/cinema.rb

@@ -78,6 +78,16 @@ module OdeonUk
       end.uniq
     end
 
+    # The name of the cinema including the brand
+    # @return [String]
+    # @example
+    #   cinema = OdeonUk::Cinema.find('71')
+    #   cinema.full_name
+    #   #=> 'Odeon Brighton'
+    def full_name
+      "#{brand} #{name}"
+    end
+
     # The locality (town) of the cinema
     # @return [String]
     # @example
@@ -104,7 +114,7 @@ module OdeonUk
     # @example
     #   cinema = OdeonUk::Cinema.find('71')
     #   cinema.screenings
-    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." varient="...">, <OdeonUk::Screening ...>]
+    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." variant="...">, <OdeonUk::Screening ...>]
     def screenings
       film_nodes.map do |node|
         parser = OdeonUk::Internal::FilmWithScreeningsParser.new node.to_s
@@ -122,10 +132,10 @@ module OdeonUk
     # @example
     #   cinema = OdeonUk::Cinema.find('71')
     #   cinema.screenings_of('Iron Man 3')
-    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." varient="...">, <OdeonUk::Screening ...>]
+    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." variant="...">, <OdeonUk::Screening ...>]
     #   iron_man_3 = OdeonUk::Film.new "Iron Man 3"
     #   cinema.screenings_of(iron_man_3)
-    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." varient="...">, <OdeonUk::Screening ...>]
+    #   #=> [<OdeonUk::Screening film_name="Iron Man 3" cinema_name="Brighton" when="..." variant="...">, <OdeonUk::Screening ...>]
     def screenings_of film
       film_name = (film.is_a?(OdeonUk::Film) ? film.name : film)
       screenings.select { |s| s.film_name == film_name }

data/lib/odeon_uk/internal/film_with_screenings_parser.rb

@@ -50,17 +50,17 @@ module OdeonUk
       #   }
       def showings
         tz = TZInfo::Timezone.get('Europe/London')
-        @nokogiri_html.css('.times-all.accordion-group').inject({}) do |result, varient_node|
-          varient = varient_node.css('.tech a').text.gsub('in ', '').upcase
+        @nokogiri_html.css('.times-all.accordion-group').inject({}) do |result, variant_node|
+          variant = variant_node.css('.tech a').text.gsub('in ', '').upcase
 
-          times_url = varient_node.css('.performance-detail').map do |screening_node|
+          times_url = variant_node.css('.performance-detail').map do |screening_node|
             [
               tz.local_to_utc(Time.parse(screening_node['title'].match(/\d+\/\d+\/\d+ \d{2}\:\d{2}/).to_s + ' UTC')),
               "http://www.odeon.co.uk#{screening_node['href']}"
             ]
           end
 
-          result.merge(varient => times_url)
+          result.merge(variant => times_url)
         end
       end
     end

data/lib/odeon_uk/screening.rb

@@ -12,15 +12,15 @@ module OdeonUk
     # @return [Time] the UTC time of the screening
     attr_reader :when
     # @return [String] the type of screening (2D, 3D, IMAX...)
-    attr_reader :varient
+    attr_reader :variant
 
     # @param [String] film_name the film name
     # @param [String] the cinema name
     # @param [Time] time datetime of the screening (UTC preferred)
     # @param [String] booking_url direct link to the booking page for this screening
-    # @param [String] varient the type of showing (e.g. 3d/baby/live)
-    def initialize(film_name, cinema_name, time, booking_url=nil, varient=nil)
-      @cinema_name, @film_name, @varient = cinema_name, film_name, varient
+    # @param [String] variant the type of showing (e.g. 3d/baby/live)
+    def initialize(film_name, cinema_name, time, booking_url=nil, variant=nil)
+      @cinema_name, @film_name, @variant = cinema_name, film_name, variant
       @booking_url = booking_url
       @when = time.utc? ? time : TZInfo::Timezone.get('Europe/London').local_to_utc(time)
     end
@@ -30,5 +30,11 @@ module OdeonUk
     def date
       @when.to_date
     end
+
+    # @deprecated Please use {#variant} instead, I can't spell
+    def varient
+      warn "Please use #variant instead, I can't spell"
+      variant
+    end
   end
 end

data/lib/odeon_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for http://www.odeon.co.uk
-# @version 1.1.3
+# @version 1.1.4
 module OdeonUk
   # Gem version
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/odeon_uk.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{An API to pull movie information from the ODEON.co.uk website}
   gem.summary       = %q{It's a scraper, but a nice one}
   gem.homepage      = "http://github.com/andycroll/odeon_uk"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/lib/odeon_uk/cinema_test.rb

@@ -58,7 +58,8 @@ describe OdeonUk::Cinema do
         subject.slug.must_equal 'leicester-square'
         subject.url.must_equal 'http://www.odeon.co.uk/cinemas/london_leicester_square/105/'
       end
-    end  end
+    end
+  end
 
   describe '.new id, name, url' do
     it 'stores id, name, slug and url' do
@@ -133,6 +134,23 @@ describe OdeonUk::Cinema do
     end
   end
 
+  describe '#full_name' do
+    subject { cinema.full_name }
+
+    describe 'simple name (brighton)' do
+      let(:cinema) { OdeonUk::Cinema.new('71', 'Brighton', '/cinemas/brighton/71/') }
+
+      before do
+        brighton_cinema_body = File.read( File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'odeon-brighton.html') )
+        stub_request(:get, 'http://www.odeon.co.uk/cinemas/brighton/71/').to_return( status: 200, body: brighton_cinema_body, headers: {} )
+      end
+
+      it 'returns the brand in the name' do
+        subject.must_equal 'Odeon Brighton'
+      end
+    end
+  end
+
   describe '#locality' do
     describe 'short address' do
       let(:cinema) { OdeonUk::Cinema.new('71', 'Brighton', '/cinemas/brighton/71/') }
@@ -231,14 +249,14 @@ describe OdeonUk::Cinema do
       subject.last.when.must_equal Time.utc(2013, 9, 19, 19, 40, 0)
     end
 
-    it 'returns screening objects with correct varients' do
+    it 'returns screening objects with correct variants' do
       subject.each do |screening|
-        screening.varient.wont_be_nil
-        screening.varient.must_match /[23]D/
+        screening.variant.wont_be_nil
+        screening.variant.must_match /[23]D/
       end
 
-      subject.first.varient.must_equal '2D'
-      subject.last.varient.must_equal '2D'
+      subject.first.variant.must_equal '2D'
+      subject.last.variant.must_equal '2D'
     end
 
     it 'returns screening objects with booking urls' do

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

@@ -108,7 +108,7 @@ describe OdeonUk::Internal::FilmWithScreeningsParser do
     describe 'passed valid film html' do
       let(:film_html) { read_film_html('about-time') }
 
-      it 'returns an hash of varients => array of times' do
+      it 'returns an hash of variants => array of times' do
         subject.must_be_instance_of Hash
         subject.each do |key, value|
           key.must_equal '2D'
@@ -133,10 +133,10 @@ describe OdeonUk::Internal::FilmWithScreeningsParser do
       end
     end
 
-    describe 'passed valid film html for multi varients' do
+    describe 'passed valid film html for multi variants' do
       let(:film_html) { read_film_html('thor-the-dark-world', 'manchester') }
 
-      it 'returns an hash of varients => array of times' do
+      it 'returns an hash of variants => array of times' do
         subject.must_be_instance_of Hash
         subject.keys.must_equal ['2D', 'IMAX 3D', '3D']
         subject.values.each do |value|

data/test/lib/odeon_uk/screening_test.rb

@@ -4,23 +4,23 @@ describe OdeonUk::Screening do
 
   before { WebMock.disable_net_connect! }
 
-  describe '#new film_name, cinema_name, date, time, varient' do
+  describe '#new film_name, cinema_name, date, time, variant' do
     it 'stores film_name, cinema_name & when (in UTC)' do
       screening = OdeonUk::Screening.new 'Iron Man 3', 'Brighton', Time.parse('2013-09-12 12:00') # non-UTC time
       screening.film_name.must_equal 'Iron Man 3'
       screening.cinema_name.must_equal 'Brighton'
       screening.when.must_equal Time.utc(2013, 9, 12, 11, 0)
       screening.booking_url.must_equal nil
-      screening.varient.must_equal nil
+      screening.variant.must_equal nil
     end
 
-    it 'stores varient if passed' do
+    it 'stores variant if passed' do
       screening = OdeonUk::Screening.new 'Iron Man 3', 'Brighton', Time.utc(2013, 9, 12, 11, 0), nil, '3d'
       screening.film_name.must_equal 'Iron Man 3'
       screening.cinema_name.must_equal 'Brighton'
       screening.when.must_equal Time.utc(2013, 9, 12, 11, 0)
       screening.booking_url.must_equal nil
-      screening.varient.must_equal '3d'
+      screening.variant.must_equal '3d'
     end
 
     it 'stores booking_url if passed' do
@@ -30,7 +30,7 @@ describe OdeonUk::Screening do
       screening.when.must_equal Time.utc(2013, 9, 12, 11, 0)
       screening.when.must_equal Time.utc(2013, 9, 12, 11, 0)
       screening.booking_url.must_equal 'http://booking_url'
-      screening.varient.must_equal nil
+      screening.variant.must_equal nil
     end
   end
 
@@ -41,4 +41,13 @@ describe OdeonUk::Screening do
       subject.must_equal Date.new(2013, 9, 12)
     end
   end
+
+  describe '#varient (DEPRECATED)' do
+    subject { screening.varient }
+    let(:screening) { OdeonUk::Screening.new('Iron Man 3', 'Brighton', Time.utc(2013, 9, 12, 11, 0), nil, '3d') }
+
+    it 'should return variant' do
+      subject.must_equal '3d'
+    end
+  end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: odeon_uk
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Andy Croll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An API to pull movie information from the ODEON.co.uk website
@@ -101,9 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rdoc_options
-- .travis.yml
+- ".gitignore"
+- ".rdoc_options"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,7 +141,8 @@ files:
 - test/lib/odeon_uk/version_test.rb
 - test/test_helper.rb
 homepage: http://github.com/andycroll/odeon_uk
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -148,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: It's a scraper, but a nice one