activedocument 0.3 → 0.4

data/lib/ActiveDocument/active_document.rb

@@ -104,6 +104,15 @@ module ActiveDocument
       @root
     end
 
+    def [](key)
+      namespace = namespace_for_element(key)
+      if namespace.empty?
+        @document.root.xpath("@#{key}").to_s
+      else
+        @document.root.xpath("@ns:#{key}", {'ns' => namespace}).to_s
+      end
+    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}")
@@ -246,7 +255,7 @@ module ActiveDocument
     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].text
+          result_nodeset[0]
           #elsif result_nodeset[0].children.length >1 # we are now dealing with complex nodes
         else
           PartialResult.new(result_nodeset, self)

data/lib/ActiveDocument/mark_logic_query_builder.rb

@@ -64,7 +64,7 @@ GENERATED
         xquery << "  xmlns:a=\"#{root_namespace}\"" unless root_namespace.nil?
         xquery << '>/'
         xquery << "a:" unless root_namespace.nil?
-        xquery << "#{root}</searchable-expression>)"
+        xquery << "#{root}</searchable-expression>"
       end
       xquery << <<CONSTRAINT
 <constraint name="word">

data/lib/ActiveDocument/{search_options.rb → mark_logic_search_options.rb}

@@ -13,13 +13,13 @@
 #   limitations under the License.
 
 
-# SearchOptions allow you to control exactly how the ActiveDocument::Finder#search method behaves and what additional
+# MarkLogicSearchOptions allow you to control exactly how the ActiveDocument::Finder#search method behaves and what additional
 # information may be returned in the ActiveDocument::SearchResults object
 # == Attributes
 # * return_facets - if true then facet information is returned in the resultant ActiveDocument::SearchResults object. Default is true
 # * value_constraints - this is a #Hash of value constraint names to their options. e.g. search_options_object.value_constraints["Region"] = {"namespace" => "http://wits.nctc.gov", "element" => "Region"}
 module ActiveDocument
-  class SearchOptions
+  class MarkLogicSearchOptions
     attr_accessor :return_facets, :value_constraints, :word_constraints, :range_constraints
 
     def initialize
@@ -65,9 +65,14 @@ module ActiveDocument
         constraints << <<-XML
             >
             <element ns="#{value["namespace"]}" name="#{value["element"]}"/>
-          </range>
-        </constraint>
         XML
+
+        if value.has_key?("computed_buckets")
+          value["computed_buckets"].each do |computed_bucket|
+            constraints << computed_bucket.to_s if computed_bucket.instance_of?(ActiveDocument::MarkLogicSearchOptions::ComputedBucket)
+          end
+        end
+        constraints << "</range></constraint>"
       end
 
       value = <<-XML
@@ -83,5 +88,26 @@ module ActiveDocument
       value << "</options>"
 
     end
+
+    #end to_s
+
+    class ComputedBucket
+      attr_accessor :name, :ge, :lt, :anchor, :title
+
+      def initialize (name, ge, lt, anchor, title)
+        @name = name
+        @ge = ge
+        @lt = lt
+        @anchor = anchor
+        @title = title
+      end
+
+      def to_s
+        <<-XML
+          <computed-bucket name="#{@name}" ge="#{@ge}" lt="#{@lt}" anchor="#{@anchor}">#{@title}</computed-bucket>
+        XML
+      end
+    end
   end
+
 end

data/lib/ActiveDocument/search_result.rb

@@ -45,16 +45,24 @@ module ActiveDocument
     end
 
     def fitness
-      Integer(@node.xpath("./@fitness").to_s)
+      Float(@node.xpath("./@fitness").to_s)
     end
 
     def each(&block)
-      @node.xpath("./search:snippet/search:match").each {|node| yield SearchMatch.new(node)}
+      nodeset = @node.xpath("./search:snippet/search:match")
+      if nodeset.length == 1
+        yield SearchMatch.new(nodeset[0])
+      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
-      full_path = @node.xpath("./search:snippet/search:match")[1].xpath("./@path").to_s
-      root = full_path.match(/:[[:alpha:]]+\//) # find the first :something/ which should indicate the root
+      full_path = @node.xpath("./search:snippet/search:match")[0].xpath("./@path").to_s
+      root = full_path.match(/:[[:alpha:]]+\/|:[[:alpha:]]+$/) # find the first :something/ which should indicate the root
       root.to_s.delete(":/") # remove the : and / to get the root element name
     end
 
@@ -62,6 +70,9 @@ module ActiveDocument
       SearchMatch.new(@node.xpath("./search:snippet/search:match")[index])
     end
 
+    def length
+      @node.xpath("./search:snippet/search:match").length
+    end
     def realize(klass)
       klass.load(uri)
     end

data/lib/ActiveDocument/search_results.rb

@@ -67,11 +67,20 @@ module ActiveDocument
     end
 
     def each(&block)
-      @results_document.xpath("/search:response/search:result").each {|node| yield SearchResult.new(node)}
+      nodeset = @results_document.xpath("/search:response/search:result")
+      if nodeset.length == 1
+        yield SearchResult.new(nodeset[0])
+      else
+        @results_document.xpath("/search:response/search:result").each {|node| yield SearchResult.new(node)}
+      end
     end
 
     def [](index)
-      @results_document[index]
+      SearchResult.new(@results_document.xpath("/search:response/search:result")[index])
+    end
+
+    def length
+      @results_document.xpath("/search:response/search:result").length
     end
 
   end

data/lib/active_document.rb

@@ -4,7 +4,7 @@ require 'ActiveDocument/inheritable'
 require 'ActiveDocument/mark_logic_http'
 require 'ActiveDocument/mark_logic_query_builder'
 require 'ActiveDocument/search_match'
-require 'ActiveDocument/search_options'
+require 'ActiveDocument/mark_logic_search_options'
 require 'ActiveDocument/search_result'
 require 'ActiveDocument/search_results'
 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Clark D. Richey, Jr.
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ files:
 - lib/ActiveDocument/inheritable.rb
 - lib/ActiveDocument/mark_logic_http.rb
 - lib/ActiveDocument/mark_logic_query_builder.rb
+- lib/ActiveDocument/mark_logic_search_options.rb
 - lib/ActiveDocument/search_match.rb
-- lib/ActiveDocument/search_options.rb
 - lib/ActiveDocument/search_result.rb
 - lib/ActiveDocument/search_results.rb
 - lib/activedocument.rb