news_reader_cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 880b95a69ff20a7a2ae3931a34ffc7f894939626533875bf43c9cedbc4030539
-  data.tar.gz: 560ab6f114804d3ea56aa51e40a159e9db1e2bfc3e9cf4f8f60ad7ebd690b796
+  metadata.gz: 1ed81ae14dd7eea58d2bf48038ed725445805b665c912220b979a4178c5596c9
+  data.tar.gz: 00c22455934a4258b613511cbbd36032fc2edb2c2e5eb350fd37a31c8db53467
 SHA512:
-  metadata.gz: aee2bce849d2059642ec85046b95a316c53c784dc33b94fdf5757675e871defae4524da2619ca435fca7d431fe73d40955b06eca4eb5df4bbb4dc2625ad246b2
-  data.tar.gz: 59f564d2d0b33b548491b74b675271dc06e7dbf284a5e292509c9d9f8284b5b859ed5fa743f30340ffa8e0d65009d833e192f137b458fa946b9c6c9182e94e05
+  metadata.gz: 0f1a7d0f461b6910ebebd551e78f302022127462c4e6e6e07332bf5a1e00d9bf7783d46ffaf5bbe571aabe4cf05047c5b652dd6cc6d61b503ee32751def63f68
+  data.tar.gz: 2e42c7d7c11bf0c418ae7da8cc052dc465fde97e96bd464dd8c457e1b621b393a6a7846bcfbf5e8e9de6d4f49b3d2e289d5f05526cc487ead6b990667c6aeaef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    news_reader_cli (0.1.2)
+    news_reader_cli (0.2.0)
       dotenv
 
 GEM

data/README.md

@@ -2,7 +2,7 @@
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/news_reader_cli`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-This Ruby Gem provides a CLI to view 36 live breaking headlines and contents from a variety of top US major publishers.
+This Ruby Gem provides a command Line interface to view live breaking headlines and contents from a variety of top US major publishers.
 
 ## Installation
 
@@ -39,7 +39,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/news_reader_cli. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hankeliu2015/news_reader_cli. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -47,4 +47,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the NewsReaderCli project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/news_reader_cli/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the NewsReaderCli project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hankeliu2015/news_reader_cli/blob/master/CODE_OF_CONDUCT.md).

data/bin/news_reader_cli

@@ -1,11 +1,4 @@
-#!/usr/bin/env ruby
+#!/ usr/bin/env ruby
 require_relative "../lib/news_reader_cli"
-
-# myapikey = open(File.expand_path(".newsapi.rb", "~/Development/m1/news_reader_cli")).read.strip
-# binding.pry
-
-# NewsReaderCli::ApiKeyValidate.new.key_validate
-
-# binding.pry
-# Dotenv.load # defaul will looking for ('.env')
-NewsReaderCli::CLI.new.start
+cli = NewsReaderCli::CLI.new
+cli.start

data/lib/news_reader_cli.rb

@@ -5,12 +5,8 @@ require_relative "./news_reader_cli/version" #require "news_reader_cli/version"
 require_relative "./news_reader_cli/cli"
 require_relative "./news_reader_cli/api_service"
 require_relative "./news_reader_cli/article"
-require_relative "./news_reader_cli/api_key_input_validate"
 require_relative "./news_reader_cli/api_key_validate"
 
-# Bundler.require(*Rails.groups)
-# Dotenv::Railtie.load
-# HOSTNAME = ENV['HOSTNAME']
 
 module NewsReaderCli
   # Your code goes here...

data/lib/news_reader_cli/api_key_validate.rb

@@ -1,39 +1,24 @@
 class NewsReaderCli::ApiKeyValidate
   def key_validate
-    # verify if the file .env exist.
-    # File.expand_path if return true, the file exist. if not, File.new create a file.
-    # if not create one. Let user input the key.
-    # if .env exists, load the file.
+
     if !File.exist?(".env")
-      key_file = File.new(".env", "w+")
       puts "please type in API Key from API News:"
-
-      # a condition verify key value is AES 128 Hex string 32 chars
-
       key = gets.chomp.strip
-      #
-      # while !key.match(/([0-9]|\w){32}/)  do
-      #
-      #   break if key == "exit"
-      #   # need to get out of the loop and remove the file .env
-      #
-      #   puts <<-HEREDOC
-      #
-      #   Your API keys value shows invalid.
-      #   Please check verify your API Key and type in again.
-      #
-      #   HEREDOC
-      #
-      #   key = gets.chomp.strip
-      # end
 
+      url = 'https://newsapi.org/v2/top-headlines?'\
+            'country=us&'\
+            "apiKey=#{key}&"\
+            'pageSize=100'
+      begin
+        req = open(url)
+      rescue
+        puts "You API Key is not valid, please try again."
+        return self.key_validate
+      end
 
-      #key = key_instance.validated_key
+      key_file = File.new(".env", "w+")
       key_file.puts("key = #{key}")
       key_file.close
-
-      #binding.pry
     end
-
   end
 end

data/lib/news_reader_cli/api_service.rb

@@ -2,20 +2,21 @@ class NewsReaderCli::ApiService
 
   def self.newsapi
     #url = "https://newsapi.org/v2/top-headlines?country=us&apiKey=(put key here)&pageSize=100"
+    Dotenv.load
     assigned_api_key = ENV['key'].strip
-    #binding.pry
+
     url = 'https://newsapi.org/v2/top-headlines?'\
           'country=us&'\
           "apiKey=#{assigned_api_key}&"\
           'pageSize=100'
     req = open(url)
+
     response_body = req.read
     json = JSON.parse(response_body)
 
     json["articles"].each do |article|
       NewsReaderCli::Article.new(article)
     end
-    #binding.pry
 
   end
 

data/lib/news_reader_cli/article.rb

@@ -1,16 +1,13 @@
 class NewsReaderCli::Article
 
   attr_accessor :source, :author, :title, :description, :url, :urltoimage, :publishedAt, :content
-
   @@all = []
 
   def initialize(article_hash)
-
     article_hash.each do |method, article_data|
       self.send("#{method}=", article_data) if self.respond_to?("#{method}=")
     end
     @@all << self
-
   end
 
   def self.all
@@ -19,44 +16,22 @@ class NewsReaderCli::Article
 
   #list all the articlels titles (in alphabat )
   def self.list_all_titles
-    self.all.each.with_index(1) do |article, index|
-      puts "#{index}. #{article.title}"
+    self.all.collect.with_index(1) do |article, index|
+      "#{index}. #{article.title}"
     end
   end
 
   #find the article instance by article index number
   def self.find_article_by_article_index(number)
-    self.all.find.with_index(1) do |article, index|
-      index == number
-    end
-  end
+    self.all[number - 1]
 
-  # pick an article to show the content
-  # def self.find_content_by_article_index(number)
-  #   self.all.find.with_index(1) do |article, index|
-  #     index == number
-  #     #binding.pry
-  #   end.content
-  # end
+  end
 
-  # find an article's URL
+  # find an article's URL by using iterations
   def self.find_url_by_article_index(number)
     self.all.find.with_index(1) do |article, index|
       index == number
     end.url
   end
 
-  # def self.find_source_name_by_article_index(number)
-  #   self.all.find.with_index(1) do |article, index|
-  #     index == number
-  #   end.source["name"]
-  # end
-
-  # def self.find_pub_date_by_article_index(number)
-  #   self.all.find.with_index(1) do |article, index|
-  #      index == number
-  #   end.publishedAt
-  # end
-
-
 end #end of class

data/lib/news_reader_cli/cli.rb

@@ -2,57 +2,22 @@
 class NewsReaderCli::CLI
 
   def start
-
-
-    # key_instance = NewsReaderCli::ApiKeyInputValidate.new
-    # key_instance.key_input_validate
-
     NewsReaderCli::ApiKeyValidate.new.key_validate
-    Dotenv.load
-    #
-    # if !File.exist?(".env")
-      # key_file = File.new(".env", "w+")
-      # key = key_instance.validated_key
-      # key_file.puts("key = #{key}")
-      # key_file.close
-
-    # end
-
-    #compare input key with env variable
-    #if they are equal, keep going. if not change the value.
-
-    # if key_instance.validated_key != ENV['key']#.strip
-    #   key = key_instance.validated_key
-    #   key_file.puts("key = #{key}")
-    #   key_file.close
-    #
-    # end
-
-    # assigned_api_key = ENV['key'].strip
-    #
-    # if assigned_api_key == 'exit'
-    #   puts "Goodbye"
-    #   return
-    # end
-
     NewsReaderCli::ApiService.newsapi
     puts "Welcome to the News Reader CLI!!!"
     menu
     goodbye
-
   end
 
   def menu
-
     help_menu
-
     input = ""
 
     while input != "exit" do
       input = gets.chomp.strip
 
       if input == "list"
-        NewsReaderCli::Article.list_all_titles
+        puts NewsReaderCli::Article.list_all_titles
 
       elsif input.slice(0) == "a" && (1..(NewsReaderCli::Article.all.length)).include?(input.gsub(/[a]/, '').to_i)
         found_article_instance = NewsReaderCli::Article.find_article_by_article_index(input.gsub(/[a]/, '').to_i)
@@ -64,6 +29,14 @@ class NewsReaderCli::CLI
         puts "Published Date: #{found_article_instance.publishedAt}"
         puts "Publisher: #{found_article_instance.source["name"]}"
         puts "Article URL: #{found_article_instance.url}"
+        puts "To open article's URL, type 'y'. Any key return to user menu}"
+
+        input_for_url = gets.chomp.strip
+        if input_for_url == "y"
+          found_url = NewsReaderCli::Article.find_url_by_article_index(input.gsub(/[a]/, '').to_i) #[a] instead of [u]
+          puts "Please check your browser, your article is opening now."
+          system("open", "#{found_url}")
+        end
 
       elsif input.slice(0) == "u" && (1..(NewsReaderCli::Article.all.length)).include?(input.gsub(/[u]/, '').to_i)
         found_url = NewsReaderCli::Article.find_url_by_article_index(input.gsub(/[u]/, '').to_i)
@@ -72,20 +45,12 @@ class NewsReaderCli::CLI
         system("open", "#{found_url}")
 
       elsif input == "exit"
-        #not output here. need to end the inner loop.
+
       else
         puts "Sorry! input is not valid. Please follow instructions."
       end
 
       self.help_menu
-
-    # puts <<-HEREDOC
-    #
-    #   1. Please type 'list' for a list of today's news headlines.
-    #   2. To read an article, please type 'a' follow by index number.
-    #   3. To open an article url, please type 'u' follow by index number.
-    #   4. To Exit, type 'exit'.
-    #   HEREDOC
     end
   end
 
@@ -95,32 +60,15 @@ class NewsReaderCli::CLI
 
   def help_menu
     puts <<-HEREDOC
+
+
       1. Please type 'list' for a list of today's news headlines.
       2. To read an article, please type 'a' follow by index number.
+         For Example, to read article 1, type in a1.
       3. To open an article's url from publisher's website, please type 'u' follow by index number.
+         For example, to open url for article 1, type in u1.
       4. To Exit, type 'exit'.
       HEREDOC
   end
 
 end #end of class
-
-        # input2 = ""
-        # input2 = gets.chomp.strip
-        #
-        #   if  input2.slice!(0) == "a" && (1..(NewsReaderCli::Article.all.length)).include?(input2.to_i)
-        #     found_content = NewsReaderCli::Article.find_content_by_article_index(input2.to_i)
-        #     puts "#{found_content}"
-        #     puts "Please type in 'l' to get today's news headlines"
-        #     puts "To Exit, pease type 'exit'."
-        #
-        #   elsif input2.slice!(0) == "u" && (1..(NewsReaderCli::Article.all.length)).include?(input2.to_i)
-        #     found_url = NewsReaderCli::Article.find_url_by_article_index(input2.to_i)
-        #     puts "#{found_url}"
-        #     puts "Please type in 'l' to get today's news headlines"
-        #     puts "To Exit, pease type 'exit'."
-        #   elsif
-        #     puts "It is not a valid input article number, please follow instructions."
-        #   end
-      # else
-      #   puts "Please type 'l' today's news headlines."
-      #   puts "To Exit, type 'exit'."

data/lib/news_reader_cli/version.rb

@@ -1,3 +1,3 @@
 module NewsReaderCli
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: news_reader_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Henry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,6 @@ files:
 - bin/news_reader_cli
 - bin/setup
 - lib/news_reader_cli.rb
-- lib/news_reader_cli/api_key_input_validate.rb
 - lib/news_reader_cli/api_key_validate.rb
 - lib/news_reader_cli/api_service.rb
 - lib/news_reader_cli/article.rb

data/lib/news_reader_cli/api_key_input_validate.rb

@@ -1,30 +0,0 @@
-class NewsReaderCli::ApiKeyInputValidate
-
-  # def key_input_validate
-  #   puts "please type in API Key from API News:"
-  #
-  #   @key = gets.chomp.strip
-  #
-  #   while !@key.match(/([0-9]|\w){32}/)  do
-  #
-  #     break if @key == "exit"
-  #     # need to get out of the loop and remove the file .env
-  #
-  #     puts <<-HEREDOC
-  #
-  #     Your API keys value might missing digits or contain invalid Charactors.
-  #     Please verify your API Key and try again. Thanks!
-  #
-  #     HEREDOC
-  #
-  #     @key = gets.chomp.strip
-  #   end
-  #
-  # end #end of method
-  #
-  #
-  # def validated_key
-  #   @key
-  # end
-
-end #end of class