rosemary 0.3.12 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzdiYjdiYmEzMmE1NjgyYTFmODVjN2NmYTMyODVmNTJkMmZiMWQ5OA==
+  data.tar.gz: !binary |-
+    MDRhZTU1MzNiOWVhNzJjYzk3NWFkMjYxYWM2NGVlOGQ1NjFmMTg0ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDc4MzgwYjBlZjE4YjBiMjQ3YWQ1NDlkYjgyYjVmN2ZiMTI1MTc4OWFjZmE2
+    N2FiZmZiYmQxZmIyODQ2NWEwYWY5ZjVlYWNkYWEzOWExOGIwNWM2NDI3ODQw
+    Mjk0YjMxZTNhZmE4NDZjZmZlMWU3Y2ZlMjJhNThhZjI1YzIyNmM=
+  data.tar.gz: !binary |-
+    M2E2ZWY2MmI3ZmY4ZmZiOWNlNjI0YjhiNTE4M2Y3YTZkOWYzZjMxMjhmODFj
+    YzU1ODUxZmYyMWU5ZDlkNGM0NDY4NjllYTk5YmIyMzAyOGRhNTg3YTE4MTY4
+    NzAzZjQ5OGJkMTFiZjQ0MzI0ZGE1M2MwYmRlZjc4NDE4NTZiNTg=

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
 notifications:
   email:
     - info@christophbuente.de

data/README.md

@@ -1,8 +1,12 @@
 # Rosemary: OpenStreetMap for Ruby
 
-[![Build Status](https://travis-ci.org/sozialhelden/rosemary.png?branch=master)](https://travis-ci.org/sozialhelden/rosemary)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/sozialhelden/rosemary)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/rosemary.png)](http://badge.fury.io/rb/rosemary)
+[![Build Status](https://travis-ci.org/sozialhelden/rosemary.png?branch=master)](https://travis-ci.org/sozialhelden/rosemary)
+[![Dependency Status](https://gemnasium.com/sozialhelden/rosemary.png)](https://gemnasium.com/sozialhelden/rosemary)
+[![Coverage Status](https://coveralls.io/repos/sozialhelden/rosemary/badge.png)](https://coveralls.io/r/sozialhelden/rosemary)
+[![Code Climate](https://codeclimate.com/github/sozialhelden/rosemary.png)](https://codeclimate.com/github/sozialhelden/rosemary)
+[![License](http://img.shields.io/license/MIT.png?color=green) ](https://github.com/sozialhelden/rosemary/blob/master/LICENSE)
+[![Gittip ](http://img.shields.io/gittip/sozialhelden.png)](https://gittip.com/sozialhelden)
 
 This ruby gem is an API client for the current OpenStreetMap [API v0.6](http://wiki.openstreetmap.org/wiki/API_v0.6). It provides easy access to OpenStreetMap (OSM) data.
 

data/lib/rosemary/api.rb

@@ -192,6 +192,14 @@ module Rosemary
       end
     end
 
+    # Create a note
+    #
+    # call-seq: create_note(lat: 51.00, lon: 0.1, text: 'Test note') -> Rosemary::Note
+    #
+    def create_note(note)
+      post("/notes", :query => note)
+    end
+
     private
 
     # most GET requests are valid without authentication, so this is the standard

data/lib/rosemary/note.rb

@@ -0,0 +1,20 @@
+require 'builder'
+module Rosemary
+  # The note object
+  class Note
+    # Unique ID
+    attr_accessor :id
+
+    attr_accessor :lat
+    attr_accessor :lon    
+    attr_accessor :text
+
+    def initialize(attrs = {})
+      attrs.stringify_keys!
+      @lat  = attrs['lat']
+      @lon  = attrs['lon']
+      @text = attrs['text'] || ''
+    end
+
+  end
+end

data/lib/rosemary/parser.rb

@@ -54,9 +54,12 @@ class Rosemary::Parser < HTTParty::Parser
     when 'member'       then _member(attr_hash)
     when 'home'         then _home(attr_hash)
     when 'description'  then @description = true
-    when 'permissions'   then _start_permissions(attr_hash)
+    when 'permissions'  then _start_permissions(attr_hash)
     when 'permission'   then _start_permission(attr_hash)
     when 'lang'         then @lang        = true
+    when 'note'         then _start_note(attr_hash)
+    when 'id'           then @id          = true
+    when 'text'         then @text        = true
     end
   end
 
@@ -64,6 +67,8 @@ class Rosemary::Parser < HTTParty::Parser
     case name
     when 'description'  then @description = false
     when 'lang'         then @lang        = false
+    when 'id'           then @id          = false
+    when 'text'         then @text        = false
     when 'changeset'    then _end_changeset
     end
   end
@@ -77,6 +82,14 @@ class Rosemary::Parser < HTTParty::Parser
         @context.languages << chars
       end
     end
+    if @context.class.name == 'Rosemary::Note'
+      if @id
+        @context.id = chars
+      end
+      if @text
+        @context.text << chars
+      end
+    end
   end
 
   private
@@ -96,6 +109,10 @@ class Rosemary::Parser < HTTParty::Parser
     @context = Rosemary::Changeset.new(attr_hash)
   end
 
+  def _start_note(attr_hash)
+    @context = Rosemary::Note.new(attr_hash)
+  end
+
   def _start_permissions(_)
     # just a few sanity checks: we can only parse permissions as a top level elem
     raise ParseError, "Unexpected <permissions> element" unless @context.nil?

data/lib/rosemary/version.rb

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

data/lib/rosemary.rb

@@ -5,6 +5,7 @@ require 'active_model'
 require 'rosemary/tags'
 require 'rosemary/element'
 require 'rosemary/node'
+require 'rosemary/note'
 require 'rosemary/way'
 require 'rosemary/changeset'
 require 'rosemary/relation'

data/rosemary.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.10.0"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.10.0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 2.4.0"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.7"])
@@ -39,8 +39,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0.9"])
       s.add_development_dependency(%q<yard>, [">= 0.8"])
       s.add_development_dependency(%q<redcarpet>, [">= 2.2.0"])
+      s.add_development_dependency(%q<coveralls>)
     else
-      s.add_dependency(%q<httparty>, [">= 0.10.0"])
+      s.add_dependency(%q<httparty>, ["~> 0.10.0"])
       s.add_dependency(%q<libxml-ruby>, [">= 2.4.0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<oauth>, [">= 0.4.7"])
@@ -50,9 +51,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0.9"])
       s.add_dependency(%q<yard>, [">= 0.8"])
       s.add_dependency(%q<redcarpet>, [">= 2.2.0"])
+      s.add_dependency(%q<coveralls>)
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0.10.0"])
+    s.add_dependency(%q<httparty>, ["~> 0.10.0"])
     s.add_dependency(%q<libxml-ruby>, [">= 2.4.0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<oauth>, [">= 0.4.7"])
@@ -62,5 +64,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0.9"])
     s.add_dependency(%q<yard>, [">= 0.8"])
     s.add_dependency(%q<redcarpet>, [">= 2.2.0"])
+    s.add_dependency(%q<coveralls>)
   end
 end

data/spec/integration/changeset_spec.rb

@@ -102,27 +102,27 @@ describe Changeset do
       body = Changeset.new(:tags => { :comment => 'New changeset' }).to_xml
 
       stub_create_request.with(:body => body).to_return(:status => 200, :body => "3", :headers => {'Content-Type' => 'plain/text'})
-      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = mock())
+      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = double())
       auth_osm.create_changeset('New changeset').should == cs
     end
   end
 
   describe "#find_or_create_open_changeset" do
     it "returns an exisiting changeset if that exists and is open" do
-      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = mock(:open? => true))
+      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = double(:open? => true))
       auth_osm.should_not_receive(:create_changeset)
       auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
     end
 
     it "returns an new changeset if the requested one exists and is closed" do
-      auth_osm.should_receive(:find_changeset).with(3).and_return(mock(:open? => false))
-      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = mock())
+      auth_osm.should_receive(:find_changeset).with(3).and_return(double(:open? => false))
+      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = double())
       auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
     end
 
     it "returns an new changeset if the requested one doesn't exist" do
       auth_osm.should_receive(:find_changeset).with(3).and_return(nil)
-      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = mock())
+      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = double())
       auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
     end
 

data/spec/integration/note_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+include Rosemary
+describe Note do
+
+  before do
+    WebMock.disable_net_connect!
+  end
+
+  let(:osm) { Api.new }
+
+  def valid_fake_note
+    note=<<-EOF
+    <osm version="0.6" generator="OpenStreetMap server">
+    <note lon="120.9283065" lat="15.0115916">
+      <id>397</id>
+      <url>http://api06.dev.openstreetmap.org/api/0.6/notes/397</url>
+      <comment_url>http://api06.dev.openstreetmap.org/api/0.6/notes/397/comment</comment_url>
+      <close_url>http://api06.dev.openstreetmap.org/api/0.6/notes/397/close</close_url>
+      <date_created>2014-04-23 13:57:37 UTC</date_created>
+      <status>open</status>
+      <comments>
+        <comment>
+          <date>2014-04-23 13:57:37 UTC</date>
+          <action>opened</action>
+          <text>Test note</text>
+          <html>&lt;p&gt;Test note&lt;/p&gt;</html>
+        </comment>
+      </comments>
+    </note>
+    </osm>
+    EOF
+  end
+
+  describe 'with BasicAuthClient' do
+
+    let :osm do
+      Api.new(BasicAuthClient.new('a_username', 'a_password'))
+    end
+
+    describe '#create_note:' do
+
+      def request_url
+        "http://a_username:a_password@www.openstreetmap.org/api/0.6/notes?lat=15.0115916&lon=120.9283065&text=Test%20note"
+      end
+
+      def stubbed_request
+        stub_request(:post, request_url)
+      end
+
+      def valid_note
+        {lon: 120.9283065, lat: 15.0115916, text: 'Test note'}
+      end
+
+      it "should create a new Note from given attributes" do
+        stubbed_request.
+          to_return(:status => 200, :body => valid_fake_note, :headers => {'Content-Type' => 'application/xml'})
+
+        new_note = osm.create_note(valid_note)
+        new_note.id.should eql '397'
+        new_note.lon.should eql '120.9283065'
+        new_note.lat.should eql '15.0115916'
+        new_note.text.should eql 'Test note'
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require 'webmock/rspec'
 require 'rosemary'
-
 require 'libxml'
+require 'coveralls'
+Coveralls.wear!
 
 RSpec::Matchers.define :have_xml do |xpath, text|
   match do |body|

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.3.12
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Christoph Bünte, Enno Brehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,11 +146,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenStreetMap API client for ruby
 email:
 - info@christophbuente.de
@@ -182,8 +175,8 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
-- .rbenv-version
 - .rspec
+- .ruby-version
 - .rvmrc
 - .travis.yml
 - CHANGELOG
@@ -202,6 +195,7 @@ files:
 - lib/rosemary/errors.rb
 - lib/rosemary/member.rb
 - lib/rosemary/node.rb
+- lib/rosemary/note.rb
 - lib/rosemary/oauth_client.rb
 - lib/rosemary/parser.rb
 - lib/rosemary/permissions.rb
@@ -213,6 +207,7 @@ files:
 - rosemary.gemspec
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
+- spec/integration/note_spec.rb
 - spec/integration/user_spec.rb
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb
@@ -223,6 +218,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/sozialhelden/rosemary
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -234,29 +230,25 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3940518596740990708
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: rosemary
-rubygems_version: 1.8.22
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 3
 summary: OpenStreetMap API client for ruby
 test_files:
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
+- spec/integration/note_spec.rb
 - spec/integration/user_spec.rb
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p0