hamradio 0.3.1 → 0.4.0

data/Gemfile

@@ -1,12 +1,10 @@
 source "http://rubygems.org"
-gem 'faraday'
-#gem 'nestful'
 gem 'httparty'
 
 group :development do
   gem "log_buddy"
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "shoulda"
+  gem "bundler"
+  gem "jeweler"
+  gem "rcov"
 end

data/Gemfile.lock

@@ -1,13 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
+    httparty (0.8.1)
       multi_json
       multi_xml
     jeweler (1.6.4)
@@ -16,21 +11,18 @@ GEM
       rake
     log_buddy (0.6.0)
     multi_json (1.0.3)
-    multi_xml (0.4.0)
-    multipart-post (1.1.3)
-    rack (1.3.2)
-    rake (0.9.2)
-    rcov (0.9.10)
+    multi_xml (0.4.1)
+    rake (0.9.2.2)
+    rcov (0.9.11)
     shoulda (2.11.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  faraday
+  bundler
   httparty
-  jeweler (~> 1.6.4)
+  jeweler
   log_buddy
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/hamradio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hamradio"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Graham McIntire W5ISP"]
-  s.date = "2011-09-23"
+  s.date = "2011-11-08"
   s.description = "Includes grid square decoding/encoding & call sign lookup."
   s.email = "gmcintire@gmail.com"
   s.extra_rdoc_files = [
@@ -33,36 +33,33 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/gmcintire/hamradio"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "A collection of useful Amateur (Ham) Radio utilities by W5ISP."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     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<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"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<faraday>, [">= 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"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<faraday>, [">= 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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/lib/hamradio.rb

@@ -49,4 +49,8 @@ class HamRadio
     c['calls']
   end
 
+  def valid_callsign(call)
+    (call =~ /^([BFGIKMNTW]|[A-Z0-9]{2})[0-9][A-Z0-9]{0,3}[A-Z]$/i) != nil
+  end
+
 end

data/test/test_hamradio.rb

@@ -20,30 +20,77 @@ class TestHamradio < Test::Unit::TestCase
     assert_equal('EM13sf', grid)
   end
 
-  should "encode gridsquare invalid string" do
+#  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
+
+#  should "encode gridsquare invalid randomness" do
+#    h = HamRadio.new
+#    grid = h.grid_encode(Random.rand(1000))
+#    assert_equal(nil, grid)
+#  end
+
+  should "Valid gridsquare check EM13" do
     h = HamRadio.new
-    grid = h.grid_encode('over there')
-    assert_equal(nil, grid)
+    grid = h.valid_gridsquare('EM13')
+    assert_equal(true, grid)
   end
 
-  should "encode gridsquare invalid number" do
+  should "Valid gridsquare check EM13sf" do
     h = HamRadio.new
-    grid = h.grid_encode(1234567890)
-    assert_equal(nil, grid)
+    grid = h.valid_gridsquare('EM13sf')
+    assert_equal(true, grid)
   end
 
-  should "encode gridsquare invalid randomness" do
+  should "Valid gridsquare check Em13sF" do
     h = HamRadio.new
-    grid = h.grid_encode(Random.rand(1000))
-    assert_equal(nil, grid)
+    grid = h.valid_gridsquare('Em13sF')
+    assert_equal(true, grid)
   end
 
-#  should "callsign lookup" do
+  should "Invalid gridsquare check EM" do
+    h = HamRadio.new
+    grid = h.valid_gridsquare('EM')
+    assert_equal(false, grid)
+  end
+
+  should "Invalid gridsquare check EM1" do
+    h = HamRadio.new
+    grid = h.valid_gridsquare('EM1')
+    assert_equal(false, grid)
+  end
+
+  should "Invalid gridsquare check 13" do
+    h = HamRadio.new
+    grid = h.valid_gridsquare('13')
+    assert_equal(false, grid)
+  end
+
+#  should "Invalid gridsquare check EM131" 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)
+#    grid = h.valid_gridsquare('EM131')
+#    assert_equal(false, grid)
 #  end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamradio
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70258270695420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70258270695420
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70258270694840 !ruby/object:Gem::Requirement
+  requirement: &70263612228020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70258270694840
+  version_requirements: *70263612228020
 - !ruby/object:Gem::Dependency
   name: log_buddy
-  requirement: &70258270694340 !ruby/object:Gem::Requirement
+  requirement: &70263612227420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258270694340
+  version_requirements: *70263612227420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70258270693720 !ruby/object:Gem::Requirement
+  requirement: &70263612226800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,32 +43,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258270693720
+  version_requirements: *70263612226800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70258270693100 !ruby/object:Gem::Requirement
+  requirement: &70263612226240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258270693100
+  version_requirements: *70263612226240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70258270692400 !ruby/object:Gem::Requirement
+  requirement: &70263612225660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258270692400
+  version_requirements: *70263612225660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70258270691680 !ruby/object:Gem::Requirement
+  requirement: &70263612225120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258270691680
+  version_requirements: *70263612225120
 description: Includes grid square decoding/encoding & call sign lookup.
 email: gmcintire@gmail.com
 executables: []
@@ -123,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1919711096698156600
+      hash: -3553863633652493112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A collection of useful Amateur (Ham) Radio utilities by W5ISP.