ur-product 1.0.3 → 1.0.4

data/features/step_definitions/product_steps.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # Cucumber
-require 'spec/expectations'
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 
@@ -39,7 +38,7 @@ end
 # Then
 
 Then /^the title should be "(.*)"/ do |title|
-  @product.title.should == title 
+  @product.title.should == title
 end
 
 Then /^it should have (.*)/ do |boolean_method|
@@ -48,11 +47,11 @@ end
 
 Then /^one (.*) in (.*) should be "(.*)"$/ do |field, method, value|
   values = []
-  
-  @product.send(method).each do |product| 
+
+  @product.send(method).each do |product|
     values << product.send(field)
   end
-  
+
   values.include?(value).should be(true)
 end
 
@@ -62,6 +61,6 @@ 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

@@ -1,4 +1,8 @@
-require 'spec/expectations'
+# encoding: utf-8
+
+require 'rspec'
+require 'rspec/expectations'
+World(RSpec::Matchers)
 
 # FakeWeb
 require 'fakeweb'
@@ -6,7 +10,7 @@ require 'fakeweb'
 FakeWeb.allow_net_connect = false
 
 faked_urls = [
-  'http://metadata.ur.se/products/100001.json', 
+  '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'
 ]
@@ -15,4 +19,4 @@ faked_urls.each do |url|
   page = `curl -is #{url}`
   FakeWeb.register_uri(:get, url, :response => page)
   FakeWeb.register_uri(:head, url, :response => page)
-end
+end

data/lib/ur/product.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'time'
 require 'restclient'
 

data/lib/ur/search.rb

@@ -1,50 +1,52 @@
+# encoding: utf-8
+
 require 'rsolr-ext'
 require 'yajl'
 
 # Module for Utbildningsradion AB (http://ur.se/)
-module UR  
+module UR
   # Search for products and populate from the metadata cache
   class Search
     # Setup
     if !defined?(SEARCH_SERVICE_URL)
       SEARCH_SERVICE_URL = 'http://services.ur.se/search'
     end
-    
+
     attr_reader :products, :solr, :facets
-    
+
     def initialize(solr_params)
       # Prepare the facets
       @products = []
       @facets = {}
       @solr   = nil
-      
-      begin 
+
+      begin
         solr = RSolr.connect :url => SEARCH_SERVICE_URL
         response = solr.find solr_params
-        
+
         # Populate the products from the Metadata Cache
         @products = (response.ok? && response.docs.size > 0) ?
           Product.find(response.docs.map { |d| d.id }) : []
-        
+
         # Expose the Solr response
         @solr = response
         @solr.facets.map { |f| @facets[f.name] = f.items } if @solr.facets.size > 0
       rescue RSolr::RequestError => e
       end
     end
-    
+
     def ok?
       (!@solr.nil? && @solr && @solr.ok?)
     end
-  
+
     def per_page
       (ok?) ? @solr.params['rows'].to_i : 0
     end
-    
+
     def num_found
       (ok?) ? @solr.response['numFound'].to_i : 0
     end
-    
+
     def self.current_programs(per_page = 10, offset = 0, format = false, agerange = false)
       url = "#{SEARCH_SERVICE_URL}/select?qt=current-products" +
             "&rows=#{per_page}&start=#{offset}" +
@@ -59,39 +61,39 @@ module UR
       url += agerange_filter(agerange)
 
       programs = Yajl::HttpStream.get(url)
-      
-      if (programs['response']['docs'].count > 0) 
+
+      if (programs['response']['docs'].count > 0)
         Product.find(programs['response']['docs'].map { |d| d['id'] })
       else
         []
       end
     end
-    
+
     ##
     # Pagination
     #
-    
+
     def current_page
       (!@solr.docs.nil?) ? @solr.docs.current_page : 0
     end
-    
+
     def total_pages
       (!@solr.docs.nil?) ? @solr.docs.total_pages : 0
     end
-    
+
     def previous_page
       (current_page > 1) ? @solr.docs.previous_page : false
     end
-    
+
     def next_page
       (current_page < total_pages) ? @solr.docs.next_page : false
     end
-    
+
   private
     def self.agerange_filter(agerange, prepend = '%20AND%20')
       if ['children', 'youths', 'adults'].include? agerange
-        filter = '(typicalagerange:' + 
-        { 
+        filter = '(typicalagerange:' +
+        {
           'children' => ['preschool', 'primary0-3', 'primary4-6'],
           'youths'   => ['primary7-9', 'secondary'],
           'adults'   => ['schoolvux', 'komvuxgrundvux', 'teachereducation',
@@ -109,4 +111,4 @@ module UR
       filter
     end
   end
-end
+end

data/lib/ur/streaming.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'yajl/http_stream'
 
 # Module for Utbildningsradion AB (http://ur.se/)
@@ -8,11 +10,11 @@ module UR
     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]
@@ -20,11 +22,11 @@ module UR
         @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
+end

data/lib/ur/version.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 module UR
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/ur-product.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/ur/metadata_cache'
 require File.dirname(__FILE__) + '/ur/product'
 require File.dirname(__FILE__) + '/ur/product/distribution_event.rb'
@@ -10,7 +12,7 @@ require File.dirname(__FILE__) + '/ur/version'
 module UR
   class InvalidProductID < Exception
   end
-  
+
   class InvalidResponse < Exception
   end
-end
+end

metadata

@@ -1,96 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ur-product
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Peter Hellberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-07 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70169394839980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 7
-        - 6
-        version: 0.7.6
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rsolr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70169394839980
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  requirement: &70169394839480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 12
-        - 1
-        version: 0.12.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rsolr-ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70169394839480
+- !ruby/object:Gem::Dependency
+  name: rsolr-ext
+  requirement: &70169394839020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 12
-        - 0
-        version: 0.12.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70169394839020
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70169394838560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70169394838560
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70169394838100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: *70169394838100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70169394837640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: *70169394837640
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70169394837180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: *70169394837180
 description: Enables searching and fetching of Utbildningsradion products
 email: peter@c7.se
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - Rakefile
 - MIT-LICENSE
@@ -106,39 +109,29 @@ files:
 - features/product.feature
 - features/support/env.rb
 - features/step_definitions/product_steps.rb
-has_rdoc: true
 homepage: http://github.com/c7/ur-product
-licenses: 
+licenses:
 - MIT-LICENSE
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ur-product
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: API wrapper for the Utbildningsradion product services
 test_files: []
-