ur-product 0.9.1 → 0.9.2

data/README.markdown

@@ -32,3 +32,4 @@ API wrapper for the [Utbildningsradion](http://ur.se) product services.
  * [RSolr](http://github.com/mwmitchell/rsolr)
  * [RSolr-ext](http://github.com/mwmitchell/rsolr-ext)
  * [RestClient](http://github.com/archiloque/rest-client)
+ * [YAJL](http://github.com/lloyd/yajl)

data/features/product.feature

@@ -24,8 +24,4 @@ Feature: UR Product
   Scenario: Check if a product has an image
     Given I want the product 100001
     When I get the product
-    Then it should have image
-  
-#   Scenario: Boolean search for sab:H* should return 3 or more hits
-#     Given I search for "sab:H*"
-#     Then I should get 3 or more hits
+    Then it should have image

data/features/step_definitions/product_steps.rb

@@ -22,22 +22,6 @@ Given /^I want the products (.+)$/ do |ids|
   @ids = ids.split(' and ')
 end
 
-Given /^I search for "([^\"]*)"$/ do |query|
-  @search = UR::Product.search({ 
-    :per_page => 10,
-    :qt => 'internalfacets',
-    :defType => 'lucene',
-    :q => query
-  })
-
-  puts @search.inspect
-
-end
-
-Then /^I should get (\d+) or more hits$/ do |num_hits|
-  @search.num_hits.should >= num_hits
-end
-
 # When
 
 When /^I get the product$/ do

data/features/support/env.rb

@@ -8,8 +8,7 @@ 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://services.ur.se/search/select?qt=internalfacets&wt=ruby&defType=lucene&q=sab%3AH%2A&rows=10'
+  'http://assets.ur.se/id/100001/images/1.jpg'
 ]
 
 faked_urls.each do |url|

data/lib/ur/streaming.rb

@@ -0,0 +1,30 @@
+require 'yajl/http_stream'
+
+# Module for Utbildningsradion AB (http://ur.se/)
+module UR
+  # Streaming information for mp4/mp3 files
+  class Streaming
+    # Setup
+    if !defined?(STREAMING_URL)
+      STREAMING_URL = 'http://metadata.ur.se/streaming'
+    end
+    
+    def initialize(data)
+      @data = data
+    end
+    
+    def [](product)
+      if product.respond_to? :ur_product_id
+        @data[product.ur_product_id.to_s]
+      else
+        @data[product.to_s]
+      end
+    end
+    
+    def self.search(ids)
+      return [] if ids.empty?
+      url = STREAMING_URL + '.json?ur_product_ids=' + ids.join(',')
+      Streaming.new(Yajl::HttpStream.get(url))
+    end
+  end
+end

data/lib/ur-product.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/ur/product/distribution_event.rb'
 require File.dirname(__FILE__) + '/ur/product/related_product_id.rb'
 require File.dirname(__FILE__) + '/ur/product/storage.rb'
 require File.dirname(__FILE__) + '/ur/search'
+require File.dirname(__FILE__) + '/ur/streaming'
 
 module UR
   class InvalidProductID < Exception

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ur-product
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +02:00
+date: 2010-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 7
@@ -35,9 +38,11 @@ dependencies:
   name: rsolr
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 0
         - 12
@@ -49,9 +54,11 @@ dependencies:
   name: rsolr-ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 0
         - 12
@@ -63,9 +70,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -92,6 +101,7 @@ files:
 - lib/ur/product/related_product_id.rb
 - lib/ur/product/storage.rb
 - lib/ur/search.rb
+- lib/ur/streaming.rb
 - features/product.feature
 - features/support/env.rb
 - features/step_definitions/product_steps.rb
@@ -105,23 +115,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ur-product
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: API wrapper for the Utbildningsradion product services