border_patrol 0.1.0 → 0.1.1

data/.gitignore

@@ -2,3 +2,4 @@
 #*
 *.sw*
 .bundle
+/Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/Gemfile

@@ -1,10 +1,2 @@
 source :rubygems
-
-gem "nokogiri", "= 1.4.3.1"
-
-group :development do
-  gem "rake",          "= 0.8.7"
-  gem "rspec",         "= 1.3.0"
-  gem "progressbar"
-end
-
+gemspec

data/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright © 2009 Square, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.markdown

@@ -1,6 +1,6 @@
 # BorderPatrol
 
-BorderPatrol lets you import a KML file and then check if points are inside or outside the polygons the file defines.
+BorderPatrol allows you import a KML file and then check if points are inside or outside the polygons the file defines.
 
 The KML file may have multiple polygons defined, google maps is a good source.
 

data/Rakefile

@@ -3,13 +3,7 @@ require 'bundler'
 Bundler.setup
 
 require 'rake'
-require 'spec/rake/spectask'
-
-
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.libs << 'spec'
-  spec.spec_opts = ["--options", "spec/spec.opts"]
-end
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/border_patrol.gemspec

@@ -1,28 +1,21 @@
 # encoding: utf-8
 
-require 'bundler'
-
 Gem::Specification.new do |s|
   s.name = "border_patrol"
   s.version = File.read("lib/VERSION").strip
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = "1.3.7"
-
   s.authors = ["Zach Brock", "Matt Wilson"]
   s.email = "eng@squareup.com"
-  
   s.date = "2010-10-20"
   s.description = "Lets you import a KML file and then check if points are inside or outside the polygons the file defines."
   s.summary = "Import and query KML regions"
   s.homepage = "http://github.com/square/border_patrol"
 
-  s.rdoc_options = ["--charset=UTF-8"]
-
   s.require_paths = ["lib"]
-  root_files = %w(border_patrol.gemspec Rakefile README.markdown .gitignore Gemfile Gemfile.lock)
-  s.files = Dir['{lib,spec}/**/*'] + root_files
-  s.test_files = Dir['spec/**/*']
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- spec/*`.split("\n")
+
+  s.add_dependency("nokogiri", ">= 1.4.3.1")
 
-  s.add_bundler_dependencies
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec", "~> 2.6.0")
 end

data/lib/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/border_patrol/polygon.rb

@@ -1,18 +1,22 @@
+require 'forwardable'
 module BorderPatrol
-  class Polygon < Array
-    def initialize(* args)
+  class Polygon
+    extend Forwardable
+    def initialize(*args)
       args.flatten!
       args.uniq!
       raise InsufficientPointsToActuallyFormAPolygonError unless args.size > 2
-      super(args)
+      @points = Array.new(args)
     end
 
+    def_delegators :@points, :size, :each, :first, :include?, :[], :index
+
     def ==(other)
       # Do we have the right number of points?
       return false unless other.size == size
 
       # Are the points in the right order?
-      first, second = self.first(2)
+      first, second = first(2)
       index = other.index(first)
       return false unless index
       direction = (other[index-1] == second) ? -1 : 1
@@ -28,7 +32,7 @@ module BorderPatrol
 
     # Quick and dirty hash function
     def hash
-      inject(0) { |sum, point| sum += point.x + point.y }
+      @points.inject(0) { |sum, point| sum += point.x + point.y }
     end
 
     def contains_point?(point)

data/script/ci

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby -w
+
+def run(command)
+  system(command) || abort("`#{command}` failed")
+end
+
+run("gem install bundler") if `gem list bundler | grep bundler`.empty?
+
+run "bundle check || bundle install"
+run "rake"

data/spec/lib/border_patrol/polygon_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
- describe BorderPatrol::Polygon do
+describe BorderPatrol::Polygon do
   describe "==" do
     it "is true if polygons are congruent" do
       points = [BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(3, 4), BorderPatrol::Point.new(0, 0)]
@@ -16,9 +16,9 @@ require 'spec_helper'
     end
 
     it "cares about order of points" do
-      points = [BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(3, 4), BorderPatrol::Point.new(5,5), BorderPatrol::Point.new(0, 0)]
+      points = [BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(3, 4), BorderPatrol::Point.new(5, 5), BorderPatrol::Point.new(0, 0)]
       poly1 = BorderPatrol::Polygon.new(points)
-      points = [BorderPatrol::Point.new(5,5), BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(0, 0), BorderPatrol::Point.new(3, 4)]
+      points = [BorderPatrol::Point.new(5, 5), BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(0, 0), BorderPatrol::Point.new(3, 4)]
       poly2 = BorderPatrol::Polygon.new(points)
 
       poly1.should_not == poly2
@@ -52,7 +52,7 @@ require 'spec_helper'
 
     it "can be instantiated with a arbitrary argument list" do
       points = [BorderPatrol::Point.new(1, 2), BorderPatrol::Point.new(3, 4), BorderPatrol::Point.new(0, 0)]
-      poly1 = BorderPatrol::Polygon.new(*points)
+      poly1 = BorderPatrol::Polygon.new(* points)
       poly2 = BorderPatrol::Polygon.new(points)
       poly1.should == poly2
     end

data/spec/spec_helper.rb

@@ -2,20 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'nokogiri'
+require 'border_patrol'
 
-base_dir = File.expand_path("#{File.dirname(__FILE__)}/..")
-app_dirs = ['lib', 'lib/kaml_pen']
-
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-
-app_dirs.each do |app_dir|
-  Dir["#{base_dir}/spec/#{app_dir}/*.rb"].each do |f|
-    f.sub!('/spec','')
-    f.sub!('_spec','')
-    require f
-  end
-end
-
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: border_patrol
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Zach Brock
@@ -20,39 +20,26 @@ date: 2010-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  name: rake
+  name: nokogiri
   prerelease: false
-  requirement: *id001
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 113
         segments: 
         - 1
+        - 4
         - 3
-        - 0
-        version: 1.3.0
-  name: rspec
-  prerelease: false
-  requirement: *id002
-  type: :development
+        - 1
+        version: 1.4.3.1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,27 +48,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: progressbar
-  prerelease: false
-  requirement: *id003
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 113
+        hash: 23
         segments: 
-        - 1
-        - 4
-        - 3
-        - 1
-        version: 1.4.3.1
-  name: nokogiri
-  prerelease: false
-  requirement: *id004
-  type: :runtime
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id003
 description: Lets you import a KML file and then check if points are inside or outside the polygons the file defines.
 email: eng@squareup.com
 executables: []
@@ -91,31 +75,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .rspec
+- Gemfile
+- LICENSE.txt
+- README.markdown
+- Rakefile
+- border_patrol.gemspec
+- lib/VERSION
+- lib/border_patrol.rb
 - lib/border_patrol/polygon.rb
 - lib/border_patrol/region.rb
-- lib/border_patrol.rb
-- lib/VERSION
+- script/ci
 - spec/lib/border_patrol/polygon_spec.rb
 - spec/lib/border_patrol/region_spec.rb
 - spec/lib/border_patrol_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/colorado-test.kml
-- spec/support/formatters/compact_progress_bar_formatter.rb
 - spec/support/multi-polygon-test.kml
-- border_patrol.gemspec
-- Rakefile
-- README.markdown
-- .gitignore
-- Gemfile
-- Gemfile.lock
 has_rdoc: true
 homepage: http://github.com/square/border_patrol
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -139,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Import and query KML regions
@@ -147,8 +131,6 @@ test_files:
 - spec/lib/border_patrol/polygon_spec.rb
 - spec/lib/border_patrol/region_spec.rb
 - spec/lib/border_patrol_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/colorado-test.kml
-- spec/support/formatters/compact_progress_bar_formatter.rb
 - spec/support/multi-polygon-test.kml

data/Gemfile.lock

@@ -1,31 +0,0 @@
---- 
-dependencies: 
-  rake: 
-    group: 
-    - :development
-    version: = 0.8.7
-  rspec: 
-    group: 
-    - :development
-    version: = 1.3.0
-  progressbar: 
-    group: 
-    - :development
-    version: ">= 0"
-  nokogiri: 
-    group: 
-    - :default
-    version: = 1.4.3.1
-specs: 
-- rake: 
-    version: 0.8.7
-- nokogiri: 
-    version: 1.4.3.1
-- progressbar: 
-    version: 0.9.0
-- rspec: 
-    version: 1.3.0
-hash: cbbadd85a1348941a32f127e7ae81222e0cfb8bc
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format Spec::Runner::Formatter::CompactProgressBarFormatter
---loadby mtime
---backtrace

data/spec/support/formatters/compact_progress_bar_formatter.rb

@@ -1,133 +0,0 @@
-# Originally by Nicholas A. Evans. See LICENSE.txt at
-# http://gist.github.com/275257
-#
-# Note: includes modifications from the original to use '=' for the progress
-# bar mark and keep the cursor from hopping all around during the animation.
-#
-# This version is compatible with RSpec 1.2.9 and ProgressBar 0.9.0.
-
-require 'spec/runner/formatter/base_text_formatter'
-require 'progressbar'
-
-module Spec
-  module Runner
-    module Formatter
-      class CompactProgressBarFormatter < BaseTextFormatter
-        # Threshold for slow specs, in seconds.
-        # Anything that takes longer than this will be printed out
-        THRESHOLD = 1.0 unless defined?(THRESHOLD)
-
-        attr_reader :total, :current
-
-        def start(example_count)
-          @current     = 0
-          @total       = example_count
-          @error_state = :all_passing
-          @pbar        = ProgressBar.new("#{example_count} examples", example_count, output)
-          @pbar.instance_variable_set("@bar_mark", "=")
-        end
-
-        def example_started(example)
-          super
-          @start_time = Time.now
-        end
-
-        def example_passed(example)
-          print_warning_if_slow(example_group.description,
-                                example.description,
-                                Time.now - @start_time)
-          increment
-        end
-
-        def example_pending(example, message, deprecated_pending_location=nil)
-          immediately_dump_pending(example.description, message, pending_caller)
-          mark_error_state_pending
-          increment
-        end
-
-        def example_failed(example, counter, failure)
-          immediately_dump_failure(counter, failure)
-          mark_error_state_failed
-          increment
-        end
-
-        def start_dump
-          with_color do
-            @pbar.finish
-          end
-          output.flush
-        end
-
-        def dump_failure(*args)
-          # no-op; we summarized failures as we were running
-        end
-
-        def method_missing(sym, *args)
-          # ignore
-        end
-
-        # Adapted from BaseTextFormatter#dump_failure
-        def immediately_dump_failure(counter, failure)
-          erase_current_line
-          output.print "#{counter.to_s}) "
-          output.puts colorize_failure("#{failure.header}\n#{failure.exception.message}", failure)
-          output.puts format_backtrace(failure.exception.backtrace)
-          output.puts
-        end
-
-        # Adapted from BaseTextFormatter#dump_pending
-        def immediately_dump_pending(desc, msg, called_from)
-          erase_current_line
-          output.puts yellow("PENDING SPEC:") + " #{desc} (#{msg})"
-          output.puts "  Called from #{called_from}" if called_from
-        end
-
-        def increment
-          with_color do
-            @current += 1
-            # Since we're constantly erasing the line, make sure the progress is
-            # printed even when the bar hasn't changed
-            @pbar.instance_variable_set("@previous", 0)
-            @pbar.instance_variable_set("@title", "  #{current}/#{total}")
-            @pbar.inc
-          end
-          output.flush
-        end
-
-        ERROR_STATE_COLORS = {
-          :all_passing  => "\e[32m", # green
-          :some_pending => "\e[33m", # yellow
-          :some_failed  => "\e[31m", # red
-        } unless defined?(ERROR_STATE_COLORS)
-
-        def with_color
-          output.print "\e[?25l" + ERROR_STATE_COLORS[@error_state] if colour?
-          yield
-          output.print "\e[0m\e[?25h" if colour?
-        end
-
-        def mark_error_state_failed
-          @error_state = :some_failed
-        end
-
-        def mark_error_state_pending
-          @error_state = :some_pending unless @error_state == :some_failed
-        end
-
-        def erase_current_line
-          output.print "\e[K"
-        end
-
-        def print_warning_if_slow(group, example, elapsed)
-          if elapsed > THRESHOLD
-            erase_current_line
-            output.print yellow("SLOW SPEC: #{sprintf("%.4f", elapsed)} ")
-            output.print " #{group} #{example}"
-            output.puts
-          end
-        end
-
-      end
-    end
-  end
-end