rsolr 1.0.10 → 1.0.11

data/spec/api/xml_spec.rb

@@ -4,12 +4,11 @@ require 'nokogiri'
 describe "RSolr::Xml" do
   
   let(:generator){ RSolr::Xml::Generator.new }
-  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_engines = { 
+    :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 }
+  }
 
   [:builder,:nokogiri].each do |engine_name|
     describe engine_name do
@@ -25,13 +24,13 @@ describe "RSolr::Xml" do
   
       before :each do
         builder_engines.each_pair do |name,spec|
-          spec[:class].should_not_receive(:new) unless name == engine_name
+          expect(spec[:class]).not_to receive(:new) unless name == engine_name
         end
       end
 
       context :xml_engine do
         it "should use #{engine_name}" do
-          @engine[:class].should_receive(:new).and_return(@engine[:engine])
+          expect(@engine[:class]).to receive(:new).and_return(@engine[:engine])
           generator.send(:commit)
         end
       end
@@ -42,7 +41,7 @@ describe "RSolr::Xml" do
       [: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}/>"
+          expect(result).to eq("<?xml version=\"1.0\" encoding=\"UTF-8\"?><#{meth}/>")
         end
       end
   
@@ -53,14 +52,14 @@ describe "RSolr::Xml" do
           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
+            expect(doc.fields.size).to eq(4)
+            expect(doc.fields_by_name(:cat).size).to eq(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>))
+          expect(result).to match(%r(name="cat">cat 1</field>))
+          expect(result).to match(%r(name="cat">cat 2</field>))
+          expect(result).to match(%r(<add boost="200.0">))
+          expect(result).to match(%r(boost="10"))
+          expect(result).to match(%r(<field name="id">1</field>))
         end
     
         # add a single hash ("doc")
@@ -70,8 +69,8 @@ describe "RSolr::Xml" do
             :name=>'matt'
           }
           result = generator.add(data)
-          result.should match(/<field name="name">matt<\/field>/)
-          result.should match(/<field name="id">1<\/field>/)
+          expect(result).to match(/<field name="name">matt<\/field>/)
+          expect(result).to match(/<field name="id">1<\/field>/)
         end
 
         # add an array of hashes
@@ -88,8 +87,8 @@ 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>"
-          message.should match(/<field name="name">matt<\/field>/)
-          message.should match(/<field name="name">sam<\/field>/)
+          expect(message).to match(/<field name="name">matt<\/field>/)
+          expect(message).to match(/<field name="name">sam<\/field>/)
         end
 
         # multiValue field support test, thanks to Fouad Mardini!
@@ -99,8 +98,8 @@ describe "RSolr::Xml" do
             :name => ['matt1', 'matt2']
           }
           result = generator.add(data)
-          result.should match(/<field name="name">matt1<\/field>/)
-          result.should match(/<field name="name">matt2<\/field>/)
+          expect(result).to match(/<field name="name">matt1<\/field>/)
+          expect(result).to match(/<field name="name">matt2<\/field>/)
         end
 
         it 'should create an add from a single Message::Document' do
@@ -108,11 +107,11 @@ describe "RSolr::Xml" do
           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>')
+          expect(result).to match(Regexp.escape('<?xml version="1.0" encoding="UTF-8"?>'))
+          expect(result).to match(/<field name="id">1<\/field>/)
+          expect(result).to match Regexp.escape('boost="2.0"')
+          expect(result).to match Regexp.escape('name="name"')
+          expect(result).to match Regexp.escape('matt</field>')
         end
     
         it 'should create adds from multiple Message::Documents' do
@@ -123,8 +122,8 @@ describe "RSolr::Xml" do
             doc
           end
           result = generator.add(documents)
-          result.should match(/<field name="name">matt1<\/field>/)
-          result.should match(/<field name="name">matt2<\/field>/)
+          expect(result).to match(/<field name="name">matt1<\/field>/)
+          expect(result).to match(/<field name="name">matt2<\/field>/)
         end
     
       end
@@ -132,26 +131,26 @@ describe "RSolr::Xml" 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>"
+          expect(generator.delete_by_id(10)).to eq("<?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>"
+          expect(generator.delete_by_id([1, 2, 3])).to eq("<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><id>1</id><id>2</id><id>3</id></delete>")
         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>"
+          expect(generator.delete_by_query('status:"LOST"')).to eq("<?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>"
+          expect(generator.delete_by_query(['status:"LOST"', 'quantity:0'])).to eq("<?xml version=\"1.0\" encoding=\"UTF-8\"?><delete><query>status:\"LOST\"</query><query>quantity:0</query></delete>")
         end
       end
 
     end
   end
     
-end
+end

data/spec/spec_helper.rb

@@ -1 +1,6 @@
-require File.expand_path('../../lib/rsolr', __FILE__)
+require 'rsolr'
+require 'rspec'
+
+RSpec.configure do |c|
+
+end

data/tasks/spec.rake

@@ -1,39 +1,2 @@
-require "rubygems"
-require 'rspec'
 require 'rspec/core/rake_task'
-
-namespace :spec do
-  
-  namespace :ruby do
-    desc 'run api specs through the Ruby implementations'
-    task :api do
-      puts "Ruby 1.8.7"
-      puts `rake spec:api`
-      puts "Ruby 1.9"
-      puts `rake1.9 spec:api`
-      puts "JRuby"
-      puts `jruby -S rake spec:api`
-    end
-  end
-  
-  desc 'run api specs (mock out Solr dependency)'
-  RSpec::Core::RakeTask.new(:api) do |t|
-    
-    t.pattern = [File.join('spec', 'spec_helper.rb')]
-    t.pattern += FileList[File.join('spec', 'api', '**', '*_spec.rb')]
-    
-    t.verbose = true
-    t.rspec_opts = ['--color']
-  end
-  
-  desc 'run integration specs'
-  RSpec::Core::RakeTask.new(:integration) do |t|
-    
-    t.pattern = [File.join('spec', 'spec_helper.rb')]
-    t.pattern += FileList[File.join('spec', 'integration', '**', '*_spec.rb')]
-    
-    t.verbose = true
-    t.rspec_opts = ['--color']
-  end
-  
-end
+RSpec::Core::RakeTask.new(:spec)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Antoine Latter
@@ -24,11 +24,12 @@ authors:
 - Fouad Mardini
 - Jeremy Hinegardner
 - Nathan Witmer
+- Naomi Dushay
 - '"shima"'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -78,42 +79,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.4
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.4
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '3.0'
 description: RSolr aims to provide a simple and extensible library for working with
   Solr
 email:
@@ -148,12 +149,12 @@ files:
 - spec/api/uri_spec.rb
 - spec/api/xml_spec.rb
 - spec/spec_helper.rb
-- tasks/rcov.rake
 - tasks/rdoc.rake
 - tasks/rsolr.rake
 - tasks/spec.rake
-homepage: https://github.com/mwmitchell/rsolr
-licenses: []
+homepage: https://github.com/rsolr/rsolr
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,9 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsolr
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr
 test_files: []
-has_rdoc: 

data/tasks/rcov.rake

@@ -1,25 +0,0 @@
-# require 'rake'
-# require 'spec/rake/spectask'
-#  
-# desc 'run specs with rcov'
-# Spec::Rake::SpecTask.new('rcov') do |t|
-#   t.spec_files = FileList['spec/**/*_spec.rb']
-#   t.rcov = true
-#   t.rcov_dir = File.join('coverage', 'all')
-#   # --only-uncovered
-#   t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage'])
-# end
-# 
-# namespace :rcov do
-#   desc 'run api specs with rcov'
-#   Spec::Rake::SpecTask.new('api') do |t|
-#     rm_f "coverage"
-#     rm_f "coverage.data"
-#     t.spec_files = FileList['spec/spec_helper.rb', 'spec/api/**/*_spec.rb']
-#     t.rcov = true
-#     t.rcov_dir = File.join('coverage', 'api')
-#     # --only-uncovered
-#     t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage'])
-#   end
-#   
-# end