os_map_ref 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ae3fcaaf973eec7b4724150197b0ab202538be
-  data.tar.gz: 08a5ebe1a235a599ea73648a2b0a8718134f3b7b
+  metadata.gz: 12d54845568c88b7000830b89f9cf22dc0dd869f
+  data.tar.gz: 3724276fae454400abc143894458372ae74f012a
 SHA512:
-  metadata.gz: de6195a4927e318ebc2c00cf8c61677ee3a9d144cbbf1cd3a76ce80920e5768ff4a2810272d979917e90a39841f2866d4e55dbcc360c65513231be3b93b4b322
-  data.tar.gz: e21af0b63498777aa48e6ec7b2e6ab6dc1ac5dc6ece9f94b9eb9c3e7fc397f2fb8e409adf3a219fdbb52be4441a7a7fa6a25e29c83c7280a267accf733d826f2
+  metadata.gz: a89ed1be4cc0d2651a61ba9a1cba8bbc5ccf2b83bdf2fec3f2071f29b9ea44c2a0cd172a673a0c05da8645d2370146a0ff9e53d9dfc94ac78124405bf83828e6
+  data.tar.gz: 2b2fe98324f2e80b6550d5459c63120bebb0a3ed46ac334f10ff0fc9b11689c9a35673c028bafb78679dc159ac4bc833a87598b377c361cdd6650d1056d9720f

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,4 +1,16 @@
 language: ruby
+cache: bundler
+
 rvm:
   - 2.2.3
+
 before_install: gem install bundler -v 1.11.2
+
+# Have this option to stop travis-ci building twice. Currently we have travis set to build both
+# PR's and pushes. However this means when we push to a PR we have to wait for Travis to finish
+# 2 builds. If we unticked 'pushes' when the PR was finally merged that would not be built. The
+# brute force approach would be to untick build PR's and just build all pushes. We instead have
+# gone with the approach outlined here http://stackoverflow.com/a/31882307
+branches:
+  only:
+    - master

data/README.md

@@ -1,27 +1,33 @@
 # OsMapRef
 
+[![Build Status](https://travis-ci.org/EnvironmentAgency/os_map_ref.svg?branch=master)](https://travis-ci.org/EnvironmentAgency/os_map_ref)
+
 This gem allows you to gather U.K. Ordnance Survey Eastings, North, and Map
 References from a range of text inputs.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's Gemfile
 
 ```ruby
 gem 'os_map_ref'
 ```
 
-And then execute:
+And then update your dependencies by calling
 
-    $ bundle
+```bash
+$ bundle install
+```
 
-Or install it yourself as:
+Or install it yourself as
 
-    $ gem install os_map_ref
+```bash
+$ gem install os_map_ref
+```
 
 ## Usage
 
-To convert a map reference to eastings and northings:
+To convert a map reference to eastings and northings
 
 ```ruby
 location = OsMapRef::Location.for 'ST5880171043'
@@ -31,7 +37,7 @@ location.northing      == 171043
 location.map_reference == 'ST 58801 71043'
 ```
 
-To convert eastings and northings to a map reference:
+To convert eastings and northings to a map reference
 
 ```ruby
 location = OsMapRef::Location.for '358801, 171043'
@@ -44,7 +50,7 @@ location.map_reference == 'ST 58801 71043'
 ### From OS Map Reference to Longitude and Latitude
 
 If your end result needs to be longitude and latitude, you can combine the
-OsMapRef output with that of another gem:
+OsMapRef output with that of another gem called
 [global_convert](https://github.com/reggieb/global_convert)
 
 For example
@@ -78,9 +84,11 @@ for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
-## Contributing
+## Contributing to this project
+
+If you have an idea you'd like to contribute please log an issue.
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/reggieb/os_map_ref.
+All contributions should be submitted via a pull request.
 
 ## License
 

data/Rakefile

@@ -1,12 +1,12 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
 end
 
-task :spec => :test
+task :test => :spec
 
 task :default => :test

data/lib/os_map_ref/input_processor.rb

@@ -58,12 +58,12 @@ module OsMapRef
     end
 
     def padded_map_reference_easting
-      map_reference_easting.ljust(5, '0')
+      map_reference_easting.ljust((normal_length - 1), padding)
     end
 
     def padded_map_reference_northing
-      target_length = northing_longer_than_easting? ? 6 : 5
-      map_reference_northing.ljust(target_length, '0')
+      target_length = northing_longer_than_easting? ? extended_length : normal_length
+      map_reference_northing.ljust((target_length - 1), padding)
     end
 
     def northing_longer_than_easting?
@@ -80,11 +80,41 @@ module OsMapRef
 
     def get_easting_and_northing
       match = easting_northing_pattern.match input
-      (1..2).collect{|n| match[n].ljust(6, '0').to_i}
-    end
-
+      easting = match[1]
+      northing = match[3]
+      length = northing.length > easting.length ? extended_length : normal_length
+      [
+        easting.ljust(normal_length, padding),
+        northing.ljust(length, padding)
+      ]
+    end
+    
+    def extended_length
+      normal_length + 1
+    end
+    
+    def normal_length
+      6
+    end
+    
+    def padding
+      '0'
+    end
+        
+    # Matches are:
+    # 1: First digits which may be followed with a decimal point and more digits
+    # 2: The decimal point and trailing digits from first match (if present)
+    # 3: Second digits which may be followed with a decimal point and more digits
+    # 4: The decimal point and trailing digits from second match (if present)
+    # So: 
+    # "1234.5, 6789.0" --> 1: "1234.5", 2: ".5", 3: "6789.0", 4: ".0"
+    # "1234 6789"      --> 1: "1234",   2: nil,  3: "6789",   4: nil
     def easting_northing_pattern
-      /(\d{3,6})[\,\s]+(\d{3,6})/
+      eastings = /\d{3,6}/    # 3 to 6 digits
+      northings = /\d{3,7}/    # 3 to 7 digits
+      decimals = /\.\d+/    # decimal point and trailing digits
+      separator = /[\,\s]+/ # commas or spaces
+      /(#{eastings}(#{decimals})?)#{separator}(#{northings}(#{decimals})?)/
     end
   end
 end

data/lib/os_map_ref/location.rb

@@ -9,8 +9,12 @@ module OsMapRef
 
     def initialize(args={})
       @map_reference = args[:map_reference].freeze if args[:map_reference]
-      @easting = args[:easting].to_i if args[:easting]
-      @northing = args[:northing].to_i if args[:northing]
+      @easting = remove_decimals(args[:easting]) if args[:easting]
+      @northing = remove_decimals(args[:northing]) if args[:northing]
+    end
+    
+    def remove_decimals(number)
+      number.to_s.sub /\.\d*/, ""
     end
 
     def map_reference
@@ -26,7 +30,7 @@ module OsMapRef
     end
 
     def short_easting
-      easting.to_s[1..-1].to_i
+      easting.to_s[1..-1]
     end
 
     def long_northing?
@@ -38,7 +42,7 @@ module OsMapRef
     end
 
     def short_northing
-      northing.to_s[chars_in_northing_start..-1].to_i
+      northing.to_s[chars_in_northing_start..-1]
     end
 
     def chars_in_northing_start
@@ -50,11 +54,11 @@ module OsMapRef
     end
 
     def easting
-      @easting ||= easting_from_map_reference.to_i
+      @easting ||= easting_from_map_reference
     end
 
     def northing
-      @northing ||= northing_from_map_reference.to_i
+      @northing ||= northing_from_map_reference
     end
 
     def northing_from_map_reference

data/lib/os_map_ref/version.rb

@@ -1,3 +1,3 @@
 module OsMapRef
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/os_map_ref.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: os_map_ref
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: This gem allows you to gather U.K. Ordnance Survey Eastings, North, and
   Map References from a range of text inputs; and output them in a consistent manner
 email:
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE