ur-product 1.0.4 → 1.0.5

data/features/product.feature

@@ -25,3 +25,7 @@ Feature: UR Product
     Given I want the product 100001
     When I get the product
     Then it should have image
+
+  Scenario: Return list of current programs
+    When I search for current programs
+    Then the result should contain a list of products

data/features/step_definitions/product_steps.rb

@@ -35,6 +35,10 @@ When /^I get the product it should throw "([^\"]*)"$/ do |exception|
   lambda { UR::Product.find(@id) }.should raise_error(exception)
 end
 
+When /^I search for current programs$/ do
+  @current_programs = UR::Search.current_programs
+end
+
 # Then
 
 Then /^the title should be "(.*)"/ do |title|
@@ -64,3 +68,11 @@ Then /^the (.+) product should have the title "([^\"]*)"$/ do |index, title|
 
   @products[count_translations["#{index}"]].title.should == title
 end
+
+Then /^the result should contain a list of products$/ do
+  @current_programs.class.should == Array
+
+  types = @current_programs.map(&:class).uniq
+  types.length.should == 1
+  types[0].should     == UR::Product
+end

data/features/support/env.rb

@@ -12,7 +12,9 @@ FakeWeb.allow_net_connect = false
 faked_urls = [
   'http://metadata.ur.se/products/100001.json',
   'http://metadata.ur.se/products.json?ur_product_ids=100001,150423',
-  'http://assets.ur.se/id/100001/images/1.jpg'
+  'http://assets.ur.se/id/100001/images/1.jpg',
+  'http://services.ur.se/search/select?qt=current-products&rows=10&start=0&publicstreaming=NOW&fq=(search_product_type:programtv%20OR%20search_product_type:programradio)',
+  'http://metadata.ur.se/products.json?ur_product_ids=165422,166790,165412,165070,166257,165368,165367,167372,167373,165146,165008,166807,165463,164971,164976,165152,164975,164974,164973,164972'
 ]
 
 faked_urls.each do |url|

data/lib/ur/metadata_cache.rb

@@ -1,47 +1,48 @@
 require 'uri'
+require 'rest-client'
 require 'yajl'
-require 'yajl/http_stream'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR
-  # Responsible for retrieving metadata and 
+  # Responsible for retrieving metadata and
   # populating one or more UR::Product objects
   class MetadataCache
     # Setup
     if !defined?(METADATA_PRODUCT_URL)
       METADATA_PRODUCT_URL = 'http://metadata.ur.se/products'
     end
-    
+
     # Retrieve one or more products
     def self.find(id)
       if id.instance_of?(Array)
         valid_ids = []
-        
+
         id.each do |id|
           if id.to_s.match(/^1\d{5}$/)
-            valid_ids << id 
+            valid_ids << id
           else
             raise UR::InvalidProductID
           end
         end
-        
+
         url = METADATA_PRODUCT_URL + ".json?ur_product_ids=#{valid_ids.join(',')}"
       else
         raise UR::InvalidProductID if !id.to_s.match(/^1\d{5}$/)
         url = METADATA_PRODUCT_URL + "/#{id}.json"
       end
-      
+
       begin
+        url = URI.parse(url).to_s
         # Get the JSON response from the Metadata Cache
-        response = Yajl::HttpStream.get(URI.parse(url))      
-      rescue Yajl::HttpStream::HttpError
-        # Raise an invalid response exception if there was 
+        response = Yajl::Parser.parse(RestClient.get(url))
+      rescue RestClient::Exception
+        # Raise an invalid response exception if there was
         # a problem with the HTTP request
         raise UR::InvalidResponse
       end
-      
+
       # Return the response as a parsed JSON object
       response
     end
   end
-end
+end

data/lib/ur/product.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'time'
-require 'restclient'
+require 'rest-client'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR

data/lib/ur/search.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'rsolr-ext'
+require 'rest-client'
 require 'yajl'
 
 # Module for Utbildningsradion AB (http://ur.se/)
@@ -60,10 +61,11 @@ module UR
 
       url += agerange_filter(agerange)
 
-      programs = Yajl::HttpStream.get(url)
+      response = RestClient.get(url)
+      json = Yajl::Parser.parse(response)
 
-      if (programs['response']['docs'].count > 0)
-        Product.find(programs['response']['docs'].map { |d| d['id'] })
+      if (json['response']['docs'].count > 0)
+        Product.find(json['response']['docs'].map { |d| d['id'] })
       else
         []
       end

data/lib/ur/streaming.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require 'yajl/http_stream'
+require 'rest-client'
+require 'yajl'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR
@@ -26,7 +27,7 @@ module UR
     def self.search(ids)
       return [] if ids.empty?
       url = STREAMING_URL + '.json?ur_product_ids=' + ids.join(',')
-      Streaming.new(Yajl::HttpStream.get(url))
+      Streaming.new(Yajl::Parser.parse(RestClient.get(url)))
     end
   end
 end

data/lib/ur/version.rb

@@ -4,7 +4,7 @@ module UR
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ur-product
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70169394839980 !ruby/object:Gem::Requirement
+  requirement: &70260104266600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70169394839980
+  version_requirements: *70260104266600
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &70169394839480 !ruby/object:Gem::Requirement
+  requirement: &70260104266100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70169394839480
+  version_requirements: *70260104266100
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &70169394839020 !ruby/object:Gem::Requirement
+  requirement: &70260104265640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70169394839020
+  version_requirements: *70260104265640
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70169394838560 !ruby/object:Gem::Requirement
+  requirement: &70260104265180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70169394838560
+  version_requirements: *70260104265180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70169394838100 !ruby/object:Gem::Requirement
+  requirement: &70260104264720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70169394838100
+  version_requirements: *70260104264720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169394837640 !ruby/object:Gem::Requirement
+  requirement: &70260104264260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70169394837640
+  version_requirements: *70260104264260
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70169394837180 !ruby/object:Gem::Requirement
+  requirement: &70260104263800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70169394837180
+  version_requirements: *70260104263800
 description: Enables searching and fetching of Utbildningsradion products
 email: peter@c7.se
 executables: []