dm-keeper-adapter 0.0.2 → 0.0.3

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

@@ -57,12 +57,12 @@ module DataMapper::Adapters
     # @api private
     def perform_query(query, operand)
       records = []
+#      STDERR.puts "perform_query(query#{query}, operand #{operand})"
        
-      case operand
-      when DataMapper::Query::Conditions::NotOperation
+      if operand.is_a? DataMapper::Query::Conditions::NotOperation
 	subject = operand.first.subject
 	value = operand.first.value
-      when DataMapper::Associations::ManyToOne::Relationship
+      elsif operand.subject.is_a? DataMapper::Associations::ManyToOne::Relationship
 	subject = operand.subject.child_key.first
 	value = operand.value[operand.subject.parent_key.first.name]
       else
@@ -141,6 +141,10 @@ module DataMapper::Adapters
       model.properties.each do |property|
 	xpath = xpathmap[property.name] || property.name
 	key = property.name.to_s
+	if key == "raw"
+	  record[key] = node.to_s
+	  next
+	end
 	children = node.xpath("./#{xpath}", xmlnamespaces)	
 #	$stderr.puts "Property found: #{property.inspect}"
 	case children.size
@@ -162,16 +166,6 @@ module DataMapper::Adapters
 	  raise TypeError, "#{property} unsupported"
 	end
       end
-      model.relationships.each do |rel|
-#	$stderr.puts "Rel ? #{rel.inspect}"
-	children = node.xpath("./#{rel.child_model_name.downcase}")
-	value = []
-	while n = children.shift
-	  value << node_to_record(rel.child_model, n)
-	end
-	record[rel.name.to_s] = value
-#	$stderr.puts "#{rel.name} -> #{value.inspect}"
-      end
       record
     end
   end # class

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.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/keeper/relation.rb

@@ -7,7 +7,12 @@ class Relation
   end
   property :target, Integer, :key => true
   property :sort_position, Integer
-  has 1, :parent, self
-  belongs_to :relation, :required => false
-  belongs_to :relationtree, :required => false
+  # workaround for non-working associations
+  property :parent, Integer
+  
+  # this is how it should be - how to implement it in the adapter ??
+#  has 1, :parent, self
+#  belongs_to :relation, :required => false
+#  has n, :children, self
+#  belongs_to :relationtree, :required => false
 end

data/lib/keeper/relationtree.rb

@@ -15,6 +15,32 @@ class Relationtree
   property :id, Integer, :key => true
   property :title, String
   property :description, String
-#  has n, :relations
-  property :relations, Csv
+  property :raw, String
+# fixme:  has n, :relations
+  
+  #
+  # Workaround for missing association (see relation.rb)
+  # Save relationtree xml in 'raw' and parse it when 'Relationtree#relations' is accessed
+  # (should be a DataMapper::Associations::OneToMany::Collection :-/ )
+  #
+  
+  def node2relation node, parent = nil
+    rel = Relation.new( :target => node["target"] , :sort_position => node["sortPosition"], :parent => (parent) ? parent.target : nil)
+    node.element_children.each do |child|
+      relchild = node2relation(child, rel)
+    end
+    rel
+  end
+  
+  # convert 'raw' into Relations
+  def relations
+    retval = []
+    require 'nokogiri'
+    xml = Nokogiri::XML.parse @raw
+    parent = nil
+    xml.root.xpath("/relationtree/relation").each do |rel|
+      retval << node2relation(rel)
+    end
+    retval
+  end
 end

data/test/test_get_relationtree.rb

@@ -12,7 +12,7 @@ class Get_relationtree_test < Test::Unit::TestCase
     DataMapper.finalize
   end
 
-  def test_get_relationtree_by_id
+  def xtest_get_relationtree_by_id
     # Access relationtree by id
     tree = Relationtree.get(1137)
     assert tree
@@ -22,6 +22,18 @@ class Get_relationtree_test < Test::Unit::TestCase
     # Access relationtree by name
     tree = Relationtree.first(:title => "Manager 1.2.1")
     assert tree
+    assert tree.title
+    assert tree.description
     assert_equal 1137, tree.id
+    # lazy-load relations
+    assert tree.relations
+    assert tree.relations.size > 0
+    tree.relations.each do |rel|
+#      puts rel.inspect
+#      puts "Parent #{rel.parent}"
+#      puts "Children #{rel.children.size}"
+      assert rel.target
+      assert rel.sort_position
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-keeper-adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency