cdc_notices 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18d5f653af44d06dca9e02699fba5d2ac77181b6
-  data.tar.gz: 5cfd133bcd4167f3d85a67b45e9efb34b3bdb841
+  metadata.gz: 67ec9bd9fe5e76a9dc45ee684e9fef41f39d42ac
+  data.tar.gz: a7aea7afecc2914adcc77216b8ef626db240adff
 SHA512:
-  metadata.gz: 643d1a491b4c6a1db36ceab58e3ee7b583c10ed26e9e2038acc7918e760329d7b7eb563e0a466337a6ead93b43220534d5344dc49a50ca0e0df3789cbf157763
-  data.tar.gz: 58f03c4c7ce33c4df74115ddd34515dc45c38e37666a41483221bf8aa106d63aae9b616b7898f5a1b2c9ddf42f52ec73b85cd801aeb727987c45324ab299dec1
+  metadata.gz: 57a06b363b3aa5e79bcd0f1db3ee2883ec3d0542581b268ff0bcbe5720b5a45c3db92d81c1748016e49a77125dbbf556f5bea7f4c624608a1aa858c368e0ff97
+  data.tar.gz: 72b4e43e7c458ae46e9280fc781330b40237e4e3aa04cb39c909146b1fc85eab8624489ef6657478971db9261ad769d0cbd38e944e31ae2b448a2c1a7846b308

data/README.md

@@ -22,7 +22,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+1. Download gem.
+2. In the terminal, navigate to the downloaded folder.
+3. Run 'bundle install'. (this will require the bundler gem      
+   installed on the system)
+4. Run 'ruby bin/cdc-notices'
 
 ## Development
 
@@ -38,4 +42,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/bin/cdc-notices

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
-require './lib/cdc_notices.rb'
+require_relative "../lib/cdc_notices/version"
+require_relative "../lib/cdc_notices/cli"
 
 CdcNotices::CLI.new.call

data/lib/cdc_notices/version.rb

@@ -1,3 +1,3 @@
 module CdcNotices
-  VERSION = "0.1.5" #still working, but pushed to ruby gems.
+  VERSION = "0.1.6" #still working, but pushed to ruby gems.
 end

data/lib/concerns/make_new.rb

@@ -0,0 +1,35 @@
+module MakeNew
+  module InstanceMethods
+    def make(array)
+      type = array[0].split("_").last
+      array.shift
+
+      if type == "alert"
+        array.each do |alert|
+          new_alert = Alert.new
+          new_alert.title = alert.css('a:not(.readmore)').text
+          new_alert.summary = alert.css('span').text
+          new_alert.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{alert.css('.readmore').attr('href').text}"
+          @notice.add_alert(new_alert)
+       end
+      elsif type == "warn"
+        array.each do |warn|
+          new_warn = warn.new
+          new_warn.title = warn.css('a:not(.readmore)').text
+          new_warn.summary = warn.css('span').text
+          new_warn.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{warn.css('.readmore').attr('href').text}"
+          @notice.add_warn(new_warn)
+        end
+
+      elsif type == "watch"
+        array.each do |watch|
+          new_watch = Watch.new
+          new_watch.title = watch.css('a:not(.readmore)').text
+          new_watch.summary = watch.css('span').text
+          new_watch.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{watch.css('.readmore').attr('href').text}"
+          @notice.add_watch(new_watch)
+        end
+      end
+    end
+  end
+end

data/lib/scrape_notice.rb

@@ -1,22 +1,21 @@
 require 'open-uri'
 require 'nokogiri'
 require 'openssl'
-
+require 'pry'
 require_relative 'notice.rb'
 require_relative 'alert.rb'
-
 require_relative 'watch.rb'
 require_relative 'warn.rb'
-
+require_relative 'concerns/make_new'
 class Scraper
-
+  include MakeNew::InstanceMethods
   attr_accessor :url
 
- def initialize(url)
-   @url = url
-   @notice = Notice.new
+   def initialize(url)
+     @url = url
+     @notice = Notice.new
 
- end
+   end
 
    def get_page
     html = open(@url, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE)
@@ -26,72 +25,38 @@ class Scraper
    end
 
    def set_attributes
-     array_alert = []
-     array_watch = []
-     array_warn = []
-       main_content = self.get_page.css('#contentArea')
-
-       notice_hash = {:alert => main_content.css('#alert'), :watch => main_content.css('#watch'), :warn => main_content.css('#warn')}
-
-       alerts = notice_hash[:alert].collect {|alert| alert.css('li')}
-
+     array_alert = ["array_alert"]
+     array_watch = ["array_watch"]
+     array_warn = ["array_warn"]
+
+     main_content = self.get_page.css('#contentArea')
+     notice_hash = {:alert => main_content.css('#alert'), :watch => main_content.css('#watch'), :warn => main_content.css('#warn')}
+     alerts = notice_hash[:alert].collect {|alert| alert.css('li')}
+     watches = notice_hash[:watch].collect {|watch| watch.css('li')}
+     warns = notice_hash[:warn].collect {|warn| warn.css('li')}
        if alerts[0] != nil
          alerts[0].each do |alert|
            array_alert << alert
          end
        end
 
-
-
-       watches = notice_hash[:watch].collect {|watch| watch.css('li')}
        if watches[0] != nil
          watches[0].each do |watch|
            array_watch << watch
          end
        end
 
-       warns = notice_hash[:warn].collect {|warn| warn.css('li')}
        if warns[0] != nil
          warns[0].each do |warn|
            array_warn << warn
          end
        end
 
-          array_alert.each do |alert|
-               new_alert = Alert.new
-          new_alert.title = alert.css('a:not(.readmore)').text
-          new_alert.summary = alert.css('span').text
-          new_alert.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{alert.css('a').attr('href').text}"
-
-          @notice.add_alert(new_alert)
-         end
-
-         array_watch.each do |watch|
-           new_watch = Watch.new
-           new_watch.title = watch.css('a:not(.readmore)').text
-           new_watch.summary = watch.css('span').text
-           new_watch.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{watch.css('a').attr('href').text}"
-           @notice.add_watch(new_watch)
-         end
-
-
-
-         array_warn.each do |warn|
-           new_warn = warn.new
-           new_warn.title = warn.css('a:not(.readmore)').text
-           new_warn.summary = warn.css('span').text
-           new_warn.readmore = "#{@url.gsub(/\/travel\/notices/, "")}#{warn.css('a').attr('href').text}"
-           @notice.add_warn(new_warn)
-         end
-
-           @notice
-
-
-
-   end
-
-
-
+    make(array_alert)
+    make(array_warn)
+    make(array_watch)
 
+    @notice
+    end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdc_notices
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - tahbristol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,9 +117,9 @@ files:
 - cdc_notices.gemspec
 - exe/cdc-notices
 - lib/alert.rb
-- lib/cdc_notices.rb
 - lib/cdc_notices/cli.rb
 - lib/cdc_notices/version.rb
+- lib/concerns/make_new.rb
 - lib/notice.rb
 - lib/scrape_notice.rb
 - lib/warn.rb
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Displays currrent infectious disease travel notices from the Centers for

data/lib/cdc_notices.rb

@@ -1,8 +0,0 @@
-
-require_relative "./cdc_notices/version"
-require_relative "./cdc_notices/cli"
-module CdcNotices
-
-
-
-end