simplify_rb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f79646c8c01d7c69d1d64e96be6ef6035815879
-  data.tar.gz: 7d2c38e4bcdab4d114cd4c193539ed9f6a9a7a7c
+  metadata.gz: 391f23576ae316977748323dbf295a0b11b5d99a
+  data.tar.gz: 21bfa76b9bdbee619f1ea406e729127edde09c44
 SHA512:
-  metadata.gz: ac827d96699828338bbc0bf5826a592fb3f1a40ab16e7233aa407f9d7ba5520fa84cf00088b18551cb0176a8117a423cf1476d23c50b296604619f79f769a2bf
-  data.tar.gz: 6ecb8581a96851cc2e539428cec861a5763f1b964abdab02e2b709deec8d463849586fa317dc807c72eb3c9feeadbba34bd5d9360a7ca37f851c3e1f8e494647
+  metadata.gz: b6d2e5cc6e2038c8de7df917a91afd9d1eed41ce436dd95677a568426ff7d5234b9760f42056483b196a569c6196248f2cfad40b71f0557fab50886701642e01
+  data.tar.gz: 2646af352034c6633295eba793d0d8702029c0e2c5c3d07ced3d3db72d36154afc67e3bf055f85ae928daf3585d1545cfea59c921d8711b417d18f51f8dd4005

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Exclude:
+    - 'spec/fixtures/*'

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.3.0
+  - 2.2
+  - 2.1

data/README.md

@@ -1,6 +1,6 @@
 # SimplifyRb - Polyline simplification
 
-[![Codeship Status for odlp/simplify_rb](https://www.codeship.io/projects/2a8ed250-47d5-0132-a14f-46b32a25e7b0/status)](https://www.codeship.io/projects/45709)
+[![Build Status](https://travis-ci.org/odlp/simplify_rb.svg?branch=master)](https://travis-ci.org/odlp/simplify_rb) [![Gem Version](https://badge.fury.io/rb/simplify_rb.svg)](https://badge.fury.io/rb/simplify_rb)
 
 SimplifyRb is a Ruby port of [simplify.js](https://github.com/mourner/simplify-js) by Vladimir Agafonkin.
 

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => [:spec]

data/lib/simplify_rb/symbolizer.rb

@@ -0,0 +1,13 @@
+module SimplifyRbUtils
+  class Symbolizer
+    def keys_are_symbols?(keys)
+      keys.all? { |k| k.is_a? Symbol }
+    end
+
+    def symbolize_keys(collection)
+      collection.map do |item|
+        item.each_with_object({}) { |(k,v), memo| memo[k.to_sym] = v }
+      end
+    end
+  end
+end

data/lib/simplify_rb/version.rb

@@ -1,3 +1,3 @@
 class SimplifyRb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/simplify_rb.rb

@@ -1,29 +1,32 @@
-require "simplify_rb/version"
+require 'simplify_rb/version'
+require 'simplify_rb/symbolizer'
 
 class SimplifyRb
-  # Main method
-  def self.simplify (points, tolerance=1, highest_quality=false)
+
+  def self.simplify(points, tolerance = 1, highest_quality = false)
     raise ArgumentError.new('Points must be an array') unless points.is_a? Array
 
     return points if points.length <= 1
 
-    points = symbolize_keys(points) unless keys_are_symbols?(points.map(&:keys))
+    symbolizer = SimplifyRbUtils::Symbolizer.new
+
+    points = symbolizer.symbolize_keys(points) unless points.all? { |p| symbolizer.keys_are_symbols?(p.keys) }
 
     sq_tolerance = tolerance * tolerance
 
     # Optimisation step 1
-    points = simplifyRadialDist(points, sq_tolerance) unless highest_quality
+    points = simplify_radial_dist(points, sq_tolerance) unless highest_quality
 
     # Optimisation step 2
-    simplifyDouglasPeucker(points, sq_tolerance)
+    simplify_douglas_peucker(points, sq_tolerance)
   end
 
   # Basic distance-based simplification
-  def self.simplifyRadialDist (points, sq_tolerance)
+  def self.simplify_radial_dist(points, sq_tolerance)
     new_points = [points.first]
 
     points.each do |point|
-      new_points << point if (getSqDist(point, new_points.last) > sq_tolerance)
+      new_points << point if (get_sq_dist(point, new_points.last) > sq_tolerance)
     end
 
     new_points << points.last unless new_points.last == points.last
@@ -32,7 +35,7 @@ class SimplifyRb
   end
 
   # Simplification using optimized Douglas-Peucker algorithm with recursion elimination
-  def self.simplifyDouglasPeucker (points, sq_tolerance)
+  def self.simplify_douglas_peucker(points, sq_tolerance)
     first = 0
     last  = points.length - 1
     index = nil
@@ -41,11 +44,11 @@ class SimplifyRb
     points.first[:keep] = true
     points.last[:keep]  = true
 
-    while last do
+    while last
       max_sq_dist = 0
 
       ((first + 1)...last).each do |i|
-        sq_dist = getSqSegDist(points[i], points[first], points[last])
+        sq_dist = get_sq_seg_dist(points[i], points[first], points[last])
 
         if sq_dist > max_sq_dist
           index = i
@@ -66,7 +69,7 @@ class SimplifyRb
   end
 
   # Square distance between two points
-  def self.getSqDist (point_1, point_2)
+  def self.get_sq_dist(point_1, point_2)
     dx = point_1[:x] - point_2[:x]
     dy = point_1[:y] - point_2[:y]
 
@@ -74,13 +77,13 @@ class SimplifyRb
   end
 
   # Square distance from a point to a segment
-  def self.getSqSegDist (point, point_1, point_2)
+  def self.get_sq_seg_dist(point, point_1, point_2)
     x  = point_1[:x]
     y  = point_1[:y]
     dx = point_2[:x] - x
     dy = point_2[:y] - y
 
-    if (dx != 0 || dy != 0)
+    if dx != 0 || dy != 0
       t = ((point[:x] - x) * dx + (point[:y] - y) * dy) / (dx * dx + dy * dy)
 
       if t > 1
@@ -98,16 +101,4 @@ class SimplifyRb
 
     dx * dx + dy * dy
   end
-
-  # Check if keys are symbols
-  def self.keys_are_symbols? (keys)
-    keys.all? {|k| k.is_a? Symbol}
-  end
-
-  # Symbolize all the hash keys in an array of hashes
-  def self.symbolize_keys (collection)
-    collection.map do |item|
-      item.each_with_object({}) { |(k,v), memo| memo[k.to_sym] = v }
-    end
-  end
 end

data/simplify_rb.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simplify_rb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "simplify_rb"
+  spec.name          = 'simplify_rb'
   spec.version       = SimplifyRb::VERSION
-  spec.authors       = ["odlp"]
-  spec.description   = "You can use this gem to reduce the number of points in a complex polyline / polygon, making use of an optimized Douglas-Peucker algorithm. Ruby port of Simplify.js."
-  spec.summary       = "Polyline simplification library. Ruby port of Simplify.js."
-  spec.homepage      = "https://github.com/odlp/simplify_rb"
-  spec.license       = "MIT"
+  spec.authors       = ['odlp']
+  spec.description   = 'You can use this gem to reduce the number of points in a complex polyline / polygon, making use of an optimized Douglas-Peucker algorithm. Ruby port of Simplify.js.'
+  spec.summary       = 'Polyline simplification library. Ruby port of Simplify.js.'
+  spec.homepage      = 'https://github.com/odlp/simplify_rb'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10"
-  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 11'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

data/spec/simplify_rb_spec.rb

@@ -1,49 +1,43 @@
-require "spec_helper"
+require 'spec_helper'
+require 'simplify_rb'
+require File.expand_path('../fixtures/simplify_test_data.rb', __FILE__)
 
 describe SimplifyRb do
-  context "simplifies points correctly with the given tolerance" do
-    before(:each) {@test_data = SimplifyTestData::points}
-
-    it "uses the fast strategy by default" do
-      expect(SimplifyRb.simplify(@test_data, 5)).to eq(SimplifyTestData::result_fast)
-    end
-
-    it "uses the high quality strategy when the flag is passed" do
-      expect(SimplifyRb.simplify(@test_data, 5, true)).to eq(SimplifyTestData::result_high_quality)
+  describe '#simplify' do
+    context 'simplifies points correctly with the given tolerance' do
+      let(:test_data) { SimplifyTestData::points }
+      let(:expected_fast_result) { SimplifyTestData::result_fast }
+      let(:expected_high_quality_result) { SimplifyTestData::result_high_quality }
+
+      it 'uses the fast strategy by default' do
+        result = SimplifyRb.simplify(test_data, 5)
+        expect(result).to eq(expected_fast_result)
+      end
+
+      it 'uses the high quality strategy when the flag is passed' do
+        result = SimplifyRb.simplify(test_data, 5, true)
+        expect(result).to eq(expected_high_quality_result)
+      end
     end
-  end
-
-  it "returns the points if it has only one point" do
-    data = [{x: 1, y: 2}]
-
-    expect(SimplifyRb.simplify(data)).to eq(data)
-  end
 
-  it "returns the array if it has no points" do
-    expect(SimplifyRb.simplify([])).to eq([])
-  end
-
-  it "raises an argument error if the points are passsed as an array" do
-    data = {x: 1, y: 2}
-
-    expect { SimplifyRb.simplify(data) }.to raise_error(ArgumentError, "Points must be an array")
-  end
-
-  describe "#keys_are_symbols?" do
-    it "returns false if any key is not a Symbol" do
-      expect(SimplifyRb.keys_are_symbols? [:a, 'b', :c]).to equal(false)
+    context 'only one point' do
+      it 'returns a list with one point' do
+        data = [{ x: 1, y: 2 }]
+        expect(SimplifyRb.simplify(data)).to eq(data)
+      end
     end
 
-    it "returns return true if all the keys are Symbols" do
-      expect(SimplifyRb.keys_are_symbols? [:a, :b, :c]).to equal(true)
+    context 'no points' do
+      it 'returns an empty list of points' do
+        expect(SimplifyRb.simplify([])).to be_empty
+      end
     end
-  end
-
-  describe "#symbolize_keys" do
-    it "converts all of the collection's keys to symbols" do
-      collection = [{'a' => 1, 'b' => 2}, {'c' => 3}]
 
-      expect(SimplifyRb.symbolize_keys(collection)).to eq([{a: 1, b: 2}, {c: 3}])
+    describe 'unexpected argument' do
+      it 'raises an error if the points are not passsed as an array' do
+        data = { x: 1, y: 2 }
+        expect { SimplifyRb.simplify(data) }.to raise_error(ArgumentError, 'Points must be an array')
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'bundler/setup'
 require 'rspec'
-require File.expand_path '../simplify_test_data.rb', __FILE__
-require 'simplify_rb'
 
-Bundler.setup
+Bundler.setup

data/spec/symbolizer_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'simplify_rb/symbolizer'
+
+describe SimplifyRbUtils::Symbolizer do
+  describe '#keys_are_symbols?' do
+    it 'returns false if any key is not a Symbol' do
+      expect(subject.keys_are_symbols?([:a, 'b', :c])).to equal(false)
+    end
+
+    it 'returns return true if all the keys are Symbols' do
+      expect(subject.keys_are_symbols?([:a, :b, :c])).to equal(true)
+    end
+  end
+
+  describe '#symbolize_keys' do
+    it 'converts all of the collection\'s keys to symbols' do
+      collection = [{ 'a' => 1, 'b' => 2 }, { 'c' => 3 }]
+      symbolized_result = subject.symbolize_keys(collection)
+      expected_result = [{ a: 1, b: 2 }, { c: 3 }]
+
+      expect(symbolized_result).to eq(expected_result)
+    end
+  end
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: simplify_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - odlp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
 description: You can use this gem to reduce the number of points in a complex polyline
   / polygon, making use of an optimized Douglas-Peucker algorithm. Ruby port of Simplify.js.
 email: 
@@ -59,18 +59,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/simplify_rb.rb
+- lib/simplify_rb/symbolizer.rb
 - lib/simplify_rb/version.rb
 - simplify_rb.gemspec
+- spec/fixtures/simplify_test_data.rb
 - spec/simplify_rb_spec.rb
-- spec/simplify_test_data.rb
 - spec/spec_helper.rb
+- spec/symbolizer_spec.rb
 homepage: https://github.com/odlp/simplify_rb
 licenses:
 - MIT
@@ -81,21 +85,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Polyline simplification library. Ruby port of Simplify.js.
 test_files:
+- spec/fixtures/simplify_test_data.rb
 - spec/simplify_rb_spec.rb
-- spec/simplify_test_data.rb
 - spec/spec_helper.rb
+- spec/symbolizer_spec.rb