metonym 1.0.0 → 1.0.1

data/lib/metonym/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Metonym
-  VERSION = "1.0.0"
+  VERSION = '1.0.1'
 end

data/metonym.gemspec

@@ -1,41 +1,43 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "metonym/version"
+require 'metonym/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "metonym"
+  spec.name          = 'metonym'
   spec.version       = Metonym::VERSION
-  spec.authors       = ["Vic Carrasco"]
-  spec.email         = ["vic@viccarrasco.com"]
-  spec.summary       = "The unofficial Google News API gem"
-  spec.description   = "Query news from Google News' sources"
-  spec.homepage      = "https://github.com/viccarrasco/metonym"
-  spec.license       = "MIT"
+  spec.authors       = ['Vic Carrasco']
+  spec.email         = ['vic@viccarrasco.com']
+  spec.summary       = 'The unofficial Google News API gem'
+  spec.description   = 'Query news from Google News\' sources'
+  spec.homepage      = 'https://github.com/viccarrasco/metonym'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/viccarrasco/metonym"
-    spec.metadata["changelog_uri"] = "https://github.com/viccarrasco/metonym/blob/master/CHANGE_LOG.md"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['homepage_uri'] = spec.homepage
+    spec.metadata['source_code_uri'] = 'https://github.com/viccarrasco/metonym'
+    spec.metadata['changelog_uri'] = 'https://github.com/viccarrasco/metonym/blob/master/CHANGE_LOG.md'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metonym
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Vic Carrasco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,47 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Query news from Google News' sources
 email:
 - vic@viccarrasco.com
@@ -88,7 +102,15 @@ files:
 - lib/metonym.rb
 - lib/metonym/lib/gnews.rb
 - lib/metonym/lib/news_api.rb
-- lib/metonym/lib/validate.rb
+- lib/metonym/lib/presenters/base_response_presenter.rb
+- lib/metonym/lib/presenters/gnews_response_presenter.rb
+- lib/metonym/lib/presenters/news_api_response_presenter.rb
+- lib/metonym/lib/repositories/base_repository.rb
+- lib/metonym/lib/repositories/gnews_repository.rb
+- lib/metonym/lib/repositories/news_api_repository.rb
+- lib/metonym/lib/validators/base_validator.rb
+- lib/metonym/lib/validators/gnews_query_validator.rb
+- lib/metonym/lib/validators/news_api_query_validator.rb
 - lib/metonym/version.rb
 - metonym.gemspec
 homepage: https://github.com/viccarrasco/metonym
@@ -114,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: The unofficial Google News API gem

data/lib/metonym/lib/validate.rb

@@ -1,124 +0,0 @@
-module Validate
-    class Validator
-         def is_key_present?(args)
-            return !args.nil?
-        end
-
-        def is_language_valid?(args)
-            if args['lang'].nil?
-                true
-            else
-                return [
-                    'af','ak','sq','am','ar','hy','az','eu','be','bem','bn','bs','bh','br','bg','km','ca','chr','ny','zh-CN',
-                    'zh-TW','co','hr','cs','da','nl','en','eo','et','ee','fo','tl','fi','fr','fy','gl','ka','de','el','gn','gu',
-                    'ht','ha','haw','iw','hi','hu','is','ig','id','ia','ga','it','ja','jw','kn','kk','rw','rn','kg','ko','kri',
-                    'ku','ckb','ky','lo','la','lv','ln','lt','loz','lg','ach','mk','mg','ms','ml','mt','mi','mr','mfe','mo','mn',
-                    'sr-ME','ne','nso','no','nn','oc','or','om','ps','fa','pl','pt-BR','pt-PT','pa','qu','ro','rm','nyn','ru','gd',
-                    'sr','sh','st','tn','crs','sn','sd','si','sk','sl','so','es','sp-419','su','sw','sv','tg','ta','tt','te','th','ti',
-                    'to','lua','tum','tr','tk','tw','ug','uk','ur','uz','vi','cy','wo','xh','yi','yo','zu'
-                ].include?(args['lang'].downcase)
-            end
-        end
-
-        def is_format_valid?(args)
-            template = %w(json hash)
-            
-            if args.nil?
-                true
-            else
-                template.include?(args.downcase)
-            end
-        end
-    end
-
-    class GnewsValidator < Validator
-        COUNTRIES = [
-            'af','al','dz','as','ad','ao','ai','aq','ag','ar','am','aw','au','at','az','bs','bh','bd','bb','by',
-            'be','bz','bj','bm','bt','bo','ba','bw','bv','br','io','bn','bg','bf','bi','kh','cm','ca','cv','ky',
-            'cf','td','cl','cn','cx','cc','co','km','cg','cd','ck','cr','ci','hr','cu','cy','cz','dk','dj','dm',
-            'do','ec','eg','sv','gq','er','ee','et','fk','fo','fj','fi','fr','gf','pf','tf','ga','gm','ge','de',
-            'gh','gi','gr','gl','gd','gp','gu','gt','gn','gw','gy','ht','hm','va','hn','hk','hu','is','in','id',
-            'ir','iq','ie','il','it','jm','jp','jo','kz','ke','ki','kp','kr','kw','kg','la','lv','lb','ls','lr',
-            'ly','li','lt','lu','mo','mk','mg','mw','my','mv','ml','mt','mh','mq','mr','mu','yt','mx','fm','md',
-            'mc','mn','ms','ma','mz','mm','na','nr','np','nl','an','nc','nz','ni','ne','ng','nu','nf','mp','no',
-            'om','pk','pw','ps','pa','pg','py','pe','ph','pn','pl','pt','pr','qa','re','ro','ru','rw','sh','kn',
-            'lc','pm','vc','ws','sm','st','sa','sn','cs','sc','sl','sg','sk','si','sb','so','za','gs','sp','lk',
-            'sd','sr','sj','sz','se','ch','sy','tw','tj','tz','th','tl','tg','tk','to','tt','tn','tr','tm','tc',
-            'tv','ug','ua','ae','uk','us','um','uy','uz','vu','ve','vn','vg','vi','wf','eh','ye','zm','zw'
-        ]
-
-        def is_query_valid?(args)
-            template = %w(q max lang country mindate maxdate in)
-            return (args.keys - template).empty?
-        end
-
-        def is_country_valid?(args)
-            if args['country'].nil?
-                true
-            else
-                return COUNTRIES.include?(args['country'].downcase)
-            end
-        end
-
-        def is_date_valid?(args)
-            if (args['mindate'].nil? && args['maxdate'].nil?)
-                true
-            elsif (args['mindate'] && args['maxdate'])
-                return (args['mindate'].respond_to?(:strftime) && args['maxdate'].respond_to?(:strftime))
-            elsif (args['mindate'] && args['maxdate'].nil?)
-                return args['mindate'].respond_to?(:strftime)
-            elsif (args['mindate'].nil? && args['maxdate'])
-                return args['maxdate'].respond_to?(:strftime)
-            end
-        end
-    end
-
-    class NewsApiValidator < Validator
-        COUNTRIES   = %w(ar au at be br bg ca cn co cu cz eg fr de gr hk hu in id ie il it jp lv lt my mx ma nl nz ng no ph pl pt ro ru sa rs sg sk si za kr se ch tw th tr ae ua gb us ve)
-        CATEGORIES  = %w(business entertainment general health science sports technology)
-
-        def is_query_valid?(args, endpoint = 'top-headlines')
-            case endpoint
-            when 'top-headlines'
-                template = %w(q country category sources page_size page)
-            when 'everything'
-                template = %w(q sources domains excludeDomains from to language sortBy pageSize page)
-            when 'sources'
-                template = %w(category language country)
-            end
-
-            if (endpoint == 'top-headlines' && (args.include?('sources') && (args.include?('country') || args.include?('category'))))
-                false
-            elsif (endpoint == "sources") && (args.has_key?("category")) && (CATEGORIES.include?(args["category"]) == false)
-                false
-            else
-                (args.keys - template).empty?
-            end
-        end
-
-        def is_country_valid?(args)
-            if args['country'].nil?
-                true
-            else
-                return COUNTRIES.include?(args['country'].downcase)
-            end
-        end
-
-        def is_category_valid?(args)
-            template = %w(business entertainment general health science sports technology)
-            return template.include?(args['country'])
-        end
-
-        def is_date_valid?(args)
-            if (args['from'].nil? && args['to'].nil?)
-                true
-            elsif (args['from'] && args['to'])
-                return (args['from'].respond_to?(:strftime) && args['to'].respond_to?(:strftime))
-            elsif (args['from'] && args['to'].nil?)
-                return args['from'].respond_to?(:strftime)
-            elsif (args['from'].nil? && args['to'])
-                return args['from'].respond_to?(:strftime)
-            end
-        end
-    end
-end