ur-product 0.9.9 → 1.0.0

data/features/step_definitions/product_steps.rb

@@ -5,7 +5,7 @@ require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 
 # UR Product
-require 'lib/ur-product'
+require 'ur-product'
 
 Before do
  @product   = nil

data/lib/ur/metadata_cache.rb

@@ -1,5 +1,6 @@
-require 'yajl/json_gem'
-require 'restclient'
+require 'uri'
+require 'yajl'
+require 'yajl/http_stream'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR
@@ -30,14 +31,17 @@ module UR
         url = METADATA_PRODUCT_URL + "/#{id}.json"
       end
       
-      # Get the JSON response from the Metadata Cache
-      response = RestClient.get(url)
-      
-      # Make sure that we got a valid response
-      raise UR::InvalidResponse if response.code != 200
+      begin
+        # 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 
+        # a problem with the HTTP request
+        raise UR::InvalidResponse
+      end
       
       # Return the response as a parsed JSON object
-      JSON.parse(response.body)
+      response
     end
   end
 end

data/lib/ur/product.rb

@@ -1,10 +1,10 @@
 require 'time'
+require 'restclient'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR
   # A product can be a tv show, a radio program or even a website
-  class Product
-    
+  class Product    
     # Setup
     if !defined?(ASSETS_URL)
       ASSETS_URL = 'http://assets.ur.se'
@@ -18,7 +18,7 @@ module UR
                 :created_at, :modified_at, :format, :duration, :aspect_ratio,
                 :product_type, :product_sub_type, :typical_age_ranges, 
                 :publication_date, :storages, :distribution_events, :difficulty, 
-                :sli, :sli_sub, :sab, :sao, :related_product_ids
+                :sli, :sli_sub, :sab, :sao, :fao, :related_product_ids
     
     def initialize(data)
       unless !data['status'].nil? && data['status'] == 404
@@ -29,7 +29,7 @@ module UR
         self.class.define_boolean_methods([
           'distribution_events', 'storages', 'typical_age_ranges', 'languages',
           'duration', 'difficulty', 'producing_company', 'production_year', 
-          'obsolete_order_id', 'sli', 'sli_sub', 'sab', 'sao'
+          'obsolete_order_id', 'sli', 'sli_sub', 'sab', 'sao', 'fao'
         ])
         self.class.define_relation_boolean_methods([
           'siblings', 'packageseries', 'packageusageseries', 'website', 
@@ -89,7 +89,7 @@ module UR
         'format', 'duration', 'aspect_ratio',
         'product_type', 'product_sub_type', 
         'typicalagerange', 'difficulty', 
-        'sli', 'sli_sub', 'sab', 'sao'
+        'sli', 'sli_sub', 'sab', 'sao', 'fao'
       ]
       
       field_names = lambda do |name|

data/lib/ur/search.rb

@@ -1,4 +1,5 @@
 require 'rsolr-ext'
+require 'yajl'
 
 # Module for Utbildningsradion AB (http://ur.se/)
 module UR  

data/lib/ur/version.rb

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

data/lib/ur-product.rb

@@ -5,6 +5,7 @@ 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'
+require File.dirname(__FILE__) + '/ur/version'
 
 module UR
   class InvalidProductID < Exception

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ur-product
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 9
-  version: 0.9.9
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - lib/ur/product/storage.rb
 - lib/ur/search.rb
 - lib/ur/streaming.rb
+- lib/ur/version.rb
 - features/product.feature
 - features/support/env.rb
 - features/step_definitions/product_steps.rb