de 0.0.4 → 0.0.5

data/lib/de/de.rb

@@ -114,30 +114,23 @@ module De
       str
     end
 
-#    def to_hash
-#      {
-#        :name => @name,
-#        :content => @content,
-#        :class => self.class.name,
-#        :children => children.map { |child| child.to_hash }
-#      }
-#    end
+    def to_hash
+      {
+        :name => @name,
+        :content => @content,
+        :class => self.class.name,
+        :children => children.map { |child| child.to_hash }
+      }
+    end
 
     class << self
 
-#      def load(hash)
-#        raise Error::InvalidExpressionError if (hash.keys - [:name, :content, :class, :children]).length > 0
-#
-#        klass = hash[:class].constantize
-#        params = case klass.method(:new).arity
-#        when -1,0 then []
-#        when -2,1 then [hash[:name]]
-#        else [hash[:name], hash[:content]]
-#        end
-#
-#        obj = klass.send(:new, *params)
-#        hash[:children].each { |child| obj << load(child) }
-#      end
+      def load(hash)
+        raise Error::InvalidExpressionError if (hash.keys - [:name, :content, :class, :children]).length > 0
+
+        obj = hash[:class].constantize.send(:new, hash[:name], hash[:content])
+        hash[:children].each { |child| obj << load(child) }
+      end
     end
 
     private

data/lib/de/sunspot_solr/search.rb

@@ -143,8 +143,17 @@ module De
       #
       def |(obj)
         expression_content = []
-        expression_content << SunspotSolr::And.new(self.children) if self.has_children?
-        expression_content << SunspotSolr::And.new(obj.children) if obj.has_children?
+        [self, obj].select { |element| element.has_children? }.each do |element|
+          if element.children.length == 1
+            if element.first_child.is_a?(De::SunspotSolr::Or)
+              element.first_child.children.each { |child| expression_content << child }
+            else
+              expression_content << element.first_child
+            end
+          else
+            expression_content << SunspotSolr::And.new(element.children)
+          end
+        end
 
         Search.new("#{@name}+#{obj.name}", @klass, @options, expression_content.length > 0 ? [SunspotSolr::Or.new(expression_content)] : nil)
       end
@@ -204,6 +213,20 @@ module De
         evaluate(params).results
       end
       
+#      def to_hash
+#        children_hash = children.inject({}) { |result, child| result.merge(child.to_hash) }
+#        {:options => options, :children => children_hash}
+#      end
+#
+#      class << self
+#
+#        def load(hash)
+#          raise Error::InvalidExpressionError if (hash.keys - [:name, :content, :class, :children]).length > 0
+#
+#          obj = hash[:class].constantize.send(:new, hash[:name], hash[:content])
+#          hash[:children].each { |child| obj << load(child) }
+#        end
+#      end
     end
   end
 end

data/lib/de/version.rb

@@ -1,3 +1,3 @@
 module De
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/de_sunspot_solr_search_test.rb

@@ -209,6 +209,64 @@ class DeSunspotSolrSearchTest < Test::Unit::TestCase
     assert_instance_of(And, and_operator2)
     assert_equal(2, and_operator2.children.length)
     assert(!and_operator2[operand.name].nil? && !and_operator2[operand2.name].nil? || !and_operator2[operand3.name].nil? && !and_operator2[operand4.name].nil?)
+
+    ###########
+    search1 = Search.new('search_product1', 'SomeClass', {
+      :properties => {
+        :client_id => {:type => :integer, :dynamic => false},
+      },
+      :dynamics => {:integer => :int_params, :string => :string_params, :time => :time_params, :text => :string_params}
+    })
+    search1 << operand
+    search1 << operand2
+    search2 = Search.new('search_product1', 'SomeClass', {
+      :properties => {
+        :client_id => {:type => :integer, :dynamic => false},
+      },
+      :dynamics => {:integer => :int_params, :string => :string_params, :time => :time_params, :text => :string_params}
+    })
+    search2 << operand3
+    search2 << operand4
+    search3 = Search.new('search_product1', 'SomeClass', {
+      :properties => {
+        :client_id => {:type => :integer, :dynamic => false},
+      },
+      :dynamics => {:integer => :int_params, :string => :string_params, :time => :time_params, :text => :string_params}
+    })
+    operand5 = EqualTo.new(:client_id, 61)
+    operand6 = EqualTo.new(:client_id, 92)
+    search3 << operand5
+    search3 << operand6
+    search = search1 | search2 | search3
+    assert_equal(1, search.children.length)
+    assert_instance_of(De::SunspotSolr::Or, search.first_child)
+    assert_equal(3, search.first_child.children.length)
+    (0..2).each do |index|
+      assert_instance_of(De::SunspotSolr::And, search.first_child.children[index])
+      assert_equal(2,search.first_child.children[index].children.length)
+    end
+
+    #########
+    search1 = Search.new('search_product1', 'SomeClass', {
+      :properties => {
+        :client_id => {:type => :integer, :dynamic => false},
+      },
+      :dynamics => {:integer => :int_params, :string => :string_params, :time => :time_params, :text => :string_params}
+    })
+    search1 << operand
+    search2 = Search.new('search_product1', 'SomeClass', {
+      :properties => {
+        :client_id => {:type => :integer, :dynamic => false},
+      },
+      :dynamics => {:integer => :int_params, :string => :string_params, :time => :time_params, :text => :string_params}
+    })
+    search2 << operand3
+    search = search1 | search2
+    assert_equal(1, search.children.length)
+    assert_instance_of(De::SunspotSolr::Or, search.first_child)
+    assert_equal(2, search.first_child.children.length)
+    assert_equal(operand, search.first_child.children[0])
+    assert_equal(operand3, search.first_child.children[1])
   end
 
   def test_intersection

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: de
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Olga Gorun
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 +03:00
+date: 2011-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency