de 0.0.5 → 0.0.6

data/lib/de/de.rb

@@ -114,23 +114,30 @@ module De
       str
     end
 
-    def to_hash
-      {
-        :name => @name,
-        :content => @content,
-        :class => self.class.name,
-        :children => children.map { |child| child.to_hash }
-      }
+    def copy
+      obj = self.clone
+      obj.parent = nil
+
+      obj
     end
 
-    class << self
+#    def to_hash
+#      {
+#        :name => @name,
+#        :content => @content,
+#        :class => self.class.name,
+#        :children => children.map { |child| child.to_hash }
+#      }
+#    end
 
-      def load(hash)
-        raise Error::InvalidExpressionError if (hash.keys - [:name, :content, :class, :children]).length > 0
+    class << self
 
-        obj = hash[:class].constantize.send(:new, hash[:name], hash[:content])
-        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

@@ -126,7 +126,8 @@ module De
       #  Search object
       #
       def &(obj)
-        Search.new("#{@name}+#{obj.name}", @klass, @options, [self.children, obj.children].flatten)
+        children = (self.children + obj.children).collect { |child| child.copy  }
+        Search.new("#{@name}+#{obj.name}", @klass, @options, children)
       end
 
       #
@@ -146,12 +147,12 @@ module De
         [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 }
+              element.first_child.children.each { |child| expression_content << child.copy }
             else
-              expression_content << element.first_child
+              expression_content << element.first_child.copy
             end
           else
-            expression_content << SunspotSolr::And.new(element.children)
+            expression_content << SunspotSolr::And.new(element.children.collect { |child| child.copy })
           end
         end
 

data/lib/de/version.rb

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

metadata

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