rosemary 0.3.6 → 0.3.7

data/lib/rosemary/node.rb

@@ -41,7 +41,7 @@ module Rosemary
     def to_xml(options = {})
       xml = options[:builder] ||= Builder::XmlMarkup.new
       xml.instruct! unless options[:skip_instruct]
-      xml.osm do
+      xml.osm(:generator => "rosemary v#{Rosemary::VERSION}", :version => Rosemary::Api::API_VERSION) do
         xml.node(attributes) do
           tags.to_xml(:builder => xml, :skip_instruct => true)
         end

data/lib/rosemary/relation.rb

@@ -26,14 +26,16 @@ module Rosemary
 
     # Return XML for this relation. This method uses the Builder library.
     # The only parameter ist the builder object.
-    def to_xml(option = {})
+    def to_xml(options = {})
       xml = options[:builder] ||= Builder::XmlMarkup.new
       xml.instruct! unless options[:skip_instruct]
-      xml.relation(attributes) do
-        members.each do |member|
-          member.to_xml(:builder => xml, :skip_instruct => true)
+      xml.osm(:generator => "rosemary v#{Rosemary::VERSION}", :version => Rosemary::Api::API_VERSION) do
+        xml.relation(attributes) do
+          members.each do |member|
+            member.to_xml(:builder => xml, :skip_instruct => true)
+          end
+          tags.to_xml(:builder => xml, :skip_instruct => true)
         end
-        tags.to_xml(:builder => xml, :skip_instruct => true)
       end
     end
 

data/lib/rosemary/tags.rb

@@ -14,6 +14,10 @@ module Rosemary
       end unless empty?
     end
 
+    def []=(key, value)
+      super(key, value.strip)
+    end
+
     # Return string with comma separated key=value pairs.
     #
     # @return [String] string representation

data/lib/rosemary/version.rb

@@ -1,4 +1,4 @@
 module Rosemary
   # The current version of this gem.
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/rosemary/way.rb

@@ -75,7 +75,7 @@ module Rosemary
     def to_xml(options = {})
       xml = options[:builder] ||= Builder::XmlMarkup.new
       xml.instruct! unless options[:skip_instruct]
-      xml.osm do
+      xml.osm(:generator => "rosemary v#{Rosemary::VERSION}", :version => Rosemary::Api::API_VERSION) do
         xml.way(attributes) do
           nodes.each do |node_id|
             xml.nd(:ref => node_id)

data/spec/models/node_spec.rb

@@ -85,6 +85,14 @@ describe Node do
     subject.to_xml.should match /uid=\"123\"/
   end
 
+  it "should have a version attribute for osm tag" do
+    subject.to_xml.should match /version=\"0.6\"/
+  end
+
+  it "should have a generator attribute for osm tag" do
+    subject.to_xml.should match /generator=\"rosemary v/
+  end
+
   it "should produce xml" do
     subject.add_tags(:wheelchair => 'yes')
     subject.to_xml.should match /k=\"wheelchair\"/
@@ -100,4 +108,9 @@ describe Node do
     subject.name = "foo & bar"
     subject.to_xml.should match "foo & bar"
   end
+
+  it "should properly strip leading and trailing whitespace" do
+    subject.name = " Allice and Bob "
+    subject.to_xml.should match "\"Allice and Bob\""
+  end
 end

data/spec/models/way_spec.rb

@@ -69,6 +69,14 @@ describe Way do
     subject.to_xml.should match /uid=\"123\"/
   end
 
+  it "should have a version attribute for osm tag" do
+    subject.to_xml.should match /version=\"0.6\"/
+  end
+
+  it "should have a generator attribute for osm tag" do
+    subject.to_xml.should match /generator=\"rosemary v/
+  end
+
   it "should produce xml" do
     subject.add_tags(:wheelchair => 'yes')
     subject.to_xml.should match /k=\"wheelchair\"/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2643441005731016607
+      hash: -321215509293511542
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: