directed-edge 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/directed-edge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{directed-edge}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Directed Edge"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-09}
   s.description = %q{Bindings for the Directed Edge webservices API}
   s.email = %q{info@directededge.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://developer.directededge.com/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Bindings for the Directed Edge webservices API}
 
   if s.respond_to? :specification_version then

data/lib/directed_edge.rb

@@ -330,10 +330,14 @@ module DirectedEdge
       @id = id
       @links = {}
       @tags = Set.new
+      @preselected = []
+      @blacklisted = Set.new
       @properties = {}
 
       @links_to_remove = Set.new
       @tags_to_remove = Set.new
+      @preselected_to_remove = Set.new
+      @blacklisted_to_remove = Set.new
       @properties_to_remove = Set.new
 
       @resource = @database.resource[URI.escape(@id)]
@@ -386,11 +390,17 @@ module DirectedEdge
 
         put(complete_document, 'add')
 
-        if !@links_to_remove.empty? || !@tags_to_remove.empty? || !@properties_to_remove.empty?
+        if !@links_to_remove.empty? ||
+            !@tags_to_remove.empty? ||
+            !@preselected_to_remove.empty? ||
+            !@blacklisted_to_remove.empty? ||
+            !@properties_to_remove.empty?
           put(removal_document, 'remove')
           @links_to_remove.clear
           @tags_to_remove.clear
           @properties_to_remove.clear
+          @preselected_to_remove.clear
+          @blacklisted_to_remove.clear
         end
       end
       self
@@ -404,10 +414,14 @@ module DirectedEdge
 
       @links = hash_from_document(document, 'link', 'weight')
       @tags = Set.new(list_from_document(document, 'tag'))
+      @preselected = list_from_document(document, 'preselected')
+      @blacklisted = Set.new(list_from_document(document, 'blacklisted'))
       @properties = {}
 
       @links_to_remove.clear
       @tags_to_remove.clear
+      @preselected_to_remove.clear
+      @blacklisted_to_remove.clear
       @properties_to_remove.clear
 
       document.elements.each('//property') do |element|
@@ -430,6 +444,20 @@ module DirectedEdge
       @tags
     end
 
+    # Returns an ordered list of items that are preselected for this item.
+
+    def preselected
+      read
+      @preselected
+    end
+
+    # Returns a set of items that should not ever be recommended for this item.
+
+    def blacklisted
+      read
+      @blacklisted
+    end
+
     # Returns a hash of all of this item's properties.
 
     def properties
@@ -456,9 +484,7 @@ module DirectedEdge
     # Remove the given property_name.
 
     def clear_property(property_name)
-      if !@cached
-        @properties_to_remove.add(property_name)
-      end
+      @properties_to_remove.add(property_name) unless @cached
       @properties.delete(property_name)
     end
 
@@ -490,9 +516,7 @@ module DirectedEdge
     # to detect 'broken' links that do not terminate at a valid item.
 
     def link_to(other, weight=0)
-      if weight < 0 || weight > 10
-        raise RangeError
-      end
+      raise RangeError if (weight < 0 || weight > 10)
       @links_to_remove.delete(other)
       @links[other.to_s] = weight
     end
@@ -502,9 +526,7 @@ module DirectedEdge
     # The changes will not be reflected in the database until save is called.
 
     def unlink_from(other)
-      if !@cached
-        @links_to_remove.add(other.to_s)
-      end
+      @links_to_remove.add(other.to_s) unless @cached
       @links.delete(other.to_s)
     end
 
@@ -530,12 +552,30 @@ module DirectedEdge
     # The changes will not be reflected in the database until save is called.
 
     def remove_tag(tag)
-      if !@cached
-        @tags_to_remove.add(tag)
-      end
+      @tags_to_remove.add(tag) unless @cached
       @tags.delete(tag)
     end
 
+    def add_preselected(item)
+      @preselected_to_remove.delete(item)
+      @preselected.push(item)
+    end
+
+    def remove_preselected(item)
+      @preselected_to_remove.add(item) unless @cached
+      @preselected.delete(item)
+    end
+
+    def add_blacklisted(item)
+      @blacklisted_to_remove.delete(item)
+      @blacklisted.add(item)
+    end
+
+    def remove_blacklisted(item)
+      @blacklisted_to_remove.add(item) unless @cached
+      @blacklisted.delete(item)
+    end
+
     # Returns the list of items related to this one.  Unlike "recommended" this
     # may include items which are directly linked from this item.  If any tags
     # are specified, only items which have one or more of the specified tags
@@ -604,20 +644,24 @@ module DirectedEdge
           document = read_document
           @links.merge!(hash_from_document(document, 'link', 'weight'))
           @tags.merge(list_from_document(document, 'tag'))
+          @preselected.concat(list_from_document(document, 'preselected'))
+          @blacklisted.merge(list_from_document(document, 'blacklisted'))
 
           document.elements.each('//property') do |element|
             name = element.attribute('name').value
-            if !@properties.has_key?(name)
-              @properties[name] = element.text
-            end
+            @properties[name] = element.text unless @properties.has_key?(name)
           end
 
           @links_to_remove.each { |link| @links.delete(link) }
           @tags_to_remove.each { |tag| @tags.delete(tag) }
+          @preselected_to_remove.each { |p| @preselected.delete(p) }
+          @blacklisted_to_remove.each { |b| @blacklisted.delete(b) }
           @properties_to_remove.each { |property| @properties.delete(property) }
 
           @links_to_remove.clear
           @tags_to_remove.clear
+          @preselected_to_remove.clear
+          @blacklisted_to_remove.clear
           @properties_to_remove.clear
 
           @cached = true
@@ -647,6 +691,8 @@ module DirectedEdge
       item = setup_document(REXML::Document.new)
       @links_to_remove.each { |link| item.add_element('link').add_text(link.to_s) }
       @tags_to_remove.each { |tag| item.add_element('tag').add_text(tag.to_s) }
+      @preselected_to_remove.each { |p| item.add_element('preselected').add_text(p.to_s) }
+      @blacklisted_to_remove.each { |b| item.add_element('blacklisted').add_text(b.to_s) }
       @properties_to_remove.each do |property|
         item.add_element('property').add_attribute('name', property.to_s)
       end
@@ -657,12 +703,12 @@ module DirectedEdge
       item = setup_document(document)
       @links.each do |link, weight|
         element = item.add_element('link')
-        if weight != 0
-          element.add_attribute('weight', weight.to_s)
-        end
+        element.add_attribute('weight', weight.to_s) if weight != 0
         element.add_text(link.to_s)
       end
       @tags.each { |tag| item.add_element('tag').add_text(tag.to_s) }
+      @preselected.each { |p| item.add_element('preselected').add_text(p.to_s) }
+      @blacklisted.each { |b| item.add_element('blacklisted').add_text(b.to_s) }
       @properties.each do |key, value|
         property = item.add_element('property')
         property.add_attribute('name', key.to_s)

data/test/test_directed_edge.rb

@@ -231,6 +231,8 @@ class TestDirectedEdge < Test::Unit::TestCase
   end
 
   def test_load
+    return if ENV['NO_LOAD_TEST']
+
     def run_load_test(prefix, count)
       (1..count).concurrently do |i|
         item = DirectedEdge::Item.new(@database, "test_item_#{prefix}_#{i}")
@@ -331,4 +333,59 @@ class TestDirectedEdge < Test::Unit::TestCase
     recommended = customer.recommended(['product'], :include_properties => true)
     assert_equal('bar', recommended['product21']['foo'])
   end
+
+  def test_preselected
+    item = DirectedEdge::Item.new(@database, 'product1')
+
+    first = item.related[0]
+
+    item.add_preselected('product2')
+    item.add_preselected('product3')
+    item.save
+    item.reload
+    assert_equal(2, item.preselected.length)
+    assert_equal('product2', item.preselected[0])
+    assert_equal('product3', item.preselected[1])
+
+    related = item.related
+    assert_equal('product2', item.related[0])
+    assert_equal('product3', item.related[1])
+
+    item.remove_preselected('product2')
+    item.save
+    item.reload
+    assert_equal(1, item.preselected.length)
+
+    item.remove_preselected('product3')
+    item.save
+    assert_equal(first, item.related[0])
+
+    # Make sure that internal properties aren't overwriting normal properties
+
+    item['foo'] = 'bar'
+    item.save
+    item.add_preselected('product2')
+    item.save
+    item.reload
+    assert_equal(item['foo'], 'bar')
+  end
+
+  def test_blacklisted
+    customer = DirectedEdge::Item.new(@database, 'customer1')
+    first = customer.recommended.first
+    customer.add_blacklisted(first)
+    customer.save
+    assert_not_equal(customer.recommended.first, first)
+
+    assert(customer.blacklisted.include?(first))
+    customer.reload
+    assert(customer.blacklisted.include?(first))
+
+    customer.remove_blacklisted(first)
+    customer.save
+    assert(!customer.blacklisted.include?(first))
+    customer.reload
+    assert(!customer.blacklisted.include?(first))
+    assert_equal(customer.recommended.first, first)
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: directed-edge
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Directed Edge
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +02:00
+date: 2010-04-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Bindings for the Directed Edge webservices API
 email: info@directededge.com
 executables: []
@@ -54,18 +61,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bindings for the Directed Edge webservices API