dm-keeper-adapter 0.0.1 → 0.0.2

data/lib/dm-keeper-adapter.rb

@@ -8,7 +8,6 @@ require "dm-keeper-adapter/update"
 require "dm-keeper-adapter/delete"
 require "dm-keeper-adapter/misc"
 
-
 module DataMapper
   class Property
     autoload :XML, "property/xml"

data/lib/dm-keeper-adapter/read.rb

@@ -1,4 +1,7 @@
 # read.rb
+
+require 'cgi'
+
 module DataMapper::Adapters
   class KeeperAdapter < AbstractAdapter
     require 'nokogiri'
@@ -53,13 +56,13 @@ module DataMapper::Adapters
     #
     # @api private
     def perform_query(query, operand)
-#      $stderr.puts "perform_query(#{query},#{operand})"
       records = []
-		    
-      if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
+       
+      case operand
+      when DataMapper::Query::Conditions::NotOperation
 	subject = operand.first.subject
 	value = operand.first.value
-      elsif operand.subject.is_a?(DataMapper::Associations::ManyToOne::Relationship)
+      when DataMapper::Associations::ManyToOne::Relationship
 	subject = operand.subject.child_key.first
 	value = operand.value[operand.subject.parent_key.first.name]
       else
@@ -71,6 +74,8 @@ module DataMapper::Adapters
 	subject = subject.child_key.first
       end
       
+#      $stderr.puts "perform_query(\n\tsubject#{subject.inspect}\n\t#{value.inspect})"
+
       # typical queries
       #
       # ?query=/feature[
@@ -79,7 +84,7 @@ module DataMapper::Adapters
       #  ]
       #  and
       #  actor[
-      #    (person/userid='kkaempf@novell.com' or person/email='kkaempf@novell.com' or person/fullname='kkaempf@novell.com')
+      #    (person/userid='kkaempf@suse.com' or person/email='kkaempf@suse.com' or person/fullname='kkaempf@suse.com')
       #    and
       #    role='projectmanager'
       #  ]
@@ -98,18 +103,23 @@ module DataMapper::Adapters
       container = query.model.to_s.downcase
       if query.model.key.include?(subject)
 	# get single <feature>
-	records << node_to_record(query.model, get("/#{container}/#{value}").root)
+	records << node_to_record(query.model, get("/#{container}/#{CGI.escape(value.to_s)}").root)
       else
 	# query, get <collection>[<object><feature>...]*
 	xpath = "/#{container}["
-	# ...
+	case operand
+	when DataMapper::Query::Conditions::EqualToComparison
+	  xpath << "contains(#{subject.name},'#{CGI.escape(value)}')"
+	else
+	  raise "Unhandled operand #{operand.class}"
+	end
 	xpath << "]"
-	collection = get("/#{container}?query=#{xpath}")
-	collection.xpath("/#{container}").each do |feature|
-	  records << node_to_record(query.model, feature)
+	collection = get("/#{container}?query=#{xpath}").root
+	collection.xpath("//#{container}", collection.namespace).each do |node|
+	  records << node_to_record(query.model, node)
 	end
       end
-      
+
       records
     end # def
 

data/lib/dm-keeper-adapter/version.rb

@@ -3,6 +3,6 @@ require 'dm-core/adapters/abstract_adapter'
 
 module DataMapper::Adapters
   class KeeperAdapter < AbstractAdapter
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/test_get_relationtree.rb

@@ -2,18 +2,26 @@ require File.join(File.dirname(__FILE__), 'helper')
 
 class Get_relationtree_test < Test::Unit::TestCase
 
-  def test_get_relationtree
+  def setup
     DataMapper::Logger.new(STDOUT, :debug)
-    keeper = DataMapper.setup(:default,
+    @keeper = DataMapper.setup(:default,
 			      :adapter => 'keeper',
 			      :url  => 'https://keeper.novell.com/sxkeeper')
 
     require 'keeper/relationtree'
     DataMapper.finalize
+  end
 
+  def test_get_relationtree_by_id
+    # Access relationtree by id
     tree = Relationtree.get(1137)
     assert tree
-    puts "Relationtree #{tree.inspect}"
   end
 
+  def test_get_relationtree_by_name
+    # Access relationtree by name
+    tree = Relationtree.first(:title => "Manager 1.2.1")
+    assert tree
+    assert_equal 1137, tree.id
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-keeper-adapter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"