rosemary 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -2,6 +2,12 @@ rosemary CHANGELOG
 ===================================
 This file is used to list changes made in each version.
 
+v0.4.2 (2014 Aug 7)
+------
+
+* Allow arbitrary tags to be attached to changeset
+* Upgrade all specs to 'expect' syntax instead of 'should'
+
 
 v0.4.1 (2014 May 27)
 ------

data/lib/rosemary/api.rb

@@ -93,6 +93,19 @@ module Rosemary
       resp
     end
 
+    # Get the bounding box which is represented by the Rosemary::BoundingBox
+    #
+    # @param [Numeric] left is the longitude of the left (westernmost) side of the bounding box.
+    # @param [Numeric] bottom is the latitude of the bottom (southernmost) side of the bounding box.
+    # @param [Numeric] right is the longitude of the right (easternmost) side of the bounding box.
+    # @param [Numeric] top is the latitude of the top (northernmost) side of the bounding box.
+    # @return [Rosemary::BoundingBox] the bounding box containing all ways, nodes and relations inside the given coordinates
+    #
+    def find_bounding_box(left,bottom,right,top)
+      do_request(:get, "/map?bbox=#{left},#{bottom},#{right},#{top}", {} )
+    end
+
+
     def permissions
       if client.nil?
         get("/permissions")
@@ -282,4 +295,4 @@ module Rosemary
     end
 
   end
-end
+end

data/lib/rosemary/bounding_box.rb

@@ -0,0 +1,46 @@
+require 'builder'
+
+module Rosemary
+  # OpenStreetMap Boundary Box.
+  #
+  class BoundingBox < Element
+
+    attr_accessor :nodes, :ways, :relations, :minlat, :minlon, :maxlat, :maxlon
+
+    # Create new Node object.
+    #
+    # If +id+ is +nil+ a new unique negative ID will be allocated.
+    def initialize(attrs = {})
+      attrs = attrs.dup.stringify_keys!
+      @minlat = attrs['minlat'].to_f
+      @minlon = attrs['minlon'].to_f
+      @maxlat = attrs['maxlat'].to_f
+      @maxlon = attrs['maxlon'].to_f
+
+      @nodes = []
+      @ways = []
+      @relations = []
+    end
+
+
+    def type
+      'BoundingBoxBox'
+    end
+
+    # List of attributes for a bounds element
+    def attribute_list
+      [:minlat, :minlon, :maxlat, :maxlon]
+    end
+
+    def to_xml(options = {})
+      xml = options[:builder] ||= Builder::XmlMarkup.new
+      xml.instruct! unless options[:skip_instruct]
+      xml.osm(:generator => "rosemary v#{Rosemary::VERSION}", :version => Rosemary::Api::API_VERSION) do
+        xml.bounds(attributes)
+        [ nodes, ways, relations].each do |elements|
+          elements.each { |e| e.to_xml(:builder => xml, :skip_instruct => true) }
+        end
+      end
+    end
+  end
+end

data/lib/rosemary/parser.rb

@@ -26,7 +26,12 @@ class Rosemary::Parser < HTTParty::Parser
 
     @parser.callbacks = self
     @parser.parse
-    @collection.empty? ? @context : @collection
+
+    if @bounding_box
+      @bounding_box
+    else
+      @collection.empty? ? @context : @collection
+    end
   end
 
   def plain
@@ -70,6 +75,7 @@ class Rosemary::Parser < HTTParty::Parser
       when 'permissions'  then _start_permissions(attr_hash)
       when 'permission'   then _start_permission(attr_hash)
       when 'note'         then _start_note(attr_hash)
+      when 'bounds'       then _start_bounds(attr_hash)
       end
     end
   end
@@ -101,15 +107,21 @@ class Rosemary::Parser < HTTParty::Parser
 
   private
   def _start_node(attr_hash)
-    @context = Rosemary::Node.new(attr_hash)
+    node = Rosemary::Node.new(attr_hash)
+    @bounding_box.nodes << node if @bounding_box
+    @context = node
   end
 
   def _start_way(attr_hash)
-    @context = Rosemary::Way.new(attr_hash)
+    way = Rosemary::Way.new(attr_hash)
+    @bounding_box.ways << way if @bounding_box
+    @context = way
   end
 
   def _start_relation(attr_hash)
-    @context = Rosemary::Relation.new(attr_hash)
+    relation = Rosemary::Relation.new(attr_hash)
+    @bounding_box.relations << relation if @bounding_box
+    @context = relation
   end
 
   def _start_changeset(attr_hash)
@@ -163,4 +175,8 @@ class Rosemary::Parser < HTTParty::Parser
     @context.lon = attr_hash['zoom']  if attr_hash['zoom']
   end
 
-end
+  def _start_bounds(attr_hash)
+    @bounding_box = Rosemary::BoundingBox.new(attr_hash)
+  end
+
+end

data/lib/rosemary/version.rb

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

data/lib/rosemary.rb

@@ -11,6 +11,7 @@ require 'rosemary/changeset'
 require 'rosemary/relation'
 require 'rosemary/member'
 require 'rosemary/user'
+require 'rosemary/bounding_box'
 require 'rosemary/permissions'
 require 'rosemary/errors'
 require 'rosemary/client'

data/spec/integration/boundary_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+include Rosemary
+describe BoundingBox do
+
+  before do
+    WebMock.disable_net_connect!
+  end
+
+  let :osm do
+    Api.new
+  end
+
+  def valid_fake_boundary
+    boundary=<<-EOF
+    <osm>
+     <bounds minlat="37.3855400" minlon="-122.0359880" maxlat="37.4116770" maxlon="-122.0094800"/>
+     <node id="3147580094" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3872247" lon="-122.0216695"/>
+     <node id="3147580093" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3872110" lon="-122.0216157"/>
+     <node id="3147580084" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3870427" lon="-122.0216838"/>
+     <node id="3147580085" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3870564" lon="-122.0217376"/>
+     <node id="3147580103" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3873678" lon="-122.0218229"/>
+     <node id="3147580098" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3872486" lon="-122.0213856"/>
+     <node id="3147580089" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3871661" lon="-122.0214213"/>
+     <node id="3147580092" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3871896" lon="-122.0215072"/>
+     <node id="3147580077" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3869174" lon="-122.0216248"/>
+     <node id="3147580078" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3869465" lon="-122.0217314"/>
+     <node id="3147580081" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3870081" lon="-122.0217048"/>
+     <node id="3147580083" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3870225" lon="-122.0217578"/>
+     <node id="3147580079" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3869654" lon="-122.0217825"/>
+     <node id="3147580080" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3869935" lon="-122.0218854"/>
+     <node id="3147580099" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3872596" lon="-122.0217704"/>
+     <node id="3147580101" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:05Z" user="matthieun" uid="595221" lat="37.3872838" lon="-122.0218592"/>
+     <way id="309425057" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:06Z" user="matthieun" uid="595221">
+      <nd ref="3147580094"/>
+      <nd ref="3147580093"/>
+      <nd ref="3147580084"/>
+      <nd ref="3147580085"/>
+      <nd ref="3147580094"/>
+     </way>
+    <way id="309425054" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:06Z" user="matthieun" uid="595221">
+      <nd ref="3147580103"/>
+      <nd ref="3147580098"/>
+      <nd ref="3147580089"/>
+      <nd ref="3147580092"/>
+      <nd ref="3147580077"/>
+      <nd ref="3147580078"/>
+      <nd ref="3147580081"/>
+      <nd ref="3147580083"/>
+      <nd ref="3147580079"/>
+      <nd ref="3147580080"/>
+      <nd ref="3147580099"/>
+      <nd ref="3147580101"/>
+      <nd ref="3147580103"/>
+     </way>
+     <relation id="4133073" visible="true" version="1" changeset="26302066" timestamp="2014-10-24T15:12:07Z" user="matthieun" uid="595221">
+      <member type="way" ref="309425057" role="inner"/>
+      <member type="way" ref="309425054" role="outer"/>
+      <tag k="building" v="residential"/>
+      <tag k="type" v="multipolygon"/>
+     </relation>
+    </osm>
+    EOF
+  end
+
+  describe '#find:' do
+    it "should find an array of Ways, Nodes and Relations from the API response via find_boundary" do
+      stub_request(:get, "http://www.openstreetmap.org/api/0.6/map?bbox=-122.035988,37.38554,-122.00948,37.411677").to_return(:status => 200, :body => valid_fake_boundary, :headers => {'Content-Type' => 'application/xml'})
+      boundary = osm.find_bounding_box(-122.035988,37.38554,-122.00948,37.411677)
+
+      expect(boundary.class).to eql BoundingBox
+      expect(boundary.nodes).to include(Rosemary::Node.new({"id"=>"3147580094", "visible"=>"true", "version"=>"1", "changeset"=>"26302066", "timestamp"=>"2014-10-24T15:12:05Z", "user"=>"matthieun", "uid"=>"595221", "lat"=>"37.3872247", "lon"=>"-122.0216695"}))
+      expect(boundary.ways.map { |it| it.id }).to include(309425054)
+      expect(boundary.relations.map { |it| it.id }).to include(4133073)
+
+      parsed_relation = boundary.relations.first
+
+      expect(parsed_relation.members.length).to equal(2)
+      expect(parsed_relation.tags.length).to equal(2)
+      expect(boundary.minlat).to be_within(0.00001).of(37.3855400)
+      expect(boundary.minlon).to be_within(0.00001).of(-122.0359880)
+      expect(boundary.maxlat).to be_within(0.00001).of(37.4116770)
+      expect(boundary.maxlon).to be_within(0.00001).of(-122.0094800)
+    end
+  end
+
+  describe '#xml:' do
+    it "should produce an xml that is equivalent to the parsed one" do
+      stub_request(:get, "http://www.openstreetmap.org/api/0.6/map?bbox=-122.035988,37.38554,-122.00948,37.411677").to_return(:status => 200, :body => valid_fake_boundary, :headers => {'Content-Type' => 'application/xml'})
+      boundary = osm.find_bounding_box(-122.035988,37.38554,-122.00948,37.411677)
+
+      xml = boundary.to_xml
+      reparsed_boundary = Parser.call(xml, :xml)
+
+      expect(reparsed_boundary.minlat).to eql(boundary.minlat)
+      expect(reparsed_boundary.nodes.length).to eql(boundary.nodes.length)
+      expect(reparsed_boundary.nodes.first.lat).to eql(boundary.nodes.first.lat)
+      expect(reparsed_boundary.ways.length).to eql(boundary.ways.length)
+      expect(reparsed_boundary.ways.first.nodes.first).to eql(boundary.ways.first.nodes.first)
+      expect(reparsed_boundary.relations.length).to eql(boundary.relations.length)
+      expect(reparsed_boundary.relations.first.tags.first).to eql(boundary.relations.first.tags.first)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -212,6 +212,7 @@ files:
 - lib/rosemary.rb
 - lib/rosemary/api.rb
 - lib/rosemary/basic_auth_client.rb
+- lib/rosemary/bounding_box.rb
 - lib/rosemary/changeset.rb
 - lib/rosemary/client.rb
 - lib/rosemary/element.rb
@@ -228,6 +229,7 @@ files:
 - lib/rosemary/version.rb
 - lib/rosemary/way.rb
 - rosemary.gemspec
+- spec/integration/boundary_spec.rb
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/note_spec.rb
@@ -259,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1969309869700129610
+      hash: 3366646183016379761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,6 +275,7 @@ signing_key:
 specification_version: 3
 summary: OpenStreetMap API client for ruby
 test_files:
+- spec/integration/boundary_spec.rb
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/note_spec.rb