ur-product 0.2 → 0.3

data/README.markdown

@@ -21,7 +21,7 @@ API wrapper for the [Utbildningsradion](http://ur.se) product services.
     require 'ur-product'
     UR::Product.search({
       :queries => 'samtid',
-      :filter => { :search_product_type => 'programtv' },
+      :filters => { :search_product_type => 'programtv' },
       :page => 1,
       :per_page => 5,
       :publicstreaming => 'NOW'

data/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end

data/features/product.feature

@@ -0,0 +1,27 @@
+# language: en
+Feature: UR Product
+  As a product
+  I want to be able to retrieve my data from the Metadata Cache
+
+  Scenario: Product with siblings
+    Given I want the product 100001
+    When I get the product
+    Then the title should be "Antarktis : En hotad kontinent"
+    And it should have relations
+    And it should have siblings
+    And one title in siblings should be "Antarktis : Ett vittne om framtiden"
+    
+  Scenario: Invalid ID
+    Given I want the product 99991
+    When I get the product it should throw "UR::InvalidProductID"
+    
+  Scenario: Multiple products
+    Given I want the products 100001 and 150423
+    When I get the products
+    Then the result should contain 2 products
+    And the second product should have the title "Vetenskapslandet"
+  
+  Scenario: Check if a product has an image
+    Given I want the product 100001
+    When I get the product
+    Then it should have image

data/features/step_definitions/product_steps.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+# Cucumber
+require 'spec/expectations'
+require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+
+# UR Product
+require 'lib/ur-product'
+
+Before do
+ @product   = nil
+ @products  = nil
+ @result    = nil
+end
+
+# Given
+Given /^I want the product (\d+)$/ do |id|
+  @id = id
+end
+
+Given /^I want the products (.+)$/ do |ids|
+  @ids = ids.split(' and ')
+end
+
+# When
+
+When /^I get the product$/ do
+  @product = UR::Product.find(@id)
+end
+
+When /^I get the products$/ do
+  @products = UR::Product.find(@ids)
+end
+
+When /^I get the product it should throw "([^\"]*)"$/ do |exception|
+  lambda { UR::Product.find(@id) }.should raise_error(exception)
+end
+
+# Then
+
+Then /^the title should be "(.*)"/ do |title|
+  @product.title.should == title 
+end
+
+Then /^it should have (.*)/ do |boolean_method|
+  @product.send("has_#{boolean_method}?").should == true
+end
+
+Then /^one (.*) in (.*) should be "(.*)"$/ do |field, method, value|
+  values = []
+  
+  @product.send(method).each do |product| 
+    values << product.send(field)
+  end
+  
+  values.include?(value).should be(true)
+end
+
+Then /^the result should contain (\d+) products$/ do |expected_size|
+  @products.size.should == expected_size.to_i
+end
+
+Then /^the (.+) product should have the title "([^\"]*)"$/ do |index, title|
+  count_translations = { 'first' => 0, 'second' => 1 }
+  
+  @products[count_translations["#{index}"]].title.should == title
+end

data/features/support/env.rb

@@ -0,0 +1,18 @@
+require 'spec/expectations'
+
+# FakeWeb
+require 'fakeweb'
+
+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'
+]
+
+faked_urls.each do |url|
+  page = `curl -is #{url}`
+  FakeWeb.register_uri(:get, url, :response => page)
+  FakeWeb.register_uri(:head, url, :response => page)
+end

data/lib/ur/product/distribution_event.rb

@@ -0,0 +1,16 @@
+module UR
+  class Product
+    class DistributionEvent      
+      attr_reader :start_date, :end_date, :platform, 
+                  :event_type, :receiving_agent_group
+      
+      def initialize(data)
+        @start_date = Time.parse(data['startdate']) if !data['startdate'].nil?
+        @end_date = Time.parse(data['enddate']) if !data['enddate'].nil?
+        @receiving_agent_group = data['recievingagentgroup']
+        @platform = data['platform']
+        @event_type = data['type']
+      end
+    end
+  end
+end

data/lib/ur/product/storage.rb

@@ -0,0 +1,17 @@
+module UR
+  class Product
+    class Storage
+      attr_reader :ordernumber, :compatible, :storage_type, 
+                  :storage_format, :location, :storage_kind
+  
+      def initialize(data)
+        @order_number = data['ordernumber']
+        @compatible = data['compatible']
+        @storage_type = data['type']
+        @storage_format = data['format']
+        @location = data['location']
+        @storage_kind = data['storage_kind']
+      end
+    end
+  end
+end

data/lib/ur/product.rb

@@ -4,21 +4,22 @@ module UR
   class Product
     # Setup
     ASSETS_URL = 'http://assets.ur.se'
-    attr_accessor :related_products,
-                  :ur_product_id, :title, :language, 
-                  :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
+    attr_reader :related_products,
+                :ur_product_id, :title, :language, 
+                :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
     
     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(['siblings'])
+      self.class.define_boolean_methods(['distribution_events', 'storages'])
+      self.class.define_relation_boolean_methods(['siblings'])
     end
     
     def self.find(id)
@@ -33,6 +34,15 @@ module UR
     end
     
     def self.define_boolean_methods(names)
+      names.each do |name|
+        define_method("has_#{name}?") do
+          instance_variable = instance_variable_get("@#{name}")            
+          (!instance_variable.nil? || !instance_variable.empty?)
+        end
+      end
+    end
+    
+    def self.define_relation_boolean_methods(names)
       names.each do |name|
         define_method("has_#{name}?") do
           related_products = instance_variable_get("@related_products")
@@ -79,9 +89,19 @@ module UR
           value = product_data[field][lang]
         end
         
-        self.send("#{field_names.call(field)}=", value)
+        instance_variable_set("@#{field_names.call(field)}", value)
       end
       
+      # Handle the data structures
+      [
+        ['distributionevent', 'distribution_events', DistributionEvent],
+        ['storage', 'storages', Storage]
+      ].each do |name, variable, structure_class|
+        data = product_data[name]
+        instance_variable_set("@#{variable}", (!data.nil? && data.size > 0) ? 
+          data.map { |d| structure_class.new d } : [])
+      end
+  
       # Handle the relations
       if relations.size > 0
         @related_products = {}

data/lib/ur/search.rb

@@ -6,7 +6,7 @@ module UR
   class Search
     # Setup
     SEARCH_SERVICE_URL = 'http://services.ur.se/search'
-    attr_accessor :products, :solr, :facets
+    attr_reader :products, :solr, :facets
     
     def initialize(solr_params)
       solr = RSolr.connect :url => SEARCH_SERVICE_URL

data/lib/ur-product.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/ur/metadata_cache'
 require File.dirname(__FILE__) + '/ur/product'
+require File.dirname(__FILE__) + '/ur/product/distribution_event.rb'
+require File.dirname(__FILE__) + '/ur/product/storage.rb'
 require File.dirname(__FILE__) + '/ur/search'
 
 module UR

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,11 +82,17 @@ extra_rdoc_files: []
 
 files: 
 - README.markdown
+- Rakefile
 - MIT-LICENSE
 - lib/ur-product.rb
 - lib/ur/metadata_cache.rb
 - lib/ur/product.rb
+- lib/ur/product/distribution_event.rb
+- lib/ur/product/storage.rb
 - lib/ur/search.rb
+- features/product.feature
+- features/support/env.rb
+- features/step_definitions/product_steps.rb
 has_rdoc: true
 homepage: http://github.com/c7/ur-product
 licenses: