meducation_sdk 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 501cacf9b074ebddc2a0f852918fdc1d6ca17397
-  data.tar.gz: 561cfb74aa544ebc77c96911064e6b3dc749220d
+  metadata.gz: 1c88f47006482637173b6f0ecefb769bf0fc8cba
+  data.tar.gz: 413eca4a6ba923a7374bf5d4f0c526a0836c5969
 SHA512:
-  metadata.gz: 3bf5137df9ad1424be8dd7ff986ed20d66ee1e5d701e87dcaf90cb6569e96091ab9e7e4f054fbac220842f9aae4535f33c042a33cdda3f552922cb5651d040ec
-  data.tar.gz: ded18c907cdcce4e1ceddbcd789fba133d163db41f60b089e8fe27580c3aa07786cc40e4b47e5801b6074bb6fd0104109016c5d9ccd479190f264697377b12bf
+  metadata.gz: cc609c0703bfb356080658287b5ae6f4fe156d8eadbb3a2a5e69e5a80eebfd1638429ab3265bd277fe18a573efbbf8d3ebb570dd97bf6bca8a9d380a89cb5816
+  data.tar.gz: e5145e0d61744cba03195e9899de18ed8e4cae404b0c53783c0ed5ae254790d5663d48f6f59cb21433d55007172d072daeed6efb6e81ef48c5b5a0268f94e2f8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.6.4 / 2014-03-13
+* [FEATURE] Recommendations are padded with good resources to reach limit
+
 # 1.6.3 / 2014-03-12
 * [BUGFIX] Add ip_address to view sample
 

data/lib/meducation_sdk/services/recommender.rb

@@ -10,16 +10,23 @@ module MeducationSDK
     def initialize(item, options = {})
       @item = item
       @options = options
+      @limit = options[:limit] || 5
     end
 
     def recommend
-      generate_recommendations
+      recommendations = generate_recommendations
+      if recommendations.size < @limit
+        log "recommendations.size (#{recommendations.size}) is < limit of #{@limit}"
+        recommendations += MeducationSDK::MediaFile.where('rating > 2').per(@limit - recommendations.size).order(:random).to_a
+      else
+        log "recommendations.size (#{recommendations.size}) is >= limit of #{@limit}"
+      end
+      recommendations
     rescue => e
       log_error("!!Recommender Error!!")
       log_error(e.message)
       log_error(e.backtrace)
-      #Item::Recommendation.where(item_type: @item.class.name).where(item_id: @item.id).includes(:recommendation).map(&:recommendation)
-      []
+      MeducationSDK::MediaFile.where('rating > 2').per(@limit).order(:random).to_a
     end
 
     def generate_recommendations

data/lib/meducation_sdk/version.rb

@@ -1,3 +1,3 @@
 module MeducationSDK
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/test/services/recommender_test.rb

@@ -3,6 +3,14 @@ require_relative '../test_helper'
 module MeducationSDK
   class RecommenderTest < Minitest::Test
 
+    def setup
+      @per_result = mock
+      @per_result.stubs(where: @per_result)
+      @per_result.stubs(order: @per_result)
+      @per_result.stubs(per: @per_result)
+      @per_result.stubs(to_a: [])
+    end
+
     def empty_response
       mock(body: '[]')
     end
@@ -15,6 +23,10 @@ module MeducationSDK
       @item2 ||= MediaFile.new({id: 56})
     end
 
+    def item3
+      @item3 ||= MediaFile.new({id: 57})
+    end
+
     def test_should_call_new
       Recommender.expects(:new).with(item, {}).returns(mock(recommend: nil))
       Recommender.recommend(item)
@@ -26,7 +38,9 @@ module MeducationSDK
     end
 
     def test_should_call_the_recommender_service
+      @per_result.expects(:per).with(5).returns(@per_result)
       Net::HTTP.expects(:get_response).with("recommender.meducation.net", "/MediaFile/#{item.id}", 4567).returns(empty_response)
+      MediaFile.expects(:where).with('rating > 2').returns(@per_result)
       Recommender.new(item).recommend
     end
 
@@ -36,12 +50,46 @@ module MeducationSDK
         {"type" => "MediaFile", "id" => item2.id, "score" => 0.0078}
       ].to_json
 
+      @per_result.expects(:per).with(3).returns(@per_result)
       Net::HTTP.expects(:get_response).returns(mock(body: json))
       MediaFile.expects(:where).with({id: [item.id, item2.id]}).returns([item, item2])
+      MediaFile.expects(:where).with('rating > 2').returns(@per_result)
       items = Recommender.new(item).recommend
       assert_equal [item, item2], items
     end
 
+    def test_should_not_get_more_resources_if_enough_recommendations
+      json = [
+        {"type" => "MediaFile", "id" => item.id, "score" => 0.0097},
+        {"type" => "MediaFile", "id" => item2.id, "score" => 0.0078}
+      ].to_json
+
+      Net::HTTP.expects(:get_response).returns(mock(body: json))
+      MediaFile.expects(:where).with({id: [item.id, item2.id]}).returns([item, item2])
+      MediaFile.expects(:where).with('rating > 2').never
+      items = Recommender.new(item, limit: 2).recommend
+      assert_equal [item, item2], items
+    end
+
+    def test_should_get_more_resources_if_too_few_recommendations
+      json = [
+        {"type" => "MediaFile", "id" => item.id, "score" => 0.0097},
+        {"type" => "MediaFile", "id" => item2.id, "score" => 0.0078}
+      ].to_json
+
+      limit = 5
+
+      @per_result.expects(:per).with(3).returns(@per_result)
+      @per_result.stubs(to_a: [item3])
+
+      Net::HTTP.expects(:get_response).returns(mock(body: json))
+      MediaFile.expects(:where).with({id: [item.id, item2.id]}).returns([item, item2])
+      good_resources = mock
+      MediaFile.expects(:where).with('rating > 2').returns(@per_result)
+      items = Recommender.new(item, limit: limit).recommend
+      assert_equal [item, item2, item3], items
+    end
+
     def test_should_limit_correctly
       items = 6.times.map { |x| MediaFile.new({id: x}) }
       json = items.map {|item| {"type" => "MediaFile", "id" => item.id, "score" => 0.0097} }.to_json
@@ -51,13 +99,34 @@ module MeducationSDK
       results = Recommender.new(item, limit: 3).recommend
     end
 
-    def test_should_log_an_exception
+    def test_should_log_recommender_exception
+      @per_result.expects(:per).with(5).returns(@per_result)
+      @per_result.stubs(to_a: [item3])
       Net::HTTP.expects(:get_response).raises(StandardError)
       MeducationSDK.config.logger.expects(:error).with("!!Recommender Error!!")
       MeducationSDK.config.logger.expects(:error).with("StandardError")
+      MediaFile.stubs(:where).with('rating > 2').returns(@per_result)
       Recommender.new(item).recommend
     end
 
+    def test_should_get_good_resources_if_error_from_recommender
+      @per_result.expects(:per).with(5).returns(@per_result)
+      @per_result.stubs(to_a: [item3])
+      Net::HTTP.expects(:get_response).raises(StandardError)
+      MediaFile.stubs(:where).with('rating > 2').returns(@per_result)
+      items = Recommender.new(item).recommend
+      assert_equal [item3], items
+    end
+
+    def test_should_get_good_resources_if_error_from_recommender
+      @per_result.expects(:per).with(5).returns(@per_result)
+      @per_result.stubs(to_a: [item3])
+      Net::HTTP.expects(:get_response).raises(StandardError)
+      MediaFile.stubs(:where).with('rating > 2').returns(@per_result)
+      items = Recommender.new(item).recommend
+      assert_equal [item3], items
+    end
+
     def test_should_catch_an_exception_and_render_backup_recommendations
       skip
       recommendation = Item::Recommendation.create!(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meducation_sdk
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport