rats 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rats/base.rb

@@ -85,8 +85,8 @@ module Rats
     def valid?      
       # check each data field individually
       [:meridian, :range, :township, :section, :quarter].each do |data|
-        valid = self.send(data.to_s.slice(0)).valid?
-        add_error(data, self.send(data.to_s.slice(0)).error) unless valid
+        valid = self.send(data.to_s.chars.first).valid?
+        add_error(data, self.send(data.to_s.chars.first).error) unless valid
       end
       
       # check each field as it relates to others
@@ -158,7 +158,7 @@ module Rats
     end
 
     def location_type?(location)
-      location.to_s.match(/^\d{8}\D{2}/) ? :parcel_id : :description
+      location.to_s.match(/^\d{8}\D{0,2}/) ? :parcel_id : :description
     end
 
     def parse_description(description)
@@ -176,9 +176,9 @@ module Rats
     end
 
     def parse_parcel_id(parcel_id)
-      result = parcel_id.to_s.scan(/^(\d{1})(\d{2})(\d{3})(\d{2})(\D{2})/)
+      result = parcel_id.to_s.scan(/^(\d{1})(\d{2})(\d{3})(\d{2})(\D{2})?/)      
       return unless result && result.size > 0
-      numbers = result.pop
+      numbers = result.pop.compact      
       self.meridian = numbers.shift.to_i if numbers.size > 0
       self.range = numbers.shift.to_i if numbers.size > 0
       self.township = numbers.shift.to_i if numbers.size > 0
@@ -210,10 +210,10 @@ module Rats
     
     def long_location
       quarter_section = []
-      quarter_section << self.q.fullname if self.q && self.q.fullname.size > 0
-      quarter_section << self.s.fullname if self.s && self.s.fullname.size > 0
+      quarter_section << self.q.fullname if (self.q && self.q.fullname.size > 0)
+      quarter_section << self.s.fullname if (self.s && self.s.fullname.size > 0)
       parts = []
-      parts << quarter_section.compact.join(' of ') if quarter_section && quarter_section.size > 0
+      parts << quarter_section.compact.join(' of ') if (quarter_section && quarter_section.size > 0)
       parts << self.t.fullname
       parts << self.r.fullname
       parts << self.m.fullname

data/lib/rats/data/quarter.rb

@@ -11,6 +11,7 @@ module Rats
     end
     
     def fullname
+      return "" unless self.value
       template = "the %s Quarter"
       case self.value.to_s.downcase.to_sym
       when :ne
@@ -29,6 +30,7 @@ module Rats
     private
     
     def validate!
+      return unless self.value
       VALID_QUARTERS.include?(self.value.to_s.downcase.to_sym)
     end
     

data/rats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rats}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark G"]
-  s.date = %q{2010-04-14}
+  s.date = %q{2010-05-08}
   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

@@ -53,6 +53,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands NE-1-2-3-W4" do
@@ -62,6 +63,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands NE-1-2-3-4" do
@@ -71,6 +73,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands NE 1-1-1-4" do
@@ -80,6 +83,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands NE 1 2 3 4" do
@@ -89,6 +93,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands 40300201NE" do
@@ -98,6 +103,17 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
+    end
+    
+    it "understands 40300201" do
+      land = Rats.new("40300201")
+      land.quarter.should be_nil
+      land.section.should == 1
+      land.township.should == 2
+      land.range.should == 3
+      land.meridian.should == 4
+      land.scope.should == :section
     end
     
     it "understands 1-2-3 W4" do
@@ -107,6 +123,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :section
     end
     
     it "understands 2-3 W4" do
@@ -116,6 +133,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :township
     end
     
     it "understands 3 W4" do
@@ -125,6 +143,7 @@ describe "Rats" do
       land.township.should be_nil
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :unknown
     end
     
     it "understands W4" do
@@ -134,6 +153,7 @@ describe "Rats" do
       land.township.should be_nil
       land.range.should be_nil
       land.meridian.should == 4
+      land.scope.should == :unknown
     end
     
     it "understands individual values" do
@@ -143,6 +163,7 @@ describe "Rats" do
       land.township.should == 2
       land.range.should == 3
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     it "understands SE 1-119-24 W4" do
@@ -152,6 +173,7 @@ describe "Rats" do
       land.township.should == 119
       land.range.should == 24
       land.meridian.should == 4
+      land.scope.should == :quarter
     end
     
     describe "alternate method" do
@@ -309,11 +331,13 @@ describe "Rats" do
       
       it "returns the long version with Section" do
         land = Rats.new("1-2-3 W4")
+        #puts land.inspect
         land.location(:long).should == "Section 1, Township 2, Range 3, West of the Fourth Meridian"
       end
       
       it "returns the long version with Township" do
         land = Rats.new("2-3 W4")
+        #puts land.inspect
         land.location(:long).should == "Township 2, Range 3, West of the Fourth Meridian"
       end
       
@@ -356,6 +380,7 @@ describe "Rats" do
       
       it "knows when it isn't valid"do
         land = Rats.new("3 W4")
+        #puts land.inspect
         land.valid?.should be_false
       end
       

metadata

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