badcarl-dm-googlebase 0.0.4 → 0.0.5

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.add_dependency 'dm-validations', '>= 0.10.0'
     gem.add_dependency 'gdata'
     gem.add_dependency 'nokogiri'
-    gem.add_dependency 'builder'
     gem.add_development_dependency 'dm-sweatshop', '>= 0.10.0'
   end
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/dm-googlebase.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-googlebase}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carl Porth"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-07-31}
   s.email = %q{badcarl@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/badcarl/dm-googlebase}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A DataMapper adapter for Google Base}
   s.test_files = [
     "spec/googlebase/adapter_spec.rb",
@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-validations>, [">= 0.10.0"])
       s.add_runtime_dependency(%q<gdata>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<dm-sweatshop>, [">= 0.10.0"])
     else
       s.add_dependency(%q<dm-core>, [">= 0.10.0"])
@@ -61,7 +60,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
       s.add_dependency(%q<gdata>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<dm-sweatshop>, [">= 0.10.0"])
     end
   else
@@ -70,7 +68,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
     s.add_dependency(%q<gdata>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<dm-sweatshop>, [">= 0.10.0"])
   end
 end

data/lib/googlebase/adapter.rb

@@ -1,7 +1,6 @@
 require 'dm-core'
 require 'gdata'
 require 'nokogiri'
-require 'builder'
 
 module DataMapper
   class Property
@@ -114,25 +113,24 @@ module GoogleBase
     end
 
     def build_xml(resource)
-      result = ""
+      builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
 
-      xml = Builder::XmlMarkup.new(:target => result)
-      xml.instruct!
+        xml.entry(XML_ATTRIBUTES) do
+          resource.model.properties.each do |property|
+            value = property.get(resource)
+            next if value.blank?
 
-      xml.entry(XML_ATTRIBUTES) do
-        resource.model.properties.each do |property|
-          value = property.get(resource)
-          next if value.blank?
-
-          if to_xml = property.options[:to_xml]
-            to_xml.call(xml, value)
-          elsif not property.options.has_key?(:to_xml)
-            xml.tag! property.field, value
+            if to_xml = property.options[:to_xml]
+              to_xml.call(xml, value)
+            elsif not property.options.has_key?(:to_xml)
+              xml.send "#{property.field}_", value
+            end
           end
         end
+
       end
 
-      result
+      builder.to_xml
     end
 
     private

data/lib/googlebase/product_properties.rb

@@ -5,8 +5,7 @@ require 'dm-validations'
 module GoogleBase
   ProductProperties = LazyModule.new do
     property :id, String, :key => true, :nullable => true, :length => 255, :from_xml => 'xmlns:id'
-    property :title, String, :from_xml => 'xmlns:title', :length => 70,
-      :to_xml => lambda { |xml, value| xml.title value }
+    property :title, String, :from_xml => 'xmlns:title', :length => 70
     property :description, DataMapper::Types::Text, :field => 'content', :from_xml => 'xmlns:content', :lazy => false
     property :link, URI, :from_xml => "xmlns:link[@rel='alternate']/@href",
       :to_xml => lambda { |xml, value| xml.link :href => value, :type => 'text/html', :rel => 'alternate' }
@@ -20,11 +19,11 @@ module GoogleBase
 
     # optional
     property :expires_at, DateTime, :field => 'g:expiration_date',
-      :to_xml => lambda { |xml, value| xml.tag! 'g:expiration_date', value.strftime('%F') }
+      :to_xml => lambda { |xml, value| xml.send 'g:expiration_date', value.strftime('%F') }
     property :quantity, Integer, :field => 'g:quantity'
     property :payment_accepted, String,
       :from_xml => lambda { |entry| entry.xpath('./g:payment').map { |e| e.content }.join(',') },
-      :to_xml => lambda { |xml, values| values.split(',').each { |value| xml.tag! 'g:payment_accepted', value } }
+      :to_xml => lambda { |xml, values| values.split(',').each { |value| xml.send 'g:payment_accepted', value } }
     property :item_language, String,  :field => 'g:item_language'
     property :target_country, String, :field => 'g:target_country'
 

data/spec/googlebase/adapter_spec.rb

@@ -218,7 +218,7 @@ describe GoogleBase::Adapter do
 
     it "builds an element via :to_xml" do
       Item.property :some_link, String,
-        :to_xml => lambda { |xml, value| xml.tag! 'some_link_here', :href => value, :type => 'text/html', :rel => 'alternate' }
+        :to_xml => lambda { |xml, value| xml.some_link_here :href => value, :type => 'text/html', :rel => 'alternate' }
       xml = build_xml :some_link => 'http://example.com/something'
 
       xml.at('some_link_here')['href'].should == 'http://example.com/something'

data/spec/spec_matchers.rb

@@ -1,7 +1,7 @@
 Spec::Matchers.define :match_xml_document do |expected|
   match do |actual|
-    actual_doc   = Nokogiri::XML.parse(actual)
-    expected_doc = Nokogiri::XML.parse(expected)
+    actual_doc   = Nokogiri.XML(actual)   { |cfg| cfg.noblanks }
+    expected_doc = Nokogiri.XML(expected) { |cfg| cfg.noblanks }
 
     actual_doc.encoding.should == expected_doc.encoding
     actual_doc.root.should match_xml_node(expected_doc.root)
@@ -41,10 +41,10 @@ class MatchXMLNode
 
   def failure_message_for_should
     @actual_part = @actual.dup
-    @actual_part.text = nil if @actual_part.child && !@actual_part.child.text?
+    @actual_part.content = nil if @actual_part.child && !@actual_part.child.text?
 
     @expected_part = @expected.dup
-    @expected_part.text = nil if @expected_part.child && !@expected_part.child.text?
+    @expected_part.content = nil if @expected_part.child && !@expected_part.child.text?
 
     "expected:\n#{@actual_part.inspect}\n to match node:\n#{@expected_part.inspect}\n but it didn't"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: badcarl-dm-googlebase
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Carl Porth
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,16 +62,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: dm-sweatshop
   type: :development