rsolr 1.0.9 → 1.0.10.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f864085d45dbff290a9820ec8f12bb8388ac445a
+  data.tar.gz: 7a117de8e81fb1c59368d4c33bc342ea379f2239
+SHA512:
+  metadata.gz: 00410c0dd950cf7ff57a56dc55ae2d771a7de08f4b139558cd39029f763071709970400c6e99d3a5985135b54e205c576c10d8ac765010cb77e5acf71caeb87d
+  data.tar.gz: 3d274051c0b81c3267bdf9330ff7888c9ad65b7d6d8edb034e840d06f41c5bc49e55f7c8b72a0531518be03350e66b775b26bed9ffb65799b837753cfddcab49

data/.travis.yml

@@ -0,0 +1,15 @@
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+
+notifications:
+  irc: "irc.freenode.org#blacklight"
+  email:
+      - blacklight-commits@googlegroups.com
+
+env:
+  global:
+    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/lib/rsolr.rb

@@ -6,7 +6,7 @@ module RSolr
   
   %W(Response Char Client Error Connection Uri Xml).each{|n|autoload n.to_sym, "rsolr/#{n.downcase}"}
   
-  def self.version; "1.0.9" end
+  def self.version; "1.0.10.pre1" end
   
   VERSION = self.version
   

data/lib/rsolr/xml.rb

@@ -1,4 +1,4 @@
-require 'builder'
+begin; require 'nokogiri'; rescue LoadError; end
 
 module RSolr::Xml
   
@@ -71,13 +71,40 @@ module RSolr::Xml
   end
   
   class Generator
+    class << self
+      attr_accessor :use_nokogiri
+
+      def builder_proc
+        if use_nokogiri 
+          require 'nokogiri' unless defined?(::Nokogiri::XML::Builder)
+          :nokogiri_build
+        else
+          require 'builder' unless defined?(::Builder::XmlMarkup)
+          :builder_build
+        end
+      end
+    end
+    self.use_nokogiri = (defined?(::Nokogiri::XML::Builder) and not defined?(JRuby)) ? true : false
+
+    def nokogiri_build &block
+      b = ::Nokogiri::XML::Builder.new do |xml|
+        block_given? ? yield(xml) : xml
+      end
+      '<?xml version="1.0" encoding="UTF-8"?>'+b.to_xml(:indent => 0, :encoding => 'UTF-8', :save_with => ::Nokogiri::XML::Node::SaveOptions::AS_XML | ::Nokogiri::XML::Node::SaveOptions::NO_DECLARATION).strip
+    end
+    protected :nokogiri_build
     
-    def build &block
+    def builder_build &block
       b = ::Builder::XmlMarkup.new(:indent => 0, :margin => 0, :encoding => 'UTF-8')
       b.instruct!
       block_given? ? yield(b) : b
     end
-
+    protected :builder_build
+    
+    def build &block
+      self.send(self.class.builder_proc,&block)
+    end
+    
     # generates "add" xml for updating solr
     # "data" can be a hash or an array of hashes.
     # - each hash should be a simple key=>value pair representing a solr doc.
@@ -111,11 +138,12 @@ module RSolr::Xml
           data.each do |doc|
             doc = RSolr::Xml::Document.new(doc) if doc.respond_to?(:each_pair)
             yield doc if block_given?
-            add_node.doc(doc.attrs) do |doc_node|
+            doc_node_builder = lambda do |doc_node|
               doc.fields.each do |field_obj|
                 doc_node.field field_obj.value, field_obj.attrs
               end
             end
+            self.class.use_nokogiri ? add_node.doc_(doc.attrs,&doc_node_builder) : add_node.doc(doc.attrs,&doc_node_builder)
           end
         end
       end
@@ -144,7 +172,9 @@ module RSolr::Xml
       ids = [ids] unless ids.is_a?(Array)
       build do |xml|
         xml.delete do |delete_node|
-          ids.each { |id| delete_node.id(id) }
+          ids.each do |id| 
+            self.class.use_nokogiri ? delete_node.id_(id) : delete_node.id(id)
+          end
         end
       end
     end
@@ -162,4 +192,4 @@ module RSolr::Xml
     
   end
   
-end
+end

data/rsolr.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'builder', '>= 2.1.2'
+  s.add_development_dependency 'nokogiri', '>= 1.4.0'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'rdoc', '~> 3.9.4'
   s.add_development_dependency 'rspec', '~> 2.6.0'

data/spec/api/xml_spec.rb

@@ -1,121 +1,157 @@
 require 'spec_helper'
+require 'builder'
+require 'nokogiri'
 describe "RSolr::Xml" do
   
   let(:generator){ RSolr::Xml::Generator.new }
-  
-  # call all of the simple methods...
-  # make sure the xml string is valid
-  # ensure the class is actually Solr::XML
-  [:optimize, :rollback, :commit].each do |meth|
-    it "#{meth} should generator xml" do
-      result = generator.send(meth)
-      result.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><#{meth}/>"
-    end
+  let(:builder_engines) do
+    { 
+      :builder   => { :val => false, :class => Builder::XmlMarkup, :engine => Builder::XmlMarkup.new(:indent => 0, :margin => 0, :encoding => 'UTF-8') },
+      :nokogiri  => { :val => true,  :class => Nokogiri::XML::Builder, :engine => Nokogiri::XML::Builder.new }
+    }
   end
+
+  [:builder,:nokogiri].each do |engine_name|
+    describe engine_name do
+      before :all do
+        @engine = builder_engines[engine_name]
+        @old_ng_setting = RSolr::Xml::Generator.use_nokogiri
+        RSolr::Xml::Generator.use_nokogiri = @engine[:val]
+      end
+
+      after :all do
+        RSolr::Xml::Generator.use_nokogiri = @old_ng_setting
+      end
   
-  context :add do
-    
-    it 'should yield a Message::Document object when #add is called with a block' do
-      documents = [{:id=>1, :name=>'sam', :cat=>['cat 1', 'cat 2']}]
-      add_attrs = {:boost=>200.00}
-      result = generator.add(documents, add_attrs) do |doc|
-        doc.field_by_name(:name).attrs[:boost] = 10
-        doc.fields.size.should == 4
-        doc.fields_by_name(:cat).size.should == 2
+      before :each do
+        builder_engines.each_pair do |name,spec|
+          spec[:class].should_not_receive(:new) unless name == engine_name
+        end
       end
-      result.should match(%r(name="cat">cat 1</field>))
-      result.should match(%r(name="cat">cat 2</field>))
-      result.should match(%r(<add boost="200.0">))
-      result.should match(%r(boost="10"))
-      result.should match(%r(<field name="id">1</field>))
-    end
+
+      context :xml_engine do
+        it "should use #{engine_name}" do
+          @engine[:class].should_receive(:new).and_return(@engine[:engine])
+          generator.send(:commit)
+        end
+      end
+  
+      # call all of the simple methods...
+      # make sure the xml string is valid
+      # ensure the class is actually Solr::XML
+      [:optimize, :rollback, :commit].each do |meth|
+        it "#{meth} should generator xml" do
+          result = generator.send(meth)
+          result.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><#{meth}/>"
+        end
+      end
+  
+      context :add do
     
-    # add a single hash ("doc")
-    it 'should create an add from a hash' do
-      data = {
-        :id=>1,
-        :name=>'matt'
-      }
-      result = generator.add(data)
-      result.should match(/<field name="name">matt<\/field>/)
-      result.should match(/<field name="id">1<\/field>/)
-    end
+        it 'should yield a Message::Document object when #add is called with a block' do
+          documents = [{:id=>1, :name=>'sam', :cat=>['cat 1', 'cat 2']}]
+          add_attrs = {:boost=>200.00}
+          result = generator.add(documents, add_attrs) do |doc|
+            doc.field_by_name(:name).attrs[:boost] = 10
+            doc.fields.size.should == 4
+            doc.fields_by_name(:cat).size.should == 2
+          end
+          result.should match(%r(name="cat">cat 1</field>))
+          result.should match(%r(name="cat">cat 2</field>))
+          result.should match(%r(<add boost="200.0">))
+          result.should match(%r(boost="10"))
+          result.should match(%r(<field name="id">1</field>))
+        end
+    
+        # add a single hash ("doc")
+        it 'should create an add from a hash' do
+          data = {
+            :id=>1,
+            :name=>'matt'
+          }
+          result = generator.add(data)
+          result.should match(/<field name="name">matt<\/field>/)
+          result.should match(/<field name="id">1<\/field>/)
+        end
 
-    # add an array of hashes
-    it 'should create many adds from an array of hashes' do
-      data = [
-        {
-          :id=>1,
-          :name=>'matt'
-        },
-        {
-          :id=>2,
-          :name=>'sam'
-        }
-      ]
-      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>"
-      message.should match(/<field name="name">matt<\/field>/)
-      message.should match(/<field name="name">sam<\/field>/)
-    end
+        # add an array of hashes
+        it 'should create many adds from an array of hashes' do
+          data = [
+            {
+              :id=>1,
+              :name=>'matt'
+            },
+            {
+              :id=>2,
+              :name=>'sam'
+            }
+          ]
+          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>"
+          message.should match(/<field name="name">matt<\/field>/)
+          message.should match(/<field name="name">sam<\/field>/)
+        end
 
-    # multiValue field support test, thanks to Fouad Mardini!
-    it 'should create multiple fields from array values' do
-      data = {
-        :id   => 1,
-        :name => ['matt1', 'matt2']
-      }
-      result = generator.add(data)
-      result.should match(/<field name="name">matt1<\/field>/)
-      result.should match(/<field name="name">matt2<\/field>/)
-    end
+        # multiValue field support test, thanks to Fouad Mardini!
+        it 'should create multiple fields from array values' do
+          data = {
+            :id   => 1,
+            :name => ['matt1', 'matt2']
+          }
+          result = generator.add(data)
+          result.should match(/<field name="name">matt1<\/field>/)
+          result.should match(/<field name="name">matt2<\/field>/)
+        end
 
-    it 'should create an add from a single Message::Document' do
-      document = RSolr::Xml::Document.new
-      document.add_field('id', 1)
-      document.add_field('name', 'matt', :boost => 2.0)
-      result = generator.add(document)
-      result.should match(Regexp.escape('<?xml version="1.0" encoding="UTF-8"?>'))
-      result.should match(/<field name="id">1<\/field>/)
-      result.should match Regexp.escape('boost="2.0"')
-      result.should match Regexp.escape('name="name"')
-      result.should match Regexp.escape('matt</field>')
-    end
+        it 'should create an add from a single Message::Document' do
+          document = RSolr::Xml::Document.new
+          document.add_field('id', 1)
+          document.add_field('name', 'matt', :boost => 2.0)
+          result = generator.add(document)
+          result.should match(Regexp.escape('<?xml version="1.0" encoding="UTF-8"?>'))
+          result.should match(/<field name="id">1<\/field>/)
+          result.should match Regexp.escape('boost="2.0"')
+          result.should match Regexp.escape('name="name"')
+          result.should match Regexp.escape('matt</field>')
+        end
     
-    it 'should create adds from multiple Message::Documents' do
-      documents = (1..2).map do |i|
-        doc = RSolr::Xml::Document.new
-        doc.add_field('id', i)
-        doc.add_field('name', "matt#{i}")
-        doc
-      end
-      result = generator.add(documents)
-      result.should match(/<field name="name">matt1<\/field>/)
-      result.should match(/<field name="name">matt2<\/field>/)
-    end
+        it 'should create adds from multiple Message::Documents' do
+          documents = (1..2).map do |i|
+            doc = RSolr::Xml::Document.new
+            doc.add_field('id', i)
+            doc.add_field('name', "matt#{i}")
+            doc
+          end
+          result = generator.add(documents)
+          result.should match(/<field name="name">matt1<\/field>/)
+          result.should match(/<field name="name">matt2<\/field>/)
+        end
     
-  end
+      end
   
-  context :delete_by_id do
+      context :delete_by_id do
     
-    it 'should create a doc id delete' do
-      generator.delete_by_id(10).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><id>10</id></delete>"
-    end
+        it 'should create a doc id delete' do
+          generator.delete_by_id(10).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><id>10</id></delete>"
+        end
     
-    it 'should create many doc id deletes' do
-      generator.delete_by_id([1, 2, 3]).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><id>1</id><id>2</id><id>3</id></delete>"
-    end
+        it 'should create many doc id deletes' do
+          generator.delete_by_id([1, 2, 3]).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><id>1</id><id>2</id><id>3</id></delete>"
+        end
     
-  end
+      end
   
-  context :delete_by_query do
-    it 'should create a query delete' do
-      generator.delete_by_query('status:"LOST"').should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><query>status:\"LOST\"</query></delete>"
-    end
+      context :delete_by_query do
+        it 'should create a query delete' do
+          generator.delete_by_query('status:"LOST"').should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><query>status:\"LOST\"</query></delete>"
+        end
     
-    it 'should create many query deletes' do
-      generator.delete_by_query(['status:"LOST"', 'quantity:0']).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><query>status:\"LOST\"</query><query>quantity:0</query></delete>"
+        it 'should create many query deletes' do
+          generator.delete_by_query(['status:"LOST"', 'quantity:0']).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><query>status:\"LOST\"</query><query>quantity:0</query></delete>"
+        end
+      end
+
     end
   end
-  
+    
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 1.0.9
-  prerelease: 
+  version: 1.0.10.pre1
 platform: ruby
 authors:
 - Antoine Latter
@@ -25,56 +24,82 @@ authors:
 - Fouad Mardini
 - Jeremy Hinegardner
 - Nathan Witmer
-- ! '"shima"'
+- '"shima"'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70317957140320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317957140320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70317957139580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70317957139580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70317957138980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.9.4
   type: :development
   prerelease: false
-  version_requirements: *70317957138980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.9.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70317957138400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70317957138400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 description: RSolr aims to provide a simple and extensible library for working with
   Solr
 email:
@@ -84,6 +109,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGES.txt
 - Gemfile
 - LICENSE
@@ -113,26 +139,26 @@ files:
 - tasks/spec.rake
 homepage: https://github.com/mwmitchell/rsolr
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rsolr
-rubygems_version: 1.8.11
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby client for Apache Solr
 test_files: []
+has_rdoc: