rosemary 0.4.3 → 0.4.4

data/.codeclimate.yml

@@ -0,0 +1,5 @@
+# Save as .codeclimate.yml (note leading .) in project root directory
+languages:
+  Ruby: true
+# exclude_paths:
+# - "foo/bar.rb"

data/.travis.yml

@@ -10,3 +10,7 @@ rvm:
 notifications:
   email:
     - info@christophbuente.de
+
+addons:
+  code_climate:
+    repo_token: 9b4adcf51537fa2b279a8e9ce948227f84c25288c6758c18f12f4f9e2dd3b0b6

data/CHANGELOG.md

@@ -2,6 +2,18 @@ rosemary CHANGELOG
 ===================================
 This file is used to list changes made in each version.
 
+v0.4.4 (2015 May 29)
+------
+
+* FIX: #14 Use htmlentities gem to sanitize input for tag values.
+* Remove coveralls in favor of codeclimate test coverage reporter
+* Exchange PNG badges in favor of SVG badges.
+
+v0.4.3 (2015 Feb 19)
+------
+
+* Add "find elements within bounding box" functionality. Thanks to [Leo Roos Version](https://github.com/leoroos)
+
 v0.4.2 (2014 Aug 7)
 ------
 
@@ -12,12 +24,12 @@ v0.4.2 (2014 Aug 7)
 v0.4.1 (2014 May 27)
 ------
 
-* Fix: Return value of notes API call (thanks github.com/alexandrz)
+* FIX: Return value of notes API call. Thanks to [Aleksandr Zykov](https://github.com/alexandrz)
 
 v0.4.0 (2014 April 23)
 ------
 
-* Add support for the notes API call. (thanks github.com/alexandrz)
+* Add support for the notes API call. Thanks to [Aleksandr Zykov](https://github.com/alexandrz)
 
 v0.1.0
 ------

data/README.md

@@ -1,12 +1,12 @@
 # Rosemary: OpenStreetMap for Ruby
 
-[![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)
+[![Gem Version](https://badge.fury.io/rb/rosemary.svg)](http://badge.fury.io/rb/rosemary)
+[![Build Status](https://travis-ci.org/sozialhelden/rosemary.svg?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)
+[![Coverage Status](https://codeclimate.com/github/sozialhelden/rosemary/badges/coverage.svg)](https://codeclimate.com/github/sozialhelden/rosemary/coverage)
+[![Code Climate](https://codeclimate.com/github/sozialhelden/rosemary.svg)](https://codeclimate.com/github/sozialhelden/rosemary)
+[![License](https://img.shields.io/badge/license-MIT-green.svg) ](https://github.com/sozialhelden/rosemary/blob/master/LICENSE)
+[![Gittip ](https://img.shields.io/gittip/sozialhelden.svg)](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.rb

@@ -20,6 +20,7 @@ require 'rosemary/oauth_client'
 require 'rosemary/parser'
 require 'rosemary/api'
 require 'oauth'
+require 'htmlentities'
 
 # The Rosemary module just handles class load.
 module Rosemary

data/lib/rosemary/parser.rb

@@ -16,6 +16,10 @@ class Rosemary::Parser < HTTParty::Parser
     end
   end
 
+  def coder
+    @coder ||= HTMLEntities.new
+  end
+
   def xml
     # instead of using
     # LibXML::XML::default_substitute_entities = true
@@ -158,7 +162,7 @@ class Rosemary::Parser < HTTParty::Parser
     if respond_to?(:tag)
       return unless tag(@context, attr_hash['k'], attr_value['v'])
     end
-    @context.tags.merge!(attr_hash['k'] => attr_hash['v'])
+    @context.tags.merge!(attr_hash['k'] => coder.decode(attr_hash['v']))
   end
 
   def _member(attr_hash)

data/lib/rosemary/tags.rb

@@ -4,6 +4,10 @@ module Rosemary
   # It is a subclass of Hash.
   class Tags < Hash
 
+    def coder
+      @coder ||= HTMLEntities.new
+    end
+
     # Return XML for these tags. This method uses the Builder library.
     # The only parameter ist the builder object.
     def to_xml(options = {})
@@ -11,7 +15,7 @@ module Rosemary
       xml.instruct! unless options[:skip_instruct]
       each do |key, value|
         # Remove leading and trailing whitespace from tag values
-        xml.tag(:k => key, :v => value.strip) unless value.blank?
+        xml.tag(:k => key, :v => coder.decode(value.strip)) unless value.blank?
       end unless empty?
     end
 

data/lib/rosemary/version.rb

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

data/rosemary.gemspec

@@ -34,24 +34,26 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.7"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.20"])
+      s.add_runtime_dependency(%q<htmlentities>)
       s.add_development_dependency(%q<rspec>, [">= 2.7"])
       s.add_development_dependency(%q<webmock>, [">= 1.7"])
       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>)
+      s.add_development_dependency(%q<codeclimate-test-reporter>)
     else
       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"])
       s.add_dependency(%q<activemodel>, [">= 3.0.20"])
+      s.add_dependency(%q<htmlentities>)
       s.add_dependency(%q<rspec>, [">= 2.7"])
       s.add_dependency(%q<webmock>, [">= 1.7"])
       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>)
+      s.add_dependency(%q<codeclimate-test-reporter>)
     end
   else
     s.add_dependency(%q<httparty>, ["~> 0.10.0"])
@@ -59,11 +61,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<oauth>, [">= 0.4.7"])
     s.add_dependency(%q<activemodel>, [">= 3.0.20"])
+    s.add_dependency(%q<htmlentities>)
     s.add_dependency(%q<rspec>, [">= 2.7"])
     s.add_dependency(%q<webmock>, [">= 1.7"])
     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>)
+    s.add_dependency(%q<codeclimate-test-reporter>)
   end
 end

data/spec/models/node_spec.rb

@@ -104,11 +104,22 @@ describe Node do
     expect(subject.to_xml).not_to match /k=\"wheelchair\"/
   end
 
-  it "should properly escape ampersands" do
+  it "should properly encode ampersands" do
     subject.name = "foo & bar"
     expect(subject.to_xml).to match "foo & bar"
   end
 
+  it "should not double encode ampersands" do
+    subject.name = "foo & bar"
+    expect(subject.to_xml).to match "foo & bar"
+  end
+
+  it "should fix double encoded ampersands" do
+    subject.name = "foo & bar"
+    expect(subject.to_xml).to match "foo & bar"
+  end
+
+
   it "should properly strip leading and trailing whitespace" do
     subject.name = " Allice and Bob "
     expect(subject.to_xml).to match "\"Allice and Bob\""

data/spec/models/parser_spec.rb

@@ -3,7 +3,21 @@ include Rosemary
 describe Parser do
   context "xml" do
     it "parses ampersands correctly" do
+      node_xml =<<-EOF
+      <osm>
+       <node id="123" lat="51.2" lon="13.4" version="42" changeset="12" user="fred" uid="123" visible="true" timestamp="2005-07-30T14:27:12+01:00">
+         <tag k="note" v="Just a node"/>
+         <tag k="amenity" v="bar" />
+         <tag k="name" v="The rose &amp; the pony" />
+       </node>
+      </osm>
+      EOF
+
+      n = Parser.call(node_xml, :xml)
+      expect(n.name).to eql "The rose & the pony"
+    end
 
+    it "parses utf-8 encoded ampersands correctly" do
       node_xml =<<-EOF
       <osm>
        <node id="123" lat="51.2" lon="13.4" version="42" changeset="12" user="fred" uid="123" visible="true" timestamp="2005-07-30T14:27:12+01:00">
@@ -16,9 +30,21 @@ describe Parser do
 
       n = Parser.call(node_xml, :xml)
       expect(n.name).to eql "The rose & the pony"
+    end
 
+    it "parses double encoded ampersands correctly" do
+      node_xml =<<-EOF
+      <osm>
+       <node id="123" lat="51.2" lon="13.4" version="42" changeset="12" user="fred" uid="123" visible="true" timestamp="2005-07-30T14:27:12+01:00">
+         <tag k="note" v="Just a node"/>
+         <tag k="amenity" v="bar" />
+         <tag k="name" v="The rose &amp;#38; the pony" />
+       </node>
+      </osm>
+      EOF
 
-
+      n = Parser.call(node_xml, :xml)
+      expect(n.name).to eql "The rose & the pony"
     end
 
     it "parses empty set of permissions" do

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.20
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -197,6 +213,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- .codeclimate.yml
 - .gitignore
 - .rspec
 - .ruby-version
@@ -261,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3366646183016379761
+      hash: -2160330113018353665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: