news_aggregator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ae6c5548c27b7085a2da7d4d7a03a947f5d7672cab59835d67c347f06e778a
-  data.tar.gz: e8eabadd12de56319dffb50e58371566d9ceae1797d68c8119cc983920db7922
+  metadata.gz: c43118ae179764003c7b4c034bb1d028f3a79597c3ced860968f02694dd35b24
+  data.tar.gz: eba9c891cba9043606f8f7e1314f7dd9f54ae68a79a465e4d14bb6278582b6ac
 SHA512:
-  metadata.gz: 228e68c92becb26d8b04cd51c9f962d024117fdebbf9999f3974a8b6e486a5405eead7060dabea5b4a5c09562257c1b45a721b5efcca2a6eb4490f6c30a7dba1
-  data.tar.gz: 5ef7536c062d1cd0f035c60f534267746395472b9e8287a9da57b155c83800a5955d8083540b04a489fb782824cd131ddaccda6f17a9d30eeadf199413a43c51
+  metadata.gz: fe6c2127517f0df1f1a96f361b7cbdc6085c112ef655ebf688f4297e93e1d5015be477be4937402b7fe399879c71db4b83a9621ff86e1d5c05224befae214ba3
+  data.tar.gz: ae7da07934324c97f90fa4e7c882af988396914024421ecba016593d1de67f57c1642a9a4708db4347ff7ea19c72a6e119072ebd16e9ee1ca2ae792154f4d15b

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/news_aggregator.svg)](https://badge.fury.io/rb/news_aggregator)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-community-brightgreen.svg)](https://rubystyle.guide)
 [![Ruby on Rails CI](https://github.com/enowmbi/news_aggregator_ruby/actions/workflows/ruby.yml/badge.svg)](https://github.com/enowmbi/news_aggregator_ruby/actions/workflows/ruby.yml)

data/lib/news_aggregator/news.rb

@@ -2,10 +2,15 @@
 
 require "faraday"
 require "faraday_middleware"
+
+# NewsAggregator
 module NewsAggregator
   # Locate articles and breaking news headlines from news sources and blogs across the web with newsapi.org
   class News
     BASE_URL = "https://newsapi.org/v2"
+
+    END_POINTS = %w[top-headlines everything sources].freeze
+
     attr_reader :api_key, :adapter
 
     def initialize(api_key:, adapter: Faraday.default_adapter)
@@ -22,69 +27,31 @@ module NewsAggregator
       end
     end
 
-    def top_headlines(**args)
-      endpoint = "top-headlines"
-      _get_everything(endpoint, **args)
-    end
+    def make_request(endpoint, **query_params)
+      response = connection.get(endpoint, query_params, { authorization: "bearer #{api_key}" })
 
-    def everything(**args)
-      endpoint = "everything"
-      _get_everything(endpoint, **args)
-    end
+      return response.body if response.status == 200
 
-    def sources(**args)
-      endpoint = "sources"
-      request = _make_request(endpoint, **args)
-      # status = request["status"]
-      sources = request["sources"]
-      data = []
-      sources.each do |v|
-        data.push(
-          Source.new(
-            v["id"], v["name"], v["description"],
-            v["url"], v["category"], v["language"],
-            v["country"]
-          )
-        )
-      end
-      data
+      raise_exception(response)
     end
 
-    private
-
-    def _make_request(endpoint, **query_params)
-      response = connection.get(endpoint, query_params, { authorization: "bearer #{api_key}" })
-      case response.status
-      when "200"
-        return response.body
-      when "401"
-        raise UnauthorizedException, response.body
-      when "400"
-        raise BadRequestException, response.body
-      when "429" || "426"
-        raise TooManyRequestsException, response.body
-      when "500"
-        raise ServerException, response.body
+    END_POINTS.each do |end_point|
+      define_method(end_point.tr("/-", "_").to_sym) do |**args|
+        make_request(end_point, **args)
       end
-      response.body
     end
+  end
 
-    def _get_everything(endpoint, **args)
-      request = _make_request(endpoint, **args)
-      # status = request['status']
-      # totalResults = request['totalResults']
-      articles = request["articles"]
-      data = []
-      articles.each do |a|
-        data.push(
-          Everything.new(
-            a["source"], a["author"], a["title"],
-            a["description"], a["content"], a["url"],
-            a["urlToImage"], a["publishedAt"]
-          )
-        )
-      end
-      data
+  private
+
+  def raise_exception(response)
+    case response.status
+    when "400" then raise BadRequestException, response.body
+    when "401" then raise UnauthorizedException, response.body
+    when "402" then raise PaymentRequiredException, response.body
+    when "403" then raise ForbiddenException, response.body
+    when "429" then raise TooManyRequestsException, response.body
+    when "500" then raise ServerException, response.body
     end
   end
 end

data/lib/news_aggregator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NewsAggregator
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/news_aggregator.rb

@@ -7,6 +7,4 @@ module NewsAggregator
   autoload(:BadRequestException, "news_aggregator/exceptions")
   autoload(:TooManyRequestsException, "news_aggregator/exceptions")
   autoload(:ServerException, "news_aggregator/exceptions")
-  autoload(:Source, "news_aggregator/source")
-  autoload(:Everything, "news_aggregator/everything")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: news_aggregator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Enow Mbi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -64,17 +64,13 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/news_aggregator.rb
-- lib/news_aggregator/everything.rb
 - lib/news_aggregator/exceptions.rb
 - lib/news_aggregator/news.rb
-- lib/news_aggregator/source.rb
 - lib/news_aggregator/version.rb
-- news_aggregator-0.1.0.gem
 - sig/news_aggregator.rbs
 homepage: https://github.com/enowmbi/news_aggregator_ruby
 licenses:

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    news_aggregator (0.1.0)
-      faraday (~> 1.10.2)
-      faraday_middleware (~> 1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    coderay (1.1.3)
-    diff-lcs (1.5.0)
-    faraday (1.10.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    json (2.6.2)
-    method_source (1.0.0)
-    multipart-post (2.2.3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    unicode-display_width (2.3.0)
-
-PLATFORMS
-  x86_64-darwin-19
-
-DEPENDENCIES
-  news_aggregator!
-  pry
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
-
-BUNDLED WITH
-   2.3.14

data/lib/news_aggregator/everything.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module NewsAggregator
-  # /v2/everything
-  class Everything
-    attr_accessor :id, :name, :author, :title, :description, :url, :url_to_image, :published_at, :content
-
-    def initialize(source, author, title, description, url, url_to_image, published_at, content)
-      @id = source["id"]
-      @name = source["name"]
-      @author = author
-      @title = title
-      @description = description
-      @url = url
-      @url_to_image = url_to_image
-      @published_at = published_at
-      @content = content
-    end
-  end
-end

data/lib/news_aggregator/source.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module NewsAggregator
-  # source class
-  class Source
-    attr_accessor :id, :name, :description, :url, :category, :language, :country
-
-    def initialize(id, name, description, url, category, language, country)
-      @id = id
-      @name = name
-      @description = description
-      @url = url
-      @category = category
-      @language = language
-      @country = country
-    end
-  end
-end