rsolr 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12bcd80599dbe9baf6b616dd23422a935587718
-  data.tar.gz: ea19f8226b2a7737099c38094899a46a649e3de0
+  metadata.gz: 452ea2927fbbb82cad4aba0948007a0e6cf1bd13
+  data.tar.gz: 7cbed4e5da8b29a69c3f8004f29a91de9d299fcb
 SHA512:
-  metadata.gz: dc3e492100005e174362232e5cf4b1e6d0d0e8a4288fd8810256980747288f9ff74fa61411d565610c9c234d2d638fe1c190a1c4bb35d57310b54005a1943440
-  data.tar.gz: 0ec2bcdf0bbcfdc8bc82d711f9c5df3158f56c948f8ae698ce07a7959aeb82534f2a202c90461003a3d99f1ce411d58b9d80e7e24ca433a1a463d6fd0b89363b
+  metadata.gz: 5abc10f76135922d1f5ce642efa245b20bf29ac01432d6dfbf8f053944b60d70fe76db2dac7eec41d35b72a8fff66cff6b98a11b449d2796243df111eb06c4bd
+  data.tar.gz: 5b096b2d49a2721c86cef3d879bca8d806234c8a5f1784b9686e5ae0c39873a048cb6affb0f6f73918eaf2a771cc8e04041320ec9df75e76bd41a11cc03a60af

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - jruby-9.1.5.0
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - jruby-9.1.7.0
 
 env:
   global:

data/lib/rsolr/document.rb

@@ -38,8 +38,6 @@ module RSolr
     #
     def add_field(name, values, options = {})
       RSolr::Array.wrap(values).each do |v|
-        next if v.nil?
-
         field_attrs = { name: name }
         field_attrs[:type] = DocumentField if name.to_s == CHILD_DOCUMENT_KEY
 
@@ -55,91 +53,4 @@ module RSolr
       end
     end
   end
-
-  class Field
-
-    def self.instance(attrs, value)
-      attrs = attrs.dup
-      field_type = attrs.delete(:type) {  value.class.name }
-
-      klass = if field_type.is_a? String
-                class_for_field(field_type)
-              elsif field_type.is_a? Class
-                field_type
-              else
-                self
-              end
-
-      klass.new(attrs, value)
-    end
-
-    def self.class_for_field(field_type)
-      potential_class_name = field_type + 'Field'.freeze
-      search_scope = Module.nesting[1]
-      search_scope.const_defined?(potential_class_name, false) ? search_scope.const_get(potential_class_name) : self
-    end
-    private_class_method :class_for_field
-
-    # "attrs" is a hash for setting the "doc" xml attributes
-    # "value" is the text value for the node
-    attr_accessor :attrs, :source_value
-
-    # "attrs" must be a hash
-    # "value" should be something that responds to #_to_s
-    def initialize(attrs, source_value)
-      @attrs = attrs
-      @source_value = source_value
-    end
-
-    # the value of the "name" attribute
-    def name
-      attrs[:name]
-    end
-
-    def value
-      source_value
-    end
-
-    def as_json
-      if attrs[:update]
-        { attrs[:update] => value }
-      elsif attrs.any? { |k, _| k != :name }
-        hash = attrs.dup
-        hash.delete(:name)
-        hash.merge(value: value)
-      else
-        value
-      end
-    end
-  end
-
-  class DateField < Field
-    def value
-      Time.utc(source_value.year, source_value.mon, source_value.mday).iso8601
-    end
-  end
-
-  class TimeField < Field
-    def value
-      source_value.getutc.strftime('%FT%TZ')
-    end
-  end
-
-  class DateTimeField < Field
-    def value
-      source_value.to_time.getutc.iso8601
-    end
-  end
-
-  class DocumentField < Field
-    def value
-      return RSolr::Document.new(source_value) if source_value.respond_to? :each_pair
-
-      super
-    end
-
-    def as_json
-      value.as_json
-    end
-  end
 end

data/lib/rsolr/field.rb

@@ -0,0 +1,87 @@
+module RSolr
+  class Field
+    def self.instance(attrs, value)
+      attrs = attrs.dup
+      field_type = attrs.delete(:type) {  value.class.name }
+
+      klass = if field_type.is_a? String
+                class_for_field(field_type)
+              elsif field_type.is_a? Class
+                field_type
+              else
+                self
+              end
+
+      klass.new(attrs, value)
+    end
+
+    def self.class_for_field(field_type)
+      potential_class_name = field_type + 'Field'.freeze
+      search_scope = Module.nesting[1]
+      search_scope.const_defined?(potential_class_name, false) ? search_scope.const_get(potential_class_name) : self
+    end
+    private_class_method :class_for_field
+
+    # "attrs" is a hash for setting the "doc" xml attributes
+    # "value" is the text value for the node
+    attr_accessor :attrs, :source_value
+
+    # "attrs" must be a hash
+    # "value" should be something that responds to #_to_s
+    def initialize(attrs, source_value)
+      @attrs = attrs
+      @source_value = source_value
+    end
+
+    # the value of the "name" attribute
+    def name
+      attrs[:name]
+    end
+
+    def value
+      source_value
+    end
+
+    def as_json
+      if attrs[:update]
+        { attrs[:update] => value }
+      elsif attrs.any? { |k, _| k != :name }
+        hash = attrs.dup
+        hash.delete(:name)
+        hash.merge(value: value)
+      else
+        value
+      end
+    end
+  end
+
+  class DateField < Field
+    def value
+      Time.utc(source_value.year, source_value.mon, source_value.mday).iso8601
+    end
+  end
+
+  class TimeField < Field
+    def value
+      source_value.getutc.strftime('%FT%TZ')
+    end
+  end
+
+  class DateTimeField < Field
+    def value
+      source_value.to_time.getutc.iso8601
+    end
+  end
+
+  class DocumentField < Field
+    def value
+      return RSolr::Document.new(source_value) if source_value.respond_to? :each_pair
+
+      super
+    end
+
+    def as_json
+      value.as_json
+    end
+  end
+end

data/lib/rsolr/json.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rsolr/generator'
 
 module RSolr::JSON
   class Generator < RSolr::Generator

data/lib/rsolr/version.rb

@@ -1,5 +1,5 @@
 module RSolr
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 
   def self.version
     VERSION

data/lib/rsolr/xml.rb

@@ -1,6 +1,6 @@
+require 'rsolr/generator'
+require 'rsolr/document'
 module RSolr::Xml
-  require 'rsolr/document'
-
   Document = RSolr::Document
   Field = RSolr::Field
 
@@ -133,12 +133,15 @@ module RSolr::Xml
       lambda do |doc_node|
         doc.fields.each do |field_obj|
           value = field_obj.value
+
           if field_obj.name.to_s == RSolr::Document::CHILD_DOCUMENT_KEY
             child_node_builder = to_xml(field_obj.value)
             self.class.use_nokogiri ? doc_node.doc_(&child_node_builder) : doc_node.doc(&child_node_builder)
           elsif value.is_a?(Hash) && value.length == 1 && field_obj.attrs[:update].nil?
             update_attr, real_value = value.first
             doc_node.field real_value, field_obj.attrs.merge(update: update_attr)
+          elsif value.nil?
+            doc_node.field field_obj.value, field_obj.attrs.merge(null: true)
           else
             doc_node.field field_obj.value, field_obj.attrs
           end

data/lib/rsolr.rb

@@ -25,7 +25,7 @@ module RSolr
   module Array
     def self.wrap(object)
       if object.nil?
-        []
+        [nil]
       elsif object.respond_to?(:to_ary)
         object.to_ary || [object]
       elsif object.is_a? Hash
@@ -37,4 +37,4 @@ module RSolr
       end
     end
   end
-end
+end

data/spec/api/xml_spec.rb

@@ -89,6 +89,15 @@ RSpec.describe RSolr::Xml do
           expect(result).to match(/<field name="name" update="set">matt<\/field>/)
           expect(result).to match(/<field name="id">1<\/field>/)
         end
+        it 'should remove a field from a hash formatted for atomic updates' do
+          data = {
+            :id => 1,
+            :name => nil
+          }
+          result = generator.add(data)
+          expect(result).to match(%r{<field name="name" null="true"})
+          expect(result).to match(/<field name="id">1<\/field>/)
+        end
 
         # add an array of hashes
         it 'should create many adds from an array of hashes' do
@@ -103,7 +112,6 @@ RSpec.describe RSolr::Xml do
             }
           ]
           message = generator.add(data)
-          expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><add><doc><field name=\"id\">1</field><field name=\"name\">matt</field></doc><doc><field name=\"id\">2</field><field name=\"name\">sam</field></doc></add>"
           expect(message).to match %r{<field name="name">matt</field>}
           expect(message).to match %r{<field name="name">sam</field>}
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Antoine Latter
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -164,6 +164,7 @@ files:
 - lib/rsolr/client.rb
 - lib/rsolr/document.rb
 - lib/rsolr/error.rb
+- lib/rsolr/field.rb
 - lib/rsolr/generator.rb
 - lib/rsolr/json.rb
 - lib/rsolr/response.rb
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Apache Solr
 rubyforge_project: rsolr
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr