silva 0.0.6 → 0.0.7

data/lib/silva/exception.rb

@@ -3,5 +3,5 @@ module Silva
   class InvalidTransformError < StandardError; end
   class InvalidParamError < StandardError; end
   class InvalidParamValueError < StandardError; end
-  class InsufficentParamsError < StandardError; end
+  class InsufficientParamsError < StandardError; end
 end

data/lib/silva/system/base.rb

@@ -30,7 +30,7 @@ module Silva
       #
       def initialize(options)
         @system_name = self.class.name.split('::').last.downcase.to_sym
-        options = DEFAULT_PARAMS.merge(options)
+        options = self.class::DEFAULT_PARAMS.merge(options)
         params_satisfied?(options)
         options.each {|param, val| set_param(param, val) }
       end
@@ -61,7 +61,7 @@ module Silva
       end
 
       def params_satisfied?(options)
-        raise InsufficientParamsError unless REQUIRED_PARAMS & options.keys == REQUIRED_PARAMS
+        raise Silva::InsufficientParamsError unless self.class::REQUIRED_PARAMS & options.keys == self.class::REQUIRED_PARAMS
       end
     end
   end

data/lib/silva/system/gridref.rb

@@ -28,8 +28,6 @@ module Silva
       # Height of the UK grid
       OSGB_GRID_SCALE = 100000
 
-      attr_reader :gridref
-
       ##
       # Lazily create the gridref from given eastings and northings, or just return it if already set.
       #
@@ -37,14 +35,14 @@ module Silva
       #
       def gridref
         unless @gridref
-          e100k = (@easting / 100000).floor
-          n100k = (@northing / 100000).floor
+          e100k = (easting / 100000).floor
+          n100k = (northing / 100000).floor
           
           index = n100k * OSGB_GRID_WIDTH + e100k
           prefix = OSGB_PREFIXES[index]
           
-          e = ((@easting % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
-          n = ((@northing % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
+          e = ((easting % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
+          n = ((northing % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
           
           @gridref = prefix + e.to_s.rjust(@digits / 2) + n.to_s.rjust(@digits / 2)
         end
@@ -98,7 +96,7 @@ module Silva
       end
 
       def params_satisfied?(options)
-        super or options.include?(:gridref)
+        super unless options.include?(:gridref)
       end
     end
   end

data/lib/silva/version.rb

@@ -1,3 +1,3 @@
 module Silva
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/test_gridref.rb

@@ -1,8 +1,7 @@
 class TestGridref < Test::Unit::TestCase
-  def test_gridref_to_s
+  def test_gridref_no_digits
     Silva::Test::DATA.each do |data|
-      options = { :gridref => data[:gridref], :digits => 8 }
-      l = Silva::Location.from(:gridref, options)
+      l = Silva::Location.from(:en, data[:en]).to(:gridref)
       assert_equal(data[:gridref], l.to_s)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silva
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: