hamradio 0.3.0 → 0.3.1

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 gem 'faraday'
-gem 'nestful'
+#gem 'nestful'
+gem 'httparty'
 
 group :development do
   gem "log_buddy"

data/Gemfile.lock

@@ -1,23 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1.rc1)
-      multi_json (~> 1.0)
     addressable (2.2.6)
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
       rack (>= 1.1.0, < 2)
     git (1.2.5)
+    httparty (0.8.0)
+      multi_json
+      multi_xml
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     log_buddy (0.6.0)
     multi_json (1.0.3)
+    multi_xml (0.4.0)
     multipart-post (1.1.3)
-    nestful (0.0.7)
-      activesupport (>= 3.0.0.beta)
     rack (1.3.2)
     rake (0.9.2)
     rcov (0.9.10)
@@ -29,8 +29,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   faraday
+  httparty
   jeweler (~> 1.6.4)
   log_buddy
-  nestful
   rcov
   shoulda

data/README.rdoc

@@ -4,6 +4,8 @@
 
 A small collection of Amateur (Ham) radio tools put together by Graham McIntire W5ISP.
 
+Ruby 1.9+ is required.
+
 == Usage
 * To encode a gridsquare from decimal latitude/longitude
     h = HamRadio.new

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/hamradio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hamradio"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Graham McIntire W5ISP"]
-  s.date = "2011-09-22"
+  s.date = "2011-09-23"
   s.description = "Includes grid square decoding/encoding & call sign lookup."
   s.email = "gmcintire@gmail.com"
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<faraday>, [">= 0"])
-      s.add_runtime_dependency(%q<nestful>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<log_buddy>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<faraday>, [">= 0"])
-      s.add_dependency(%q<nestful>, [">= 0"])
+      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<log_buddy>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<faraday>, [">= 0"])
-    s.add_dependency(%q<nestful>, [">= 0"])
+    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<log_buddy>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/hamradio.rb

@@ -6,6 +6,8 @@ class HamRadio
 
   def grid_encode(dms)
 
+    # return nil if this isn't a valid gridsquare
+    return nil if self.valid_gridsquare(dms) == nil
     grid = ''
 
     lat = dms[0].to_f+90
@@ -37,7 +39,7 @@ class HamRadio
   end
 
   def valid_gridsquare(grid)
-    (grid =~ /[a-z][a-z]\d\d/i) != nil
+    (grid =~ /[a-z][a-z]\d\d[a-z]*/i) != nil
   end
 
   def lookup_callsign(call)

data/test/test_hamradio.rb

@@ -1,9 +1,6 @@
 require 'helper'
 
 class TestHamradio < Test::Unit::TestCase
-#  should "probably rename this file and start testing for real" do
-#    flunk "hey buddy, you should probably rename this file and start testing for real"
-#  end
 
   should "encode gridsquare culleoka" do
     h = HamRadio.new
@@ -23,4 +20,30 @@ class TestHamradio < Test::Unit::TestCase
     assert_equal('EM13sf', grid)
   end
 
+  should "encode gridsquare invalid string" do
+    h = HamRadio.new
+    grid = h.grid_encode('over there')
+    assert_equal(nil, grid)
+  end
+
+  should "encode gridsquare invalid number" do
+    h = HamRadio.new
+    grid = h.grid_encode(1234567890)
+    assert_equal(nil, grid)
+  end
+
+  should "encode gridsquare invalid randomness" do
+    h = HamRadio.new
+    grid = h.grid_encode(Random.rand(1000))
+    assert_equal(nil, grid)
+  end
+
+#  should "callsign lookup" do
+#    h = HamRadio.new
+#    grid = h.lookup_callsign('w5isp')
+#    w5isp = {"callsign"=>"W5ISP", "city"=>"BLUE RIDGE", "country"=>nil, "created_at"=>"2011-06-19T23:19:47Z", "dob"=>nil, "effective"=>"2011-04-30", "expiration"=>"2021-04-30", "first_name"=>"GRAHAM D", "gridsquare"=>"\u0004\f13\u0012\u0005", "id"=>585745, "last_name"=>"MCINTIRE", "lat"=>"33.245919", "license_class"=>"G", "long"=>"-96.426614", "precision"=>"address", "previous_call"=>"", "previous_class"=>nil, "state"=>"TX", "street"=>"11411 CR 571", "updated_at"=>"2011-06-23T20:41:47Z", "zip"=>"75424"}
+#    assert_equal(w5isp, grid)
+#  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamradio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70226839495800 !ruby/object:Gem::Requirement
+  requirement: &70258270695420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70226839495800
+  version_requirements: *70258270695420
 - !ruby/object:Gem::Dependency
-  name: nestful
-  requirement: &70226839495080 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &70258270694840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70226839495080
+  version_requirements: *70258270694840
 - !ruby/object:Gem::Dependency
   name: log_buddy
-  requirement: &70226839494360 !ruby/object:Gem::Requirement
+  requirement: &70258270694340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226839494360
+  version_requirements: *70258270694340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70226839493760 !ruby/object:Gem::Requirement
+  requirement: &70258270693720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226839493760
+  version_requirements: *70258270693720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70226839493080 !ruby/object:Gem::Requirement
+  requirement: &70258270693100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70226839493080
+  version_requirements: *70258270693100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70226839492380 !ruby/object:Gem::Requirement
+  requirement: &70258270692400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70226839492380
+  version_requirements: *70258270692400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70226839491580 !ruby/object:Gem::Requirement
+  requirement: &70258270691680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226839491580
+  version_requirements: *70258270691680
 description: Includes grid square decoding/encoding & call sign lookup.
 email: gmcintire@gmail.com
 executables: []
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 943163124751310864
+      hash: -1919711096698156600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: