odeon_uk 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a93bd99698e1107ba48963d63c856bb30db8fe04
-  data.tar.gz: 0f34f24b21b31c018ee33973125cdabd6db51407
+  metadata.gz: 923b9fdff96d0fa70efea9e1f4e3e6b98ff6e13e
+  data.tar.gz: 9009c376a212f175d79ee583f99a686983e758e5
 SHA512:
-  metadata.gz: e457d07343eeac1b78ccbb80f1b1821ac83e11c8e24c6d77e8cf2ab0bffd8b4c724794b787f17f7f291f22e2c41f94baf0b80c226308680835fcfe1a6350b312
-  data.tar.gz: d96d6d0229ca9408259d1f798b3fa6ea88430a318cd7f09bc831c5c6154f79a8e95b04def2728ed5cf047dc6e130e809b8722669b461356763a83291cd0afc48
+  metadata.gz: 87307021efaed1bfc13f4b0cbf3ae0375f1b52d21412953ac64a7a7512e58a108a8206da35f6c983e9d47b45df5a77daba1a62e53a14f0f1400817bc7dfc25e6
+  data.tar.gz: ff6fcc044f3fe51a54558304bb944a050da392786b6cead54ff9bbf8ab6b35863d9c4845adfe4e4f48053828998d4a7aa78a677c1df4bc8d91a04cf33b996d5b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 3.0.4 - 2015-05-06
 
+### Fixed
+- API use for screenings
+
+## 3.0.4 - 2015-05-06
+
 ### Added
 - URLs created for api cinemas
 

data/lib/odeon_uk/api/response.rb

@@ -7,6 +7,7 @@ module OdeonUk
   module Api
     # Utility class to make calls to the odeon website
     class Response
+      # iOS app API version
       VERSION = '2.1'
 
       # cinemas information

data/lib/odeon_uk/screening.rb

@@ -34,9 +34,9 @@ module OdeonUk
     # @param [Integer] cinema_id id of the cinema on the website
     # @return [Array<OdeonUk::Screening>]
     def self.at(cinema_id)
-      cinema = { cinema_id: cinema_id, cinema_name: Cinema.new(cinema_id).name }
-
-      parser.at(cinema_id).map { |hash| new(hash.merge(cinema)) }
+      parser_class.at(cinema_id).map do |hash|
+        new(hash.merge(cinema_hash(cinema_id)))
+      end
     end
 
     # The date of the screening
@@ -60,8 +60,12 @@ module OdeonUk
 
     private
 
-    def self.parser
-      Html::Screenings
+    def self.cinema_hash(cinema_id)
+      { cinema_id: cinema_id, cinema_name: Cinema.new(cinema_id).name }
+    end
+
+    def self.parser_class
+      OdeonUk.configuration.method == :api ? Api::Screenings : Html::Screenings
     end
   end
 end

data/lib/odeon_uk/version.rb

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

data/odeon_uk.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.version       = OdeonUk::VERSION
-
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'webmock'

data/test/lib/odeon_uk/screening_test.rb

@@ -1,6 +1,6 @@
 require_relative '../../test_helper'
 
-describe OdeonUk::Screening do
+describe OdeonUk::Screening, 'html' do
   include WebsiteFixturesHelper
 
   let(:described_class) { OdeonUk::Screening }
@@ -41,3 +41,52 @@ describe OdeonUk::Screening do
     end
   end
 end
+
+describe OdeonUk::Screening, 'api' do
+  include ApiFixturesHelper
+
+  let(:described_class) { OdeonUk::Screening }
+
+  let(:website) { Minitest::Mock.new }
+
+  before do
+    WebMock.disable_net_connect!
+  end
+
+  describe '.at(cinema_id)' do
+    subject { described_class.at(71) }
+
+    before do
+      OdeonUk.configure { |config| config.method = :api }
+
+      stub_post('app-init', nil, app_init_plist)
+      film_times_plists(71).each do |name|
+        film_id = name.match(/(\d+)\.plist/)[1]
+        stub_post('film-times',
+                  { s: '71', m: film_id },
+                  film_times_plist(71, film_id))
+      end
+    end
+
+    after do
+      OdeonUk.configure { |config| config.method = :html }
+    end
+
+    it 'returns an array of screening attributes as hashes' do
+      subject.must_be_instance_of(Array)
+      subject.each do |screening|
+        screening.must_be_instance_of(described_class)
+        screening.cinema_name.must_equal('Brighton')
+        screening.cinema_id.must_equal(71)
+        screening.film_name.wont_be_nil
+        screening.showing_at.must_be_instance_of(Time)
+        screening.showing_on.must_be_instance_of(Date)
+        screening.dimension.must_match(/[23]d/)
+      end
+    end
+
+    it 'returns correct number of screenings' do
+      subject.count.must_equal 159
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odeon_uk
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Andy Croll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake