ale_air 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 236de19ba776e22ce1ba00b8ec550acaaee3e6af
-  data.tar.gz: 0459e6112e4a416cc0a7371b09dd9047888469c2
+SHA256:
+  metadata.gz: f60580661ac1dae4b860d496130df098215ec3514a14aba785ccb12b651da6ea
+  data.tar.gz: cc5816589710c9d61e224099776f42b0485797d0f2774ad67c694385becc6eff
 SHA512:
-  metadata.gz: a6131fce0250abc79903196bb33e837d03333eb130c60ce8aec8c191e57d1f6a2ae6b9f0d1c210fbd1b30f67385c54e179af4c5fb2541240f4bd9194460deb61
-  data.tar.gz: 7c650bae6f188da1e1714e2835dab8ad6b0773a7448fae5e3e153f9ac8bd622a019b2d9999ab4f5983167444bfb806fde6d47123fa4126c6c0737b53202723a9
+  metadata.gz: 05c6364bdb707eff52e160a633f713e020140d7d81eb59fb2d3bd65ce6e1f9f0924d046f0c0b51958d47af3b88448065c685e4f25e3e47c8e927099749d82f62
+  data.tar.gz: ece5caf157b032b0b4ac6585cbd28921cade0e72d39eb5e70b2197483009875e40a1117b4011a44331e5b393699b98343802f80603a57f54c45790d47eedf888

data/.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    registries: "*"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "20:00"

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 *.swp
 mkmf.log
 config/key.yml
+.idea/

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in testGem.gemspec
 gemspec
+
+gem 'rubocop'

data/README.md

@@ -33,13 +33,13 @@ Now you can get the air quality where you wish. This will return true if succesf
 
 Then you can just use the results
 
-    air_results.status        -- will return "ok" or "error"
-    air_results.message       -- what kind of error occured
-    air_results.location      -- the measurement station location
-    air_results.quality       -- Air Quality Index scale as defined by the US-EPA 2016
-    air_results.time_measured -- time of measurement
-    air_results.danger_level  -- level
-    air_results.irc_string    -- Ready string with all the info for IRC for example
+    air_results.status              -- will return "ok" or "error"
+    air_results.message             -- what kind of error occured
+    air_results.location            -- the measurement station location
+    air_results.quality             -- Air Quality Index scale as defined by the US-EPA 2016
+    air_results.time_measured       -- time of measurement
+    air_results.danger_level        -- level
+    air_results.descriptive_text    -- Ready string with all the info for IRC for example
 ## Development
 
 Install on locally and start developing. 

data/ale_air.gemspec

@@ -6,6 +6,7 @@ require 'ale_air/version'
 Gem::Specification.new do |s|
   s.name        = 'ale_air'
   s.version     = AleAir::VERSION
+  s.required_ruby_version = '>= 3.2.2'
   s.summary     = "Air Quality of Major Cities"
   s.description = "Easy to use air quality of major cities. Everything has been parsed for you and ready to use."
   s.authors     = ["FistOfTheNorthStar"]

data/lib/ale_air/fetch_json.rb

@@ -1,88 +1,95 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'rest-client'
 
 module AleAir
+  # Fetches JSON from Waqi API
   class FetchJSON
     attr_writer :secret_token
-    attr_reader :status, :message, :time_measured, :location, :quality, :danger_level, :irc_string
+    attr_reader :status, :message, :time_measured, :location, :quality, :danger_level, :descriptive_text
 
-    def initialize(token = '')
-      @secret_token = token
+    def initialize(secret_token = '')
+      @secret_token = secret_token
     end
 
-    def air_quality(city = nil)
-      unless @secret_token.nil?
-        document = JSON.parse(RestClient.get 'https://api.waqi.info/search/?keyword=' + cleaned(city) + '&token=' + @secret_token)
-        get_info(document)
-      end 
+    def air_quality(city = '')
+      return if @secret_token.nil?
+
+      response = RestClient.get("https://api.waqi.info/search/?keyword=#{cleaned(city)}&token=#{@secret_token}")
+      document = JSON.parse(response.body)
+
+      get_info(document)
+    rescue RestClient::ExceptionWithResponse => e
+      @message = e.response&.body || 'Unknown Error'
+      false
     end
 
     private
-    def cleaned(chars = "")
-      URI.encode(chars.downcase.strip)
+
+    def cleaned(chars = '')
+      CGI.escape(chars.downcase.strip)
     end
 
-    def get_info(document = nil)
-      @status = "error"
-      unless document.nil?
-        if document["status"] == "ok"
-	  if document["data"].length > 0
-            document["data"].each do |air|
-	      if !air["aqi"].nil? || !air["aqi"].empty?
-		unless is_int(air["aqi"])
-	          @message = "Invalid Airquality Value"
-		  return false
-	        end	  
-		@status = "ok"
-		@message = "Air Quality"
-		@quality = air["aqi"]
-		@time_measured = air["time"]["stime"] + ' ' + air["time"]["tz"]
-		@location = air["station"]["name"]
-		@danger_level = danger_lev(air["aqi"].to_i)
-		@irc_string = "Air quality: " + air["aqi"] + " AQI " + danger_lev(air["aqi"].to_i) + " @ " + air["station"]["name"] + " " + @time_measured 
-	        return true
-	      else
-		@message = "No Data Available"
-              end
-            end
-	  else
-	    @message = "No Stations Found"
-	  end
-	else
-	  if !document["data"].nil?
-	    @message = document["data"]
-	  else
-            @message = "Unknown Error"
-	    @message = document
-          end
-	end	  
+    def get_info(document)
+      if document['status'] == 'ok' && document['data'].any?
+        air = document['data'].first
+        aqi = air['aqi']
+
+        return false unless check_aqi(aqi)
+
+        information_message(aqi, air)
+      else
+        no_data_available_message(document)
       end
+    end
+
+    def check_aqi(aqi)
+      return true if integer?(aqi)
+
+      @status = 'error'
+      @message = 'Invalid Air Quality Value'
       false
     end
 
-    def danger_lev(aqi=0)
-      case aqi
-      when 0..50
-        "Good"
-      when 51..100
-        "Moderate"
-      when 101..150
-        "Unhealthy for Sensitive Groups"
-      when 151..200
-	"Unhealthy"
-      when 201..300
-        "Very Unhealthy"
-      else
-	"Hazardous"
-      end
+    def information_message(aqi, air)
+      @status = 'ok'
+      @message = 'Air Quality'
+      @quality = aqi
+      @time_measured = "#{air.dig('time', 'stime')} #{air.dig('time', 'tz')}"
+      @location = air.dig('station', 'name')
+      @danger_level = danger_lev(aqi)
+      @descriptive_text = "Air quality: #{aqi} AQI #{danger_lev(aqi)} @ #{air.dig('station',
+                                                                                  'name')} #{@time_measured}"
+      true
     end
 
-    def is_int(string)
-      Integer(string).is_a?(Integer)
-    rescue ArgumentError, TypeError
+    def no_data_available_message(document)
+      @status = 'error'
+      @message = case document['data']
+                 when String then document['data']
+                 else 'No Data Available'
+                 end
       false
     end
 
+    def danger_lev(aqi)
+      case aqi.to_i
+      when 0..50 then 'Good'
+      when 51..100 then 'Moderate'
+      when 101..150 then 'Unhealthy for Sensitive Groups'
+      when 151..200 then 'Unhealthy'
+      when 201..300 then 'Very Unhealthy'
+      else 'Hazardous'
+      end
+    end
+
+    def integer?(aqi)
+      Integer(aqi)
+    rescue ArgumentError
+      false
+    else
+      true
+    end
   end
 end
-

data/lib/ale_air/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AleAir
-  VERSION = "0.0.8"
+  VERSION = '0.1.0'
 end

data/lib/ale_air.rb

@@ -1,5 +1,8 @@
-require "ale_air/version"
+# frozen_string_literal: true
+
+require 'ale_air/version'
 require 'ale_air/fetch_json'
 
+# Air quality of major cities
 module AleAir
 end

data/spec/fetch_json_spec.rb

@@ -1,16 +1,14 @@
-require 'spec_helper'
-require 'json'
-require 'rest-client'
+# frozen_string_literal: true
+
 require 'yaml'
 
 describe 'FetchJSON' do
-  
   describe '#danger_lev' do
-    
-    it "returns danger level of air string according to aqi" do
-      fetch_json = AleAir::FetchJSON.new
-      levels = [0,51,101,151,201,301]
-      danger_array = ["Good", "Moderate", "Unhealthy for Sensitive Groups", "Unhealthy", "Very Unhealthy", "Hazardous"]
+    let(:fetch_json) { AleAir::FetchJSON.new }
+
+    it 'returns danger level of air according to aqi' do
+      levels = [0, 51, 101, 151, 201, 301]
+      danger_array = ['Good', 'Moderate', 'Unhealthy for Sensitive Groups', 'Unhealthy', 'Very Unhealthy', 'Hazardous']
       danger_array_append = []
       levels.each do |level|
         danger_array_append << fetch_json.send(:danger_lev, level)
@@ -19,56 +17,50 @@ describe 'FetchJSON' do
     end
   end
 
-  describe '#is_int' do
+  describe '#integer?' do
     fetch_json = AleAir::FetchJSON.new
-    it "returns false on a string without value to convert" do
-      temp_val = "this is just a string"
-      expect(fetch_json.send(:is_int, temp_val)).to be false
+    it 'returns false on a string without value to convert' do
+      temp_val = 'this is just a string'
+      expect(fetch_json.send(:integer?, temp_val)).to be false
     end
 
-    it "returns int from a string" do
-      expect(fetch_json.send(:is_int, "100")).to be true
+    it 'returns int from a string' do
+      expect(fetch_json.send(:integer?, '100')).to be true
     end
   end
 
-  describe "#get_info" do
+  describe '#get_info' do
+    before(:example) do
+      @fetch_json = AleAir::FetchJSON.new
+    end
 
     it 'send correctly formatted hash with status ok' do
-      hash_correct = {"status" => "ok", "message" => "all good test", "data" => [{"aqi" => "100", "time" => {"stime" => "19:00", "tz" => "+2"}, "station" => {"name" => "test place"}}]}
-      correct_array = ["ok", "Air Quality", "Moderate", "100", "19:00 +2", "test place", "Air quality: 100 AQI Moderate @ test place 19:00 +2"]
-      fetch_json = AleAir::FetchJSON.new
-      got_back = fetch_json.send(:get_info, hash_correct)
-      back_array = []
-      back_array << fetch_json.status
-      back_array << fetch_json.message
-      back_array << fetch_json.quality
-      back_array << fetch_json.location
-      back_array << fetch_json.danger_level
-      back_array << fetch_json.time_measured
-      back_array << fetch_json.irc_string
-      expect(got_back).to be true
+      hash_correct = { 'status' => 'ok', 'message' => 'all good test',
+                       'data' => [{ 'aqi' => '100', 'time' => { 'stime' => '19:00', 'tz' => '+2' },
+                                    'station' => { 'name' => 'test place' } }] }
+      correct_array = ['100', '19:00 +2', 'Air Quality', 'Air quality: 100 AQI Moderate @ test place 19:00 +2',
+                       'Moderate', 'ok', 'test place']
+      response = @fetch_json.send(:get_info, hash_correct)
+      back_array = [@fetch_json.status, @fetch_json.message, @fetch_json.quality, @fetch_json.location,
+                    @fetch_json.danger_level, @fetch_json.time_measured, @fetch_json.descriptive_text]
+      expect(response).to be true
       expect(correct_array).to match_array(back_array)
     end
 
     it 'send nil hash should receive false' do
-      hash_correct = nil
-      fetch_json = AleAir::FetchJSON.new
-      expect(fetch_json.send(:get_info, hash_correct)).to be false
-
+      hash_correct = ''
+      expect(@fetch_json.send(:get_info, hash_correct)).to be false
     end
 
     it 'send error receive false' do
-      hash_correct = {"status" => "error"}
-      fetch_json = AleAir::FetchJSON.new
-      expect(fetch_json.send(:get_info, hash_correct)).to be false
+      hash_correct = { 'status' => 'error' }
+      expect(@fetch_json.send(:get_info, hash_correct)).to be false
     end
-
   end
 
-  describe "#air_quality" do
-
+  describe '#air_quality' do
     it 'returns false with nil key with correct city' do
-      fetch_json = AleAir::FetchJSON.new    
+      fetch_json = AleAir::FetchJSON.new
       expect(fetch_json.air_quality('Helsinki')).to be false
       sleep(5)
     end
@@ -92,8 +84,8 @@ describe 'FetchJSON' do
   end
 
   protected
+
   def api_key
-    @config = YAML.load_file("./config/key.yml")
+    @config = YAML.load_file('./config/key.yml')
   end
-
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir['./lib/**/*.rb'].each { |file| require file }
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -45,57 +47,55 @@ RSpec.configure do |config|
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = "doc"
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ale_air
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - FistOfTheNorthStar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -74,6 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -99,15 +100,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Air Quality of Major Cities