rats 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rats/base.rb

@@ -205,7 +205,7 @@ module Rats
     end
 
     def short_location
-      [@quarter.to_p,@section.to_p,@township.to_p,@range.to_p,@meridian.to_p].compact.join('').strip
+      [@meridian.to_p,@range.to_p,@township.to_p,@section.to_p,@quarter.to_p].compact.join('').strip
     end
     
     def long_location

data/lib/rats/boundaries.rb

@@ -1,6 +1,9 @@
 module Rats
   class Base
     
+    # TODO: this data needs to be updated to list the sections where not
+    #       all quarters are valid, and list whoch ones are.
+    
     # this array doesn't define what is valid, but trys to define what
     # combinations of meridian/range/township/section exist
     #
@@ -15,6 +18,45 @@ module Rats
     #       # NOTE: for a TOWNSHIP listed here, only a SECTION within
     #       #   ARRAY_OF_VALID_SECTIONS is valid
     #       VALID_TOWNSHIP => ARRAY_OF_VALID_SECTIONS
+    #     },
+    #     # NOTE: a SECTION not included here means all QUARTERs are valid within
+    #     # NOTE: for a SECTION listed here, only a QUARTER within
+    #     #   ARRAY_OF_VALID_QUARTERS is valid
+    #     VALID_SECTION => ARRAY_OF_VALID_QUARTERS
+    #   }
+    # }
+    
+    # proposed format (allows for quarters to be listed)
+    #
+    # TOWNSHIPS_BY_RANGE_AND_MERIDIAN = {
+    #   # only valid meridian listed here
+    #   4 => {
+    #     # only valid ranges listed here
+    #     1 => {
+    #       # only valid township range listed here
+    #       :townships => 1..126
+    #       # no specifics past this, means all sections and quarters are valid
+    #     },
+    #     # another valid range
+    #     21 => {
+    #       # only valid townships listed here
+    #       :townships => 1..126,
+    #       # list exceptions specific to certain townships
+    #       :township => {
+    #         # township listed here has exceptions, otherwise treat as normal
+    #         3 => {
+    #           # only valid sections listed here
+    #           :sections => [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,18,19,22,23,24,25,26,27,28,31,32,33,34,35,36],
+    #           # list exceptions specific to certain sections
+    #           :section => {
+    #             # section listed here has exceptions, otherwise treat as normal
+    #             36 => {
+    #               # only valid quarters listed here
+    #               :quarters => [:ne, :se]
+    #             }
+    #           }
+    #         }
+    #       }
     #     }
     #   }
     # }

data/rats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rats}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark G"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-04-14}
   s.description = %q{A ruby class to help with using the Alberta Township System}
   s.email = %q{rats@attackcorp.com}
   s.extra_rdoc_files = [

data/spec/rats_spec.rb

@@ -55,6 +55,24 @@ describe "Rats" do
       land.meridian.should == 4
     end
     
+    it "understands NE-1-2-3-W4" do
+      land = Rats.new("NE-1-2-3-W4")
+      land.quarter.should == "NE"
+      land.section.should == 1
+      land.township.should == 2
+      land.range.should == 3
+      land.meridian.should == 4
+    end
+    
+    it "understands NE-1-2-3-4" do
+      land = Rats.new("NE-1-2-3-4")
+      land.quarter.should == "NE"
+      land.section.should == 1
+      land.township.should == 2
+      land.range.should == 3
+      land.meridian.should == 4
+    end
+    
     it "understands NE 1-1-1-4" do
       land = Rats.new("NE 1-2-3-4")
       land.quarter.should == "NE"
@@ -267,17 +285,17 @@ describe "Rats" do
     
       it "returns NE01002034" do
         land = Rats.new("NE 1-2-3 W4")
-        land.location(:short).should == "NE01002034"
+        land.location(:short).should == "40300201NE"
       end
       
       it "returns 01001014" do
         land = Rats.new("1-2-3 W4")
-        land.location(:short).should == "01002034"
+        land.location(:short).should == "40300201"
       end
 
       it "returns 001014" do
         land = Rats.new("2-3 W4")
-        land.location(:short).should == "002034"
+        land.location(:short).should == "403002"
       end
 
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Mark G
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2010-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: []