flight_radar 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e4b67d1281595fae52f66bcb626a83ca03c0f85196c40a8b1bbc78a1a82f70
-  data.tar.gz: 549d2064c3403bbf3b7a1ba5e25d2538f580d5ca9ef30a7cb21f13854bef5854
+  metadata.gz: 51bece5148b583b098a6821b34c81bb4e8412023f20288133668e420872d4a02
+  data.tar.gz: cee75c30c0d41a9da385a0efeeeca33ba8c1c0aae7f30e075408a1e49581a40e
 SHA512:
-  metadata.gz: 4d479869316e510a58e74eb69050a63dfeb053add0c772f3594d7359297d8076bc8baee99d28c36883050324cdaa391d0465c42c07fd9c8858d7ae5f402f521a
-  data.tar.gz: 9db442b07f94145dc511e7ae2d217c0def2de32750b5377f07d88c449e14935328a593a5974c10d30a9e985d52bfa70850c289929dfe49959e7a3a28e0cf0bf4
+  metadata.gz: 701fe16b782798feda39119cc70149266a94922315c9784328e74d6e3254aac70dd8f795d20fb0320c93d0bbccd2652f2444cd29b486874b6b3652d121dcdf3b
+  data.tar.gz: 3478f53760cc3478b4c4645e66eacf7e45075f315a79b04b086a2ca575202fb53d203926e4bf5953fa450446dda3e631e7e6bcd8afd59ce7d6c50248d77f3a57

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby and install dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle install
+
+      - name: Run RSpec tests
+        run: bundle exec rake spec

data/.gitignore

@@ -10,4 +10,5 @@
 # rspec failure tracking
 .rspec_status
 
-.idea/
+.idea/
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.2.0] - 2023-12-20
+
+- Make the gem work again
+- Remove Gemfile.lock
+- Move dependencies to gemspec
+- Update dependencies
+- Add a simple CI
+
 ## [0.1.0] - 2022-01-31
 
 - Initial release

data/Gemfile

@@ -4,11 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in flight_radar.gemspec
 gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.7"
-
-gem "httparty"

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Jakub Polak
+Copyright (c) Jakub Polak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-#<img src="https://www.flightradar24.com/blog/wp-content/uploads/2020/04/Hi_Res_Transparent-2.jpg" width="200"/>
+<img src="https://www.flightradar24.com/blog/wp-content/uploads/2020/04/Hi_Res_Transparent-2.jpg" width="200"/>
 
 
 **Fetch aircraft data from Flightradar24.**
@@ -27,7 +27,7 @@ Or install it yourself as:
 FlightRadar.airlines
 ```
 **Sample response:**
-```json
+```ruby
 [
   {"Name"=>"21 Air", "Code"=>"2I", "ICAO"=>"CSB"},
   {"Name"=>"25Only Aviation", "Code"=>"", "ICAO"=>"ONY"},
@@ -73,7 +73,7 @@ airport = "LAX"
 FlightRadar.airports
 ```
 **Sample response:**
-```json
+```ruby
 [
    {
       "name""=>""A Coruna Airport",
@@ -102,7 +102,7 @@ FlightRadar.airports
 FlightRadar.zones
 ```
 **Sample response:**
-```json
+```ruby
 {
   "europe""=>"{
       "tl_y"=>72.57,
@@ -134,7 +134,7 @@ FlightRadar.flights
 ```
 
 **Sample response:**
-```json
+```ruby
 [
     "<(GRND)  - Altitude":"0 - Ground Speed":"146 - Heading":146>,
     "<(DRON) TEST4A - Altitude":"374 - Ground Speed":"1 - Heading":1>,
@@ -160,7 +160,7 @@ FlightRadar.flight_details(flight_id)
 ```
 
 **Sample response:**
-```json
+```ruby
 {
    "identification""=>"{
       "id""=>""2aaadc48",
@@ -200,7 +200,7 @@ FlightRadar.flights(airline: airline)
 ```
 
 **Sample response:**
-```json
+```ruby
 [
   "<(B789) SP-LSG - Altitude":"39992 - Ground Speed":"451 - Heading":451>,
   "<(B788) SP-LRA - Altitude":"38975 - Ground Speed":"537 - Heading":537>,
@@ -275,4 +275,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the FlightRadar project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/flight_radar/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the FlightRadar project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/kupolak/flight_radar/blob/main/CODE_OF_CONDUCT.md).

data/flight_radar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "flight_radar"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Jakub Polak"]
   spec.email         = ["jakub.polak.vz@gmail.com"]
 
@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 
-
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/kupolak/flight_radar"
   spec.metadata["changelog_uri"] = "https://github.com/kupolak/flight_radar/blob/main/CHANGELOG.md"
@@ -26,5 +25,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~> 0.17.3"
+  spec.add_dependency "httparty", "~> 0.21.0"
+
+  spec.add_development_dependency "rake", "~>13.1.0"
+  spec.add_development_dependency "rspec", "~>3.12.0"
+  spec.add_development_dependency "rubocop", "~>1.59.0"
 end

data/lib/flight_radar/core.rb

@@ -1,44 +1,59 @@
-module Core
-  CDN_FLIGHT_RADAR_BASE_URL = "https://cdn.flightradar24.com"
-  FLIGHT_RADAR_BASE_URL = "https://www.flightradar24.com"
-  DATA_LIVE_BASE_URL = "https://data-live.flightradar24.com"
-
-  # Flights data URLs.
-  REAL_TIME_FLIGHT_TRACKER_DATA_URL = "#{DATA_LIVE_BASE_URL}/zones/fcgi/feed.js"
-  FLIGHT_DATA_URL = "#{DATA_LIVE_BASE_URL}/clickhandler/?flight="
-
-  # Airports data URLs.
-  AIRPORT_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/airports/traffic-stats/?airport="
-  AIRPORTS_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/_json/airports.php"
-
-  # Airlines data URL.
-  AIRLINES_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/_json/airlines.php"
-
-  # Zones data URL.
-  ZONES_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/js/zones.js.php"
-
-  # Country flag image URL.
-  COUNTRY_FLAG_URL = "#{FLIGHT_RADAR_BASE_URL}/static/images/data/flags-small/"
-
-  # Airline logo image URL.
-  AIRLINE_LOGO_URL = "#{CDN_FLIGHT_RADAR_BASE_URL}/assets/airlines/logotypes/"
-  ALTERNATIVE_AIRLINE_LOGO_URL = "#{FLIGHT_RADAR_BASE_URL}/static/images/data/operators/"
-
-  HEADERS = {
-    "accept-encoding": "gzip, br",
-    "accept-language": "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7",
-    "cache-control": "max-age=0",
-    "origin": "https://www.flightradar24.com",
-    "referer": "https://www.flightradar24.com/",
-    "sec-fetch-dest": "empty",
-    "sec-fetch-mode": "cors",
-    "sec-fetch-site": "same-site",
-    "user-agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-  }
-
-  JSON_HEADERS = HEADERS
-  JSON_HEADERS["accept"] = "application/json"
-
-  IMAGE_HEADERS = HEADERS
-  IMAGE_HEADERS["accept"] = "image/gif, image/jpg, image/jpeg, image/png"
-end
+# frozen_string_literal: true
+
+module Core
+  API_FLIGHT_RADAR_BASE_URL = "https://api.flightradar24.com/common/v1"
+  CDN_FLIGHT_RADAR_BASE_URL = "https://cdn.flightradar24.com"
+  FLIGHT_RADAR_BASE_URL = "https://www.flightradar24.com"
+  DATA_LIVE_BASE_URL = "https://data-live.flightradar24.com"
+  DATA_CLOUD_BASE_URL = "https://data-cloud.flightradar24.com"
+
+  # User login URL.
+  USER_LOGIN_URL = "#{FLIGHT_RADAR_BASE_URL}/user/login"
+  USER_LOGOUT_URL = "#{FLIGHT_RADAR_BASE_URL}/user/logout"
+
+  # Most tracked data URL
+  MOST_TRACKED_URL = "#{FLIGHT_RADAR_BASE_URL}/flights/most-tracked"
+
+  # Search data URL
+  SEARCH_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/v1/search/web/find?query={}&limit=50"
+
+  # Flights data URLs.
+  REAL_TIME_FLIGHT_TRACKER_DATA_URL = "#{DATA_CLOUD_BASE_URL}/zones/fcgi/feed.js"
+  FLIGHT_DATA_URL = "#{DATA_LIVE_BASE_URL}/clickhandler/?flight={}"
+
+  # Airports data URLs.
+  API_AIRPORT_DATA_URL = "#{API_FLIGHT_RADAR_BASE_URL}/airport.json"
+  AIRPORT_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/airports/traffic-stats/?airport="
+  AIRPORTS_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/_json/airports.php"
+
+  # Airlines data URL.
+  AIRLINES_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/_json/airlines.php"
+
+  # Zones data URL.
+  ZONES_DATA_URL = "#{FLIGHT_RADAR_BASE_URL}/js/zones.js.php"
+
+  # Country flag image URL.
+  COUNTRY_FLAG_URL = "#{FLIGHT_RADAR_BASE_URL}/static/images/data/flags-small/"
+
+  # Airline logo image URL.
+  AIRLINE_LOGO_URL = "#{CDN_FLIGHT_RADAR_BASE_URL}/assets/airlines/logotypes/"
+  ALTERNATIVE_AIRLINE_LOGO_URL = "#{FLIGHT_RADAR_BASE_URL}/static/images/data/operators/"
+
+  HEADERS = {
+    "accept-encoding": "gzip, br",
+    "accept-language": "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7",
+    "cache-control": "max-age=0",
+    "origin": "#{FLIGHT_RADAR_BASE_URL}",
+    "referer": "#{FLIGHT_RADAR_BASE_URL}/",
+    "sec-fetch-dest": "empty",
+    "sec-fetch-mode": "cors",
+    "sec-fetch-site": "same-site",
+    "user-agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+  }
+
+  JSON_HEADERS = HEADERS
+  JSON_HEADERS["accept"] = "application/json"
+
+  IMAGE_HEADERS = HEADERS
+  IMAGE_HEADERS["accept"] = "image/gif, image/jpg, image/jpeg, image/png"
+end

data/lib/flight_radar.rb

@@ -6,7 +6,7 @@ require_relative "flight_radar/flight"
 
 # FlightRadar module for sending requests to FlightRadar24 API
 module FlightRadar
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 
   module_function
 
@@ -22,7 +22,8 @@ module FlightRadar
     "estimated": "1",
     "maxage": "14400",
     "gliders": "1",
-    "stats": "1"
+    "stats": "1",
+    "limit": "5000"
   }
 
   def airlines

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_radar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jakub Polak
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,14 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.59.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.59.0
 description: 'To use this API see more information at: https://www.flightradar24.com/terms-and-conditions'
 email:
 - jakub.polak.vz@gmail.com
@@ -31,13 +73,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -53,7 +95,7 @@ metadata:
   homepage_uri: https://github.com/kupolak/flight_radar
   source_code_uri: https://github.com/kupolak/flight_radar
   changelog_uri: https://github.com/kupolak/flight_radar/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
-signing_key: 
+rubygems_version: 3.4.16
+signing_key:
 specification_version: 4
 summary: Ruby gem for fetching aircraft data from Flightradar24
 test_files: []

data/Gemfile.lock

@@ -1,64 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flight_radar (0.1.0)
-      httparty (~> 0.17.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    diff-lcs (1.4.4)
-    httparty (0.17.3)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    multi_xml (0.6.0)
-    parallel (1.20.1)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.9.1)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  flight_radar!
-  httparty
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.7)
-
-BUNDLED WITH
-   2.2.24