activedocument 0.4 → 0.4.1

data/lib/ActiveDocument/active_document.rb

@@ -13,10 +13,10 @@
 #   limitations under the License.
 
 
-require 'ActiveDocument/mark_logic_http'
 require 'rubygems'
 require 'nokogiri'
 require 'yaml'
+require 'ActiveDocument/mark_logic_http'
 require 'ActiveDocument/mark_logic_query_builder'
 require 'ActiveDocument/search_results'
 require 'ActiveDocument/finder'
@@ -113,6 +113,10 @@ module ActiveDocument
       end
     end
 
+    def []=(key, value)
+      set_attribute(key, value)
+    end
+
     # enables the dynamic finders
     def method_missing(method_id, * arguments, & block)
       @@log.debug("ActiveDocument::Base at line #{__LINE__}: method called is #{method_id} with arguments #{arguments}")
@@ -124,6 +128,8 @@ module ActiveDocument
         access_element $1
       elsif method =~ /^(\w*)=$/ && arguments.length == 1 # methods with no '.' in them and ending in '='
         set_element($1, arguments)
+      else
+        super
       end
     end
 
@@ -205,10 +211,16 @@ module ActiveDocument
 
 
     class PartialResult < self
+      include Enumerable
       # todo should this contain a reference to its parent?
       def initialize(nodeset, parent)
         @document = nodeset
-        @root = nodeset[0].name
+        @root =
+                if nodeset.instance_of? Nokogiri::XML::Element then
+                  nodeset.name
+                else
+                  nodeset[0].name
+                end
         @my_namespaces = parent.class.my_namespaces
         @my_default_namespace = parent.class.my_default_namespace
       end
@@ -228,6 +240,14 @@ module ActiveDocument
         @document[index]
       end
 
+      def text
+        @document.text
+      end
+
+      def each(&block)
+        @document.each(&block)
+      end
+
     end
 
     private
@@ -253,26 +273,14 @@ module ActiveDocument
     end
 
     def evaluate_nodeset(result_nodeset)
-      if result_nodeset.length == 1 # found one match
-        if result_nodeset[0].children.length == 1 and result_nodeset[0].children[0].type == Nokogiri::XML::Node::TEXT_NODE
-          result_nodeset[0]
-          #elsif result_nodeset[0].children.length >1 # we are now dealing with complex nodes
-        else
-          PartialResult.new(result_nodeset, self)
-        end
-      elsif result_nodeset.length >1 # multiple matches
-        if result_nodeset.all? { |node| node.children.length == 1 } and result_nodeset.all? { |node| node.children[0].type == Nokogiri::XML::Node::TEXT_NODE }
-          # we have multiple simple text nodes
-          result_nodeset.collect { |node| node.text }
-        else
-          # we have multiple complex elements
-          PartialResult.new(result_nodeset, self)
-        end
+      if result_nodeset.length == 1 and result_nodeset[0].children.length == 1 and result_nodeset[0].children[0].type == Nokogiri::XML::Node::TEXT_NODE
+        PartialResult.new(result_nodeset[0], self)
+      else
+        PartialResult.new(result_nodeset, self)
       end
     end
 
     def set_element(element, value)
-      # element.chop!
       xpath, namespace = xpath_for_element(element)
       if namespace.nil?
         node = @document.xpath(xpath)
@@ -286,6 +294,17 @@ module ActiveDocument
       end
     end
 
+    def set_attribute(attribute, value)
+      namespace = namespace_for_element(attribute)
+      node = if namespace.empty?
+        @document.xpath("@#{attribute}")
+      else
+        @document.xpath("@ns:#{attribute}", {'ns' => namespace})
+      end
+      node[0].child.content = value
+
+    end
+
     def access_element(element)
       xpath, namespace = xpath_for_element(element)
       if namespace.nil?
@@ -293,6 +312,7 @@ module ActiveDocument
       else
         nodes = @document.xpath(xpath, {'ns' => namespace})
       end
+#      PartialResult.new(nodes, self)
       evaluate_nodeset(nodes)
 
     end
@@ -311,4 +331,4 @@ module ActiveDocument
   end
 
 
-end # end module
+end # end module

data/lib/ActiveDocument/finder.rb

@@ -12,10 +12,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-require 'ActiveDocument/mark_logic_http'
-require 'ActiveDocument/mark_logic_query_builder'
 require 'rubygems'
 require 'nokogiri'
+require 'ActiveDocument/mark_logic_query_builder'
+require 'ActiveDocument/mark_logic_http'
 require 'ActiveDocument/search_results'
 require 'logger'
 
@@ -41,7 +41,7 @@ module ActiveDocument
         namespace = arguments[1] if arguments.length == 2
         execute_finder($1.to_sym, arguments[0], nil, namespace)
       else
-        puts "missed"
+        super
       end
     end
 

data/lib/ActiveDocument/search_result.rb

@@ -55,9 +55,6 @@ module ActiveDocument
       else
         @node.xpath("./search:snippet/search:match").each {|node| yield SearchMatch.new(node)}
       end
-
-
-#      @node.xpath("./search:snippet/search:match").each {|node| yield SearchMatch.new(node)}
     end
 
     def root_type

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  version: "0.4"
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Clark D. Richey, Jr.
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +59,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="