fcc 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3523585dc37f881c1a11d0d6498f4cb6822b17d46622c87fa2c8e4bda152504e
-  data.tar.gz: 94e813ca0dea28c4135153e83a81fe6c5e6d337ba276588db7e2f5268e093ce1
+  metadata.gz: 3b1badea4f71c71fca305a42faf33d81b8d3bd790f2e3c6ffd06093887345608
+  data.tar.gz: ce292f11199f0415ebf887d25b51accd79d0531b9189f1c941e236e4ea5c80bc
 SHA512:
-  metadata.gz: dbdb4ad161008c9e0017dcf7cfb8e2ca302ccb68d23eb6f7bf6e254c6afcef993705296cf8da2db6a6a44b6e1f421cc2f9fc0fd3499a0f958295c27e53c4de2a
-  data.tar.gz: 0a257e7b264bded09d12a1fd41787b6c687da7998b8906b6407db4f6331b875181f4e95c86eb4d36097455768ed66d896942ed7ffdd0009221d58abf647b3c36
+  metadata.gz: 6f79be5bcddfc7001c7be7c6ef0e64e26acc7e59ae773aaacebea28d9627febe56ab8fecb85a0a1ccda7277b3373999d9ffd5cc2263492e688218c597235e836
+  data.tar.gz: b2280ae8d3dbdaacf447f5cbe880c9220a41b92ef22d2459bf850cfc238c370b58aa921d76d4977f6b4506d744dfff308de92a43827e79e54ad102ef2ae4eafc

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 fcc changelog
 
+## [1.4.6](https://github.com/jkeen/fcc/compare/v1.4.5...v1.4.6) (2024-05-06)
+
+
+### Bug Fixes
+
+* Update some syntax to get things working better with some FCC changes ([9020eee](https://github.com/jkeen/fcc/commit/9020eeee85f1e9689ccff108f9438e48fcbe550c))
+
 ## [1.4.5](https://github.com/jkeen/fcc/compare/v1.4.4...v1.4.5) (2024-03-20)
 
 ## [1.4.4](https://github.com/jkeen/fcc/compare/v1.4.3...v1.4.4) (2024-03-20)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fcc (1.4.0)
+    fcc (1.4.4)
       activesupport (>= 6.1)
       csv
       httparty (~> 0.21)
@@ -24,9 +24,10 @@ GEM
       tzinfo (~> 2.0)
     base64 (0.2.0)
     bigdecimal (3.1.7)
+    byebug (11.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    csv (3.2.8)
+    csv (3.3.0)
     diff-lcs (1.5.1)
     drb (2.2.1)
     httparty (0.21.0)
@@ -63,6 +64,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  byebug
   fcc!
   rake (~> 12.3.3)
   rspec (~> 3.9.0)

data/lib/fcc/station/cache.rb

@@ -23,7 +23,7 @@ module FCC
         @lightly.get(key.to_s) do
           FCC.log "Loading up the cache with results for key: #{key}. This might take a minute…"
           value = yield
-          if value && value.present?
+          if value
             value
           else
             nil

data/lib/fcc/station/extended_info.rb

@@ -7,7 +7,7 @@ module FCC
       include HTTParty
       attr_accessor :results, :service
 
-      base_uri 'https://fcc-cache.b-cdn.net/fcc-bin/'
+      base_uri 'https://transition.fcc.gov/fcc-bin/'
 
       def initialize(service)
         @service = service
@@ -48,7 +48,10 @@ module FCC
           cache_key = "#{self.class.instance_variable_get('@default_options')[:base_uri]}/#{@service.to_s.downcase}q"
           FCC.cache.fetch cache_key do
             response = self.class.get("/#{service.to_s.downcase}q", @options.merge(query: @query))
-            FCC.log(response.request.uri.to_s.gsub('&list=4', '&list=0'))
+
+            FCC.log("Request: #{response.request.uri}")
+            FCC.log("Inspect: #{response.request.uri.to_s.gsub('&list=4', '&list=0')}")
+
             response.parsed_response
           end
         rescue StandardError => e

data/lib/fcc/station/index.rb

@@ -29,7 +29,7 @@ module FCC
 
       def results
         @results ||= begin
-          response = self.class.get("/api/service/#{service.to_s.downcase}/facility/getall.json")
+          response = self.class.get("/api/service/#{service.to_s.downcase}/facility/getall")
           response.parsed_response['results']['facilityList']
         end
       end

data/lib/fcc/station/info.rb

@@ -19,7 +19,7 @@ module FCC
                Station.index(service).call_sign_to_id(id_or_call_sign)
              end
 
-        response = self.class.get("/api/service/#{service.to_s.downcase}/facility/id/#{id}.json")
+        response = self.class.get("/api/service/#{service.to_s.downcase}/facility/id/#{id}")
 
         begin
           body = response['results']['facility']

data/lib/fcc/station/parsers/extended_info.rb

@@ -12,7 +12,7 @@ module FCC
             fields = row.split('|').slice(1...-1).collect(&:strip).map { |v| v == '-' ? "" : v }
 
             attrs[:call_sign]                = fields[0]
-            attrs[:frequency]                = parse_frequency(fields[1])
+            attrs[:frequency]                = parse_frequency(fields[1]) rescue nil
             attrs[:band]                     = fields[2]
             attrs[:channel]                  = fields[3]
             attrs[:antenna_type]             = fields[4] # Directional Antenna (DA) or NonDirectional (ND)
@@ -24,13 +24,13 @@ module FCC
             attrs[:state]                    = fields[10]
             attrs[:country]                  = fields[11]
             attrs[:file_number]              = fields[12]  #File Number (Application, Construction Permit or License) or
-            attrs[:signal_strength]          = parse_signal_strength(fields[13]) # Effective Radiated Power --
-            attrs[:effective_radiated_power] = parse_signal_strength(fields[14]) # Effective Radiated Power -- vertically polarized (maximum)
+            attrs[:signal_strength]          = parse_signal_strength(fields[13]) rescue nil # Effective Radiated Power --
+            attrs[:effective_radiated_power] = parse_signal_strength(fields[14]) rescue nil # Effective Radiated Power -- vertically polarized (maximum)
             attrs[:haat_horizontal]          = fields[15] # Antenna Height Above Average Terrain (HAAT) -- horizontal polarization
             attrs[:haat_vertical]            = fields[16] # Antenna Height Above Average Terrain (HAAT) -- vertical polarization
             attrs[:fcc_id]                   = fields[17] # Facility ID Number (unique to each station)
-            attrs[:latitude]                 = parse_latitude(fields[18], fields[19], fields[20], fields[21])
-            attrs[:longitude]                = parse_longitude(fields[22], fields[23], fields[24], fields[25])
+            attrs[:latitude]                 = parse_latitude(fields[18], fields[19], fields[20], fields[21]) rescue nil
+            attrs[:longitude]                = parse_longitude(fields[22], fields[23], fields[24], fields[25]) rescue nil
             attrs[:licensed_to]              = fields[26] # Licensee or Permittee
 
             results << attrs
@@ -52,7 +52,7 @@ module FCC
         end
 
         def parse_signal_strength(power_string)
-          return unless power_string.present?
+          return unless power_string
 
           number, unit = power_string.strip.scan(/^([0-9.]+)\s+(\w+)$?/).flatten
           multiplier   = case unit&.downcase

data/lib/fcc/station/record_delegate.rb

@@ -98,7 +98,7 @@ module FCC
       end
 
       def inspect
-        "<RecordDelegate:[#{band}] #{frequency} #{call_sign} — #{community.city} #{community.state} />"
+        "<RecordDelegate:[#{band}] #{frequency} #{call_sign} — #{community&.city} #{community&.state} />"
       end
 
       private

data/lib/fcc/station/result.rb

@@ -76,7 +76,8 @@ module FCC
           records.keys.map do |call|
             RecordDelegate.new(ExtendedInfo.new(@service).find(call))
           end.select { |f| f.status.upcase == "LIC" }
-        rescue
+        rescue Exception => e
+          FCC.log "Error: #{e.message}"
           []
         end
       end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FCC
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcc
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Jeff Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport