ur-product 0.3 → 0.4

data/lib/ur/metadata_cache.rb

@@ -7,8 +7,10 @@ module UR
   # populating one or more UR::Product objects
   class MetadataCache
     # Setup
-    METADATA_PRODUCT_URL = 'http://metadata.ur.se/products'
-     
+    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)

data/lib/ur/product.rb

@@ -2,23 +2,31 @@
 module UR
   # A product can be a tv show, a radio program or even a website
   class Product
+    
     # Setup
-    ASSETS_URL = 'http://assets.ur.se'
+    if !defined?(ASSETS_URL)
+      ASSETS_URL = 'http://assets.ur.se'
+    end
+    
     attr_reader :related_products,
-                :ur_product_id, :title, :language, 
+                :ur_product_id, :title, :languages, 
                 :description, :easy_to_read_description,
-                :obsoleteorderid, :status, :productionyear,
-                :maintitle, :remainderoftitle, :producingcompany,
-                :created, :modified, :format, :duration, :aspect_ratio,
-                :product_type, :product_sub_type, :typical_age_range, 
-                :pubdate, :storages, :distribution_events
+                :obsolete_order_id, :status, :production_year,
+                :main_title, :remainder_of_title, :producing_company,
+                :created_at, :modified_at, :format, :duration, :aspect_ratio,
+                :product_type, :product_sub_type, :typical_age_ranges, 
+                :publication_date, :storages, :distribution_events, :sab, :sao
     
     def initialize(data)
       product_data = data.include?('product') ? data['product'] : data
       relations = data.include?('relations') ? data['relations'] : []
       populate(product_data, relations)
       
-      self.class.define_boolean_methods(['distribution_events', 'storages'])
+      self.class.define_boolean_methods([
+        'distribution_events', 'storages', 'typical_age_ranges', 'languages',
+        'duration', 'difficulty', 'producing_company', 'obsolete_order_id',
+        'sab', 'sao'
+      ])
       self.class.define_relation_boolean_methods(['siblings'])
     end
     
@@ -37,7 +45,7 @@ module UR
       names.each do |name|
         define_method("has_#{name}?") do
           instance_variable = instance_variable_get("@#{name}")            
-          (!instance_variable.nil? || !instance_variable.empty?)
+          !(instance_variable.nil? || instance_variable.empty?)
         end
       end
     end
@@ -68,16 +76,25 @@ module UR
         'created', 'modified', 'pubdate', 
         'format', 'duration', 'aspect_ratio',
         'product_type', 'product_sub_type', 
-        'typical_age_range'
+        'typicalagerange', 'sab', 'sao'
       ]
       
       field_names = lambda do |name|
         renamed = { 
-          'id' => 'ur_product_id', 
+          'id' => 'ur_product_id',
+          'maintitle' => 'main_title',
+          'remainderoftitle' => 'remainder_of_title',
           'easytoreaddescription' => 'easy_to_read_description',
-          'typicalagerange' => 'typical_age_range'
+          'producingcompany' => 'producing_company',
+          'created' => 'created_at',
+          'modified' => 'modified_at',
+          'pubdate' => 'publication_date',
+          'obsoleteorderid' => 'obsolete_order_id',
+          'typicalagerange' => 'typical_age_ranges',
+          'productionyear' => 'production_year',
+          'language' => 'languages'
         }
-        (renamed.include?(name)) ? renamed[name] : name
+        (renamed.keys.include?(name)) ? renamed[name] : name
       end
       
       standard_fields.each do |field|
@@ -89,6 +106,10 @@ module UR
           value = product_data[field][lang]
         end
         
+        if ['pubdate', 'created', 'modified'].include? field
+          value = Time.parse(value)
+        end
+        
         instance_variable_set("@#{field_names.call(field)}", value)
       end
       
@@ -117,12 +138,36 @@ module UR
         end
       end
     end
+    
+    def humanized_duration
+      if matched = duration.match(/^(\d\d):(\d\d):(\d\d)/)
+        (full,h,m,s) = matched.to_a
+        if h == '00'
+          "#{m} minuter"
+        elsif h == '00' && m == '00'
+          'Under en minut'
+        else
+          "#{h.to_i}:#{m}"
+        end
+      else
+        duration
+      end
+    end
 
-    def has_image?
+    def full_type
+      broadcast_format = (product_type == 'package') ? "-#{format}" : ''
+      (product_sub_type.nil?) ? product_type : "#{product_type}#{product_sub_type}#{broadcast_format}"
+    end
+    
+    def image_url(number = 1, size = '')
+      "#{ASSETS_URL}/id/#{ur_product_id}/images/#{number}#{size}.jpg"
+    end
+  
+    def has_image?(number = 1, size = '')
       return @has_image if !@has_image.nil?
       
       begin
-        url = "#{ASSETS_URL}/id/#{ur_product_id}/images/1.jpg"
+        url = "#{ASSETS_URL}/id/#{ur_product_id}/images/#{number}#{size}.jpg"
         @has_image = (RestClient.head(url).headers[:x_ur_http_status] == "200")
       rescue RestClient::ResourceNotFound
         @has_image = false

data/lib/ur/search.rb

@@ -5,7 +5,10 @@ module UR
   # Search for products and populate from the metadata cache
   class Search
     # Setup
-    SEARCH_SERVICE_URL = 'http://services.ur.se/search'
+    if !defined?(SEARCH_SERVICE_URL)
+      SEARCH_SERVICE_URL = 'http://services.ur.se/search'
+    end
+    
     attr_reader :products, :solr, :facets
     
     def initialize(solr_params)

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +02:00
+date: 2010-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency