bbc_redux 0.4.5.pre → 0.4.6.pre

data/Rakefile

@@ -19,6 +19,11 @@ task :coverage do
   sh 'open coverage/index.html'
 end
 
+desc 'Open IRB with library loaded'
+task :console do
+  sh 'irb -Ilib -r bbc/redux'
+end
+
 ################################################################################
 # Documentation Tasks
 

data/lib/bbc/redux/client.rb

@@ -142,18 +142,25 @@ module BBC
 
       # Return all programmes for the schedule date, everything from 0600 for
       # 24 hours afterwards. May make multiple requests to backend to retreive
-      # all the data
+      # all the data.
       #
       # @param [Date,DateTime,Time] date query this schedule date
       # @param [String,Array<String>,Channel,Array<Channel>,nil] channel
       #   optionally limit schedule query to one or an array of channels
       # @return [Array<BBC::Redux::Asset>] the list of assets broadcast on date
       def schedule(date, channels = nil)
+
+        date    = DateTime.parse date.strftime('%Y-%m-%dT06:00:00Z00:00')
+
         query   = {
-          :date     => date,
-          :channels => channels,
-          :offset   => 0,
-          :limit    => 100,
+          :after      => date.strftime('%Y-%m-%dT%H:%M:%S'),
+          :before     => ( date + 1 ).strftime('%Y-%m-%dT05:59:59'),
+          :channel    => channels,
+          :offset     => 0,
+          :limit      => 100,
+          :sort_by    =>'time',
+          :sort_order => 'ascending',
+          :repeats    => true,
         }
 
         results = search(query)
@@ -175,7 +182,7 @@ module BBC
           end
         end
 
-        assets.sort { |a,b| b.start - a.start }
+        assets
       end
 
       # Perform a search of Redux Archive
@@ -188,9 +195,9 @@ module BBC
       #   multiple channels.
       # @option params [Integer] :limit number of results to return. Default 10
       # @option params [Integer] :offset offset of the start of results
-      # @option params [Date,DateTime,Time] :before only return braodcasts
+      # @option params [Date,DateTime,Time] :before only return broadcasts
       #   before date
-      # @option params [Date,DateTime,Time] :after only return braodcasts after
+      # @option params [Date,DateTime,Time] :after only return broadcasts after
       #   date
       # @option params [Date,DateTime,Time] :date everything from 0600 on given
       #   date for 24hrs
@@ -198,6 +205,9 @@ module BBC
       # @option params [Integer] :shorter constraint on the duration, in seconds
       # @option params [String] :programme_crid TV Anytime CRID
       # @option params [String] :series_crid TV Anytime CRID
+      # @option params [TrueClass,FalseClass] :repeats include repeats
+      # @option params [String] :sort_by 'time' or nil
+      # @option params [String] :sort_order 'ascending' or 'descending'
       # @see BBC::Redux::SearchResults
       # @return [BBC::Redux::SearchResults] search results
       def search(params = {})
@@ -207,6 +217,10 @@ module BBC
             val.strftime('%Y-%m-%dT%H:%M:%S')
           elsif val.class == Channel
             val.name
+          elsif val.class == TrueClass
+            '1'
+          elsif val.class == FalseClass
+            '0'
           else
             val.to_s
           end
@@ -269,7 +283,7 @@ module BBC
       def url_for(action)
         case action
         when :asset
-          host + '/asset/details/extended'
+          host + '/asset/details'
         when :channels
           host + '/asset/channel/available'
         when :channel_categories

data/lib/bbc/redux/version.rb

@@ -2,7 +2,7 @@ module BBC
   module Redux
 
     # Library version
-    VERSION = '0.4.5.pre'
+    VERSION = '0.4.6.pre'
 
   end
 end

data/spec/bbc/redux/client_spec.rb

@@ -111,7 +111,7 @@ describe BBC::Redux::Client do
 
     it 'takes json from the backend HTTP API and generates an asset object' do
       expect(http_client).to \
-        receive(:post).with('https://i.bbcredux.com/asset/details/extended', {
+        receive(:post).with('https://i.bbcredux.com/asset/details', {
           :body           => { :reference => reference, :token => token },
           :followlocation => true,
         }).and_return(resp)
@@ -123,7 +123,7 @@ describe BBC::Redux::Client do
 
     it 'works when given a UUID rather than a disk reference' do
       expect(http_client).to \
-        receive(:post).with('https://i.bbcredux.com/asset/details/extended', {
+        receive(:post).with('https://i.bbcredux.com/asset/details', {
           :body           => { :uuid => uuid, :token => token },
           :followlocation => true,
         }).and_return(resp)
@@ -212,14 +212,22 @@ describe BBC::Redux::Client do
     it 'passes params to backend HTTP API and generates results object' do
       expect(http_client).to \
         receive(:post).with('https://i.bbcredux.com/asset/search', {
-          :body           => { :q => 'foo', :longer => '200', :token => token },
+          :body           => {
+            :q      => 'foo',
+            :longer => '200',
+            :token  => token,
+            :true   => '1',
+            :false  => '0',
+          },
           :followlocation => true,
         }).and_return(resp)
 
-      results = instance.search(:q => 'foo', :longer => 200)
+      query   = { :q => 'foo', :longer => 200, :true => true, :false => false }
+
+      results = instance.search( query )
 
       expect(results.class).to be(BBC::Redux::SearchResults)
-      expect(results.query).to eq(:q => 'foo', :longer => 200)
+      expect(results.query).to eq( query )
     end
 
     context 'channel object based parameters' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbc_redux
 version: !ruby/object:Gem::Version
-  version: 0.4.5.pre
+  version: 0.4.6.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2431091401732504293
+      hash: 1338354639053621810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: