From 87f7763f90dd63eb9e4148f9bd140adf94f1ab49 Mon Sep 17 00:00:00 2001 From: Ben Langfeld Date: Thu, 9 Jun 2011 22:59:39 +0100 Subject: [PATCH 1/3] Remove Nokogiri core_ext specs --- spec/blather/core_ext/nokogiri_spec.rb | 83 -------------------------- 1 file changed, 83 deletions(-) delete mode 100644 spec/blather/core_ext/nokogiri_spec.rb diff --git a/spec/blather/core_ext/nokogiri_spec.rb b/spec/blather/core_ext/nokogiri_spec.rb deleted file mode 100644 index 4efb4e5a..00000000 --- a/spec/blather/core_ext/nokogiri_spec.rb +++ /dev/null @@ -1,83 +0,0 @@ -require 'spec_helper' - -describe 'Nokogiri::XML::Node' do - before { @doc = Nokogiri::XML::Document.new } - - it 'aliases #name to #element_name' do - node = Nokogiri::XML::Node.new 'foo', @doc - node.must_respond_to :element_name - node.element_name.must_equal node.name - end - - it 'aliases #name= to #element_name=' do - node = Nokogiri::XML::Node.new 'foo', @doc - node.must_respond_to :element_name= - node.element_name.must_equal node.name - node.element_name = 'bar' - node.element_name.must_equal 'bar' - end - - it 'allows symbols as hash keys for attributes' do - attrs = Nokogiri::XML::Node.new('foo', @doc) - attrs['foo'] = 'bar' - - attrs['foo'].must_equal 'bar' - attrs[:foo].must_equal 'bar' - end - - it 'ensures a string is passed to the attribute setter' do - attrs = Nokogiri::XML::Node.new('foo', @doc) - attrs[:foo] = 1 - attrs[:foo].must_equal '1' - - attrs[:jid] = Blather::JID.new('n@d/r') - attrs[:jid].must_equal 'n@d/r' - end - - it 'removes an attribute when set to nil' do - attrs = Nokogiri::XML::Node.new('foo', @doc) - attrs['foo'] = 'bar' - - attrs['foo'].must_equal 'bar' - attrs['foo'] = nil - attrs['foo'].must_be_nil - end - - it 'allows attribute values to change' do - attrs = Nokogiri::XML::Node.new('foo', @doc) - attrs['foo'] = 'bar' - - attrs['foo'].must_equal 'bar' - attrs['foo'] = 'baz' - attrs['foo'].must_equal 'baz' - end - - it 'allows symbols as the path in #xpath' do - node = Nokogiri::XML::Node.new('foo', @doc) - node.must_respond_to :find - @doc.root = node - @doc.xpath(:foo).first.wont_be_nil - @doc.xpath(:foo).first.must_equal @doc.xpath('/foo').first - end - - it 'allows symbols as namespace names in #xpath' do - node = Nokogiri::XML::Node.new('foo', @doc) - node.namespace = node.add_namespace('bar', 'baz') - @doc.root = node - node.xpath('/bar:foo', :bar => 'baz').first.wont_be_nil - end - - it 'aliases #xpath to #find' do - node = Nokogiri::XML::Node.new('foo', @doc) - node.must_respond_to :find - @doc.root = node - node.find('/foo').first.wont_be_nil - end - - it 'has a helper function #find_first' do - node = Nokogiri::XML::Node.new('foo', @doc) - node.must_respond_to :find - @doc.root = node - node.find_first('/foo').must_equal node.find('/foo').first - end -end From 52b3d5fb2623ee4a5ff4526b98436aa8a19ffb19 Mon Sep 17 00:00:00 2001 From: Ben Langfeld Date: Thu, 9 Jun 2011 23:00:10 +0100 Subject: [PATCH 2/3] Update niceogiri dependency version --- blather.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blather.gemspec b/blather.gemspec index 11519f93..17e005a6 100644 --- a/blather.gemspec +++ b/blather.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency("eventmachine", ["~> 0.12.6"]) s.add_dependency("nokogiri", [">= 1.4.0"]) - s.add_dependency("niceogiri", [">= 0.0.3"]) + s.add_dependency("niceogiri", [">= 0.0.4"]) s.add_dependency("minitest", [">= 1.7.1"]) s.add_dependency("activesupport", [">= 3.0.7"]) From 3bb7bc7e85b6a5b9ef4b61ebb23db717a3d1f416 Mon Sep 17 00:00:00 2001 From: Ben Langfeld Date: Thu, 9 Jun 2011 23:03:00 +0100 Subject: [PATCH 3/3] Bump version and update CHANGELOG --- CHANGELOG | 5 ++++- lib/blather/version.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4c6dd80b..2619bd67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ -v0.5.1 +v0.5.2 + Bugfix(benlangfeld): Remove specs for the Nokogiri extensions which were moved out + +v0.5.1 - yanked Feature(benlangfeld): Abstract out Nokogiri extensions and helpers into new Niceogiri gem for better sharing Documentation(benlangfeld) diff --git a/lib/blather/version.rb b/lib/blather/version.rb index 6c681d5f..0af20563 100644 --- a/lib/blather/version.rb +++ b/lib/blather/version.rb @@ -1,4 +1,4 @@ module Blather # Blather version number - VERSION = '0.5.1' + VERSION = '0.5.2' end