directed-edge 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2c76595650ccf3e0309ebb28989be7704e2481f1
+  data.tar.gz: c4d8b222a018955f9efa766c85f459c3640308e9
+SHA512:
+  metadata.gz: d38f115ff1e0f5f6b191c3227b05393848ce263a974b9c1152182945feccb69d2f891fb6da0c6cc186c64aa94b8c80e48936cf310583e6adede58c157a7398ef
+  data.tar.gz: f56d66c944a14f793306579fe794197360f1f40748b124d2d45014b3cf97388e44db7db0db7f4a56c0f5165d9cb0d17f295e2467826cb8706776847646053f61

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2009-2010, Directed Edge, Inc. <info@directededge.com>
+Copyright (C) 2009-2016, Directed Edge, Inc. <info@directededge.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/Rakefile

@@ -41,7 +41,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/directed-edge.gemspec

@@ -1,43 +1,42 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: directed-edge 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{directed-edge}
-  s.version = "0.2.0"
+  s.name = "directed-edge"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Directed Edge"]
-  s.date = %q{2010-04-25}
-  s.description = %q{Bindings for the Directed Edge webservices API}
-  s.email = %q{info@directededge.com}
+  s.date = "2016-10-05"
+  s.description = "Bindings for the Directed Edge webservices API"
+  s.email = "info@directededge.com"
   s.extra_rdoc_files = [
     "LICENSE"
   ]
   s.files = [
     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "directed-edge.gemspec",
-     "examples/example_store.rb",
-     "lib/directed_edge.rb",
-     "test/helper.rb",
-     "test/test_directed_edge.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "directed-edge.gemspec",
+    "examples/example_store.rb",
+    "lib/directed_edge.rb",
+    "test/helper.rb",
+    "test/test_directed_edge.rb"
   ]
-  s.homepage = %q{http://developer.directededge.com/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Bindings for the Directed Edge webservices API}
+  s.homepage = "http://developer.directededge.com/"
+  s.rubygems_version = "2.5.1"
+  s.summary = "Bindings for the Directed Edge webservices API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 4
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])

data/lib/directed_edge.rb

@@ -26,6 +26,21 @@ require 'rest_client'
 require 'rexml/document'
 require 'cgi'
 
+module RestClient
+  class Resource
+    alias_method :original_index, :[]
+    def [](*args)
+      return original_index(*args) if args.empty? || !args[0].is_a?(Hash)
+      params = args.first.map do |key, value|
+        key = CGI.escape(key.to_s.gsub(/_[a-z]/) { |s| s[1, 1].upcase })
+        value = CGI.escape(value.to_s)
+        "#{key}=#{value}"
+      end
+      original_index('?' + params.join('&'))
+    end
+  end
+end
+
 # The DirectedEdge module contains three classes:
 #
 # - Database - encapsulation of connection a database hosted by Directed Edge.
@@ -40,7 +55,7 @@ module DirectedEdge
 
     def []=(key, value)
       store(key, value)
-      @insert_order = [] if @insert_order.nil?
+      @insert_order ||= []
       @insert_order.delete(key) if @insert_order.include?(key)
       @insert_order.push(key)
     end
@@ -80,9 +95,8 @@ module DirectedEdge
 
     # Reads an item from the database and puts it into an XML document.
 
-    def read_document(method='', params={})
-      method << '?' << params.map { |key, value| "#{URI.encode(key)}=#{URI.encode(value)}" }.join('&')
-      REXML::Document.new(@resource[method].get(:accept => 'text/xml').to_s)
+    def read_document(method = '', params = {})
+      REXML::Document.new(@resource[method][params].get(:accept => 'text/xml').to_s)
     end
 
     # @return [Array] The elements from the document matching the given
@@ -204,7 +218,7 @@ module DirectedEdge
     #
     # @see Item#related
 
-    def group_related(items=Set.new, tags=Set.new, params={})
+    def group_related(items = Set.new, tags = Set.new, params = {})
       if !items.is_a?(Array) || items.size < 1
         return with_properties?(params) ? InsertOrderHash.new : []
       end
@@ -268,8 +282,10 @@ module DirectedEdge
       if destination.is_a?(String)
         @database = Database.new('exporter')
         @file = File.new(destination, 'w')
+        @data = nil
       elsif destination.is_a?(Database)
         @database = destination
+        @file = nil
         @data = []
       else
         raise TypeError.new("Exporter must be passed a file name or database object.")
@@ -289,7 +305,11 @@ module DirectedEdge
 
     def finish
       write("</directededge>\n")
-      @file ? @file.close : @database.resource['add'].put(@data.join)
+      if @file
+        @file.close
+      else
+        @database.resource[:update_method => :add].post(@data.join, :content_type => 'text/xml')
+      end
     end
 
     private
@@ -340,7 +360,7 @@ module DirectedEdge
     # manipulated locally and then saved back to the database by calling save.
 
     def initialize(database, id)
-      super(database.resource[URI.escape(id, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))])
+      super(database.resource[CGI.escape(id)])
 
       @database = database
       @id = id
@@ -377,7 +397,7 @@ module DirectedEdge
 
     # @deprecated Use new / save instead.
 
-    def create(links={}, tags=Set.new, properties={})
+    def create(links = {}, tags = Set.new, properties = {})
       warn 'DirectedEdge::Item::create has been deprecated. Use new / save instead.'
       @links[''] = links
       @tags = tags
@@ -395,16 +415,16 @@ module DirectedEdge
     #
     # @return [Item]
 
-    def save(options={})
+    def save(options = {})
       if options[:overwrite] || @cached
-        put(complete_document)
+        post(complete_document)
       else
 
         # The web services API allows to add or remove things incrementally.
         # Since we're not in the cached case, let's check to see which action(s)
         # are appropriate.
 
-        put(complete_document, 'add')
+        post(complete_document, :update_method => :add)
 
         ### CHECKING LINKS_TO_REMOVE.EMPTY? ISN'T CORRECT ANYMORE
 
@@ -413,7 +433,7 @@ module DirectedEdge
             !@preselected_to_remove.empty? ||
             !@blacklisted_to_remove.empty? ||
             !@properties_to_remove.empty?
-          put(removal_document, 'remove')
+          post(removal_document, :update_method => :subtract)
           @links_to_remove.clear
           @tags_to_remove.clear
           @properties_to_remove.clear
@@ -452,7 +472,7 @@ module DirectedEdge
     # @param [String] type Only links for the specified link-type will be
     #  returned.
 
-    def links(type='')
+    def links(type = '')
       read
       @links[type.to_s]
     end
@@ -554,7 +574,7 @@ module DirectedEdge
     # 
     # @return [String] The item ID just linked to
 
-    def link_to(other, weight=0, type='')
+    def link_to(other, weight = 0, type = '')
       raise RangeError if (weight < 0 || weight > 10)
       @links_to_remove[type.to_s].delete(other)
       @links[type.to_s][other.to_s] = weight
@@ -570,7 +590,7 @@ module DirectedEdge
     # @return [String] The item ID just unlinked from.
     # @see Item#link_to
 
-    def unlink_from(other, type='')
+    def unlink_from(other, type = '')
       @links_to_remove[type.to_s].add(other.to_s) unless @cached
       @links[type.to_s].delete(other.to_s)
       other
@@ -585,7 +605,7 @@ module DirectedEdge
     # @return [Integer] The weight for a link from this item to the specified
     #  item, or nil if not found.
 
-    def weight_for(other, type='')
+    def weight_for(other, type = '')
       read
       @links[type.to_s][other.to_s]
     end
@@ -702,7 +722,7 @@ module DirectedEdge
     #
     # @see Item#recommended
 
-    def related(tags=Set.new, params={})
+    def related(tags = Set.new, params = {})
       normalize_params!(params)
       params['tags'] = tags.to_a.join(',')
       if with_properties?(params)
@@ -741,7 +761,7 @@ module DirectedEdge
     #
     # @see Item#related
 
-    def recommended(tags=Set.new, params={})
+    def recommended(tags = Set.new, params = {})
       normalize_params!(params)
       params['tags'] = tags.to_a.join(',')
       params.key?('excludeLinked') || params['excludeLinked'] = 'true'
@@ -811,12 +831,10 @@ module DirectedEdge
       end
     end
 
-    # Uploads the changes to the Directed Edge database.  The optional method
-    # parameter may be used for either add or remove which do only incremental
-    # updates to the item.
+    # Uploads the changes to the Directed Edge database.
 
-    def put(document, method='')
-      @resource[method].put(document.to_s, :content_type => 'text/xml')
+    def post(document, params = {})
+      @resource[params].post(document.to_s, :content_type => 'text/xml')
     end
 
     # Creates a document for an entire item including the links, tags and
@@ -834,7 +852,7 @@ module DirectedEdge
       @links_to_remove.each do |type, links|
         links.each do |link|
           element = item.add_element('link')
-          element.add_attribute(type) unless type.empty?
+          element.add_attribute('type', type) unless type.empty?
           element.add_text(link.to_s.dup)
         end
       end

data/test/test_directed_edge.rb

@@ -14,7 +14,7 @@ class TestDirectedEdge < Test::Unit::TestCase
     user = ENV['DIRECTEDEDGE_TEST_DB']
     pass = ENV['DIRECTEDEDGE_TEST_PASS']
     @database = DirectedEdge::Database.new(user, pass)
-    @database.import('../testdb.xml')
+    @database.import(File.expand_path('../../../testdb.xml', __FILE__))
   end
 
   def test_exporter
@@ -67,23 +67,6 @@ class TestDirectedEdge < Test::Unit::TestCase
     assert_equal('Bar', item['name'])
   end
 
-  def test_tags
-    item = DirectedEdge::Item.new(@database, 'customer1')
-    test_tag = 'test_tag'
-
-    assert(!item.tags.include?(test_tag))
-
-    item.add_tag(test_tag);
-    item.save
-
-    assert(item.tags.include?(test_tag))
-
-    item.remove_tag(test_tag);
-    item.save
-
-    assert(!item.tags.include?(test_tag))
-  end
-
   def test_items
     first_item = DirectedEdge::Item.new(@database, 'test_1')
     first_item.save
@@ -98,6 +81,12 @@ class TestDirectedEdge < Test::Unit::TestCase
     third_item.add_tag('test_tag')
     third_item.save
 
+    fourth_item = DirectedEdge::Item.new(@database, 'test_4')
+    fourth_item.link_to(first_item)
+    fourth_item.link_to(second_item, 1, 'test_type')
+    fourth_item.link_to(third_item)
+    fourth_item.save
+
     assert_equal('test_1', first_item.name)
 
     # Make sure that the number of tags / links for the first item is zero
@@ -123,6 +112,12 @@ class TestDirectedEdge < Test::Unit::TestCase
     assert(third_item.links.include?(first_item.to_s))
     assert(third_item.links.include?(second_item.to_s))
 
+    # Make sure that the fourth item is linked to the second item w/type
+
+    assert_equal(2, fourth_item.links.length)
+    assert_equal(1, fourth_item.links('test_type').length)
+    assert(fourth_item.links('test_type').include?(second_item.to_s))
+
     # Make sure that the first and second items show up in the related items for
     # the third item
 
@@ -132,8 +127,8 @@ class TestDirectedEdge < Test::Unit::TestCase
     # Since linked items are excluded from recommendations, nothing should show
     # up in the recommended items for the third item.
 
-    assert_equal(0, third_item.recommended.length)
-    assert_equal(1, second_item.recommended.length)
+    assert_equal(1, third_item.recommended.length)
+    assert_equal(2, second_item.recommended.length)
     assert_equal(0, second_item.recommended(['unknown_tag']).length)
     assert_equal([third_item.to_s], first_item.recommended(['test_tag']))
 
@@ -152,11 +147,21 @@ class TestDirectedEdge < Test::Unit::TestCase
 
     assert_equal(0, third_item.links.length)
 
+    fourth_item.unlink_from(third_item)
+    fourth_item.save
+
     # Now make sure that those items no longer show up as related items
 
     assert(!third_item.related.include?(first_item.to_s))
     assert(!third_item.related.include?(second_item.to_s))
 
+    # Remove the link with a type from the fourth item and assure that it was removed
+
+    fourth_item.unlink_from(first_item, 'test_type')
+    fourth_item.save
+
+    assert_equal(1, fourth_item.links.length)
+
     # Test item removal
 
     assert_equal(1, first_item.links.length)
@@ -318,8 +323,6 @@ class TestDirectedEdge < Test::Unit::TestCase
   end
 
   def test_unsafe_chars
-    return if ENV['DIRECTEDEDGE_HOST'] == 'localhost'
-
     item = DirectedEdge::Item.new(@database, ';@%&!')
     item['foo'] = 'bar'
     item.save
@@ -402,7 +405,6 @@ class TestDirectedEdge < Test::Unit::TestCase
     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])
 
@@ -463,17 +465,4 @@ class TestDirectedEdge < Test::Unit::TestCase
 
     assert(timed_out)
   end
-
-  def test_foo
-    business = DirectedEdge::Item.new(@database, 'business71')
-    business.save
-
-    user = DirectedEdge::Item.new(@database, 'user72')
-    user.link_to('business71')
-    user.save
-
-    user = DirectedEdge::Item.new(@database, 'user72')
-    user.unlink_from('business71')
-    user.save
-  end
 end

metadata

@@ -1,44 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: directed-edge
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Directed Edge
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-01 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-10-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bindings for the Directed Edge webservices API
 email: info@directededge.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -48,35 +41,27 @@ files:
 - lib/directed_edge.rb
 - test/helper.rb
 - test/test_directed_edge.rb
-has_rdoc: true
 homepage: http://developer.directededge.com/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      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
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bindings for the Directed Edge webservices API
 test_files: []
-