cinch-news 1.0.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 66bb861417cb43f4104ca0063d91267a4898cb2c
-  data.tar.gz: 141ff2d85f4c1665794d9c9644a39cd2001e4c1e
+  metadata.gz: 1f5edc6bdacb752d09cda39b6d59713d3d798017
+  data.tar.gz: 832629ce346ead1d0dfbefd13737b28b574c5e91
 SHA512:
-  metadata.gz: 21751bdbc3838edea21510528732446d5da105336ef9fd8a19987818697818ccd40b4921a444cd7650e60e459b6618bd6b3e8813ebaeb17107b58b87b6f09953
-  data.tar.gz: 991040fbe9be311764ad1515d60f7e8e9be59480deb62e937f97f673515b626e1e0e2c9bc69a8dc6725b09e850d23990c47cbc8ab1ff95eae122bbefde1bea57
+  metadata.gz: cc5234a147ec0e7aec07476d2adc32d121530ed2f6ae156453f3ffcaa481125034030bd17f5656a6b1c3084b8d5024d51b270a1e1ad4921ee4e9a3adbe595df5
+  data.tar.gz: f72368f9a9436301f398879d898af805e43f5b68b2f7d7a23b272fd95abc157c9147316401a5ddb93ac4730a84d5423abecaee879287624072cc580ddf75f553

data/lib/cinch/plugins/helpers/category_helper.rb

@@ -0,0 +1,168 @@
+require 'json'
+require 'open-uri'
+require 'ostruct'
+require 'cinch/toolbox'
+
+module Cinch
+  module Helpers
+  
+    def categories
+      c_data = JSON.parse(open("http://api.feedzilla.com/v1/categories.json").read)
+      c_list = []
+      
+      for i in c_data
+        c_title = i['english_category_name']
+        c_id    = i['category_id']
+        
+        c_list.push("%s [ %s ]" % [c_title, c_id])
+      end
+        return c_list
+      end
+      
+    def sub_categories(id)
+      sc_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/#{id}/subcategories.json").read)
+      sc_list = []
+      
+      for i in sc_data
+        sc_title = i['display_subcategory_name']
+        sc_id    = i['subcategory_id']
+        
+        sc_list.push("%s [ %s ]" % [sc_title, sc_id])
+      end
+        return sc_list
+      end
+      
+    def execute_c_search(id, terms)
+      search_c_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/#{id}/articles/search.json?q=#{terms}&count=4").read)
+      s_c_data = search_c_data['articles']
+      search_c_list = []
+      
+      for i in s_c_data
+        article_source   = i['source']
+        article_title    = i['title']
+        article_summary  = i['summary']
+        article_url      = i['url']
+        
+        url = article_url
+        url = Cinch::Toolbox.shorten(url)
+
+        url = /"shorturl": "(.+)"/.match(url)[1]
+
+        summary = article_summary[0..200]
+
+        summary_s = summary.gsub! /\n/, ' '
+
+        search_c_list.push("%s | Title \"%s\" | Summary: %s [ %s ]" % [article_source, article_title, summary, url])
+      end
+        return search_c_list
+      end
+
+      def execute_sc_search(id, sc_id, terms)
+        search_sc_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/#{id}/subcategories/#{sc_id}/articles/search.json?q=#{terms}&count=4").read)
+        s_sc_data =           search_sc_data['articles']
+        search_sc_list = []
+      
+      for i in s_sc_data
+        article_source   = i['source']
+        article_title    = i['title']
+        article_summary  = i['summary']
+        article_url      = i['url']
+        
+        url = article_url
+        url = Cinch::Toolbox.shorten(url)
+
+        url = /"shorturl": "(.+)"/.match(url)[1]
+
+        summary = article_summary[0..200]
+
+        summary_s = summary.gsub! /\n/, ' '
+
+        search_sc_list.push("%s | Title \"%s\" | Summary: %s [ %s ]" % [article_source, article_title, summary_s, url])
+      end
+        return search_sc_list
+      end
+
+    def fetch_news
+      news_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/26/articles.json?&count=4").read)
+      news_articles = news_data['articles']
+      news_list = []
+
+      for i in news_articles
+        article_source   = i['source']
+        article_title    = i['title']
+        article_summary  = i['summary']
+        article_url      = i['url']
+
+        puts article_url
+
+        url = article_url
+        url = Cinch::Toolbox.shorten(url)
+
+        url = /"shorturl": "(.+)"/.match(url)[1]
+
+        puts url.class
+
+        summary = article_summary[0..200]
+
+        summary_s = summary.gsub! /\n/, ' '
+
+        news_list.push("%s | Title \"%s\" | Summary: %s [ #{url} ]" % [article_source, article_title, summary_s])
+      end
+        return news_list
+      end
+
+      def c_top_news(id)
+        c_news_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/#{id}/articles.json?&count=4").read)
+        c_news_articles = c_news_data['articles']
+        c_news_list = []
+
+        for i in c_news_articles
+          article_source   = i['source']
+          article_title    = i['title']
+          article_summary  = i['summary']
+          article_url      = i['url']
+
+
+          url = article_url
+          url = Cinch::Toolbox.shorten(url)
+
+          url = /"shorturl": "(.+)"/.match(url)[1]
+
+          summary = article_summary[0..200]
+
+          summary_s = summary.gsub! /\n/, ' '
+
+          c_news_list.push("%s | Title \"%s\" | Summary: %s [ #{url} ]" % [article_source, article_title, summary_s])
+        end
+          return c_news_list
+        end
+
+      def sc_top_news(id, sc_id)
+        sc_news_data = JSON.parse(open("http://api.feedzilla.com/v1/categories/#{id}/subcategories/#{sc_id}/articles.json?&count=4").read)
+        sc_news_articles = sc_news_data['articles']
+        sc_news_list = []
+
+        for i in sc_news_articles
+          article_source   = i['source']
+          article_title    = i['title']
+          article_summary  = i['summary']
+          article_url      = i['url']
+
+
+          url = article_url
+          url = Cinch::Toolbox.shorten(url)
+
+          url = /"shorturl": "(.+)"/.match(url)[1]
+
+          summary = article_summary[0..200]
+
+          summary_s = summary.gsub! /\n/, ' '
+
+          sc_news_list.push("%s | Title \"%s\" | Summary: %s [ #{url} ]" % [article_source, article_title, summary_s])
+        end
+          return sc_news_list
+        end
+
+    end
+  end
+  

data/lib/cinch/plugins/news.rb

@@ -1,89 +1,97 @@
-# @author Richard Banks <namaste@rawrnet.net>
-
-# Feel free to join us in #Lobby on irc://rawr.sinsira.net where you can test this gem and get help!
-
-require 'cinch'
-require 'ostruct'
-require 'open-uri'
-require 'json'
-require 'cgi'
-require 'cinch/toolbox'
-
-module Cinch
-  module Plugins
-    class News
-      include Cinch::Plugin
-      
-      match /news$/, method: :top_news
-      
-      match /news (tech|money|travel|sports|life|weather|nation|offbeat|washington|world|religion|opinion|health|nfl|mlb|nba|nhl|collegefootball|collegebasketball|highschool|motorsports|golf|soccer|olympics|horseracing|people|books|music|movies)/, method: :category_news
-      
-      match /s-news (.+)/, method: :search_news
-      
-      def top_news(m)
-        data = fetch_news(m)
-        return m.reply "There was a problem fetching the news." if data.empty?
-        output_news(m, data)
-      end
-      
-      def category_news(m, category)
-        data = fetch_category(m, category)
-        return m.reply "There was a problem fetching the news for #{category}." if data.empty?
-        output_news(m, data)
-      end
-      
-      def search_news(m, terms)
-        data = fetch_search(m, terms)
-        return m.reply "No news results found for #{terms}." if data == false
-        output_news(m, data)
-      end
-      
-      def fetch_news(m)
-        key = config[:key]
-        data = JSON.parse(open("http://api.usatoday.com/open/articles/topnews?api_key=#{key}&encoding=json&count=3").read)
-        stories = data['stories']
-        output = []
-        stories.each{|i|
-        url = i['link']
-        url.gsub! /apidata./, ''
-        url = Cinch::Toolbox.shorten(url)
-        output.push("News: | \"%s\" | Description: %s [ #{url} ]" % [i['title'], i['description']])}
-        return output
-      end
-      
-      def fetch_category(m, category)
-        key = config[:key]
-        data = JSON.parse(open("http://api.usatoday.com/open/articles/topnews/#{category}?api_key=#{key}&encoding=json&count=3").read)
-        stories = data['stories']
-        output = []
-        stories.each{|i|
-        url = i['link']
-        url.gsub! /apidata./, ''
-        url = Cinch::Toolbox.shorten(url)
-        output.push("News: | \"%s\" | Description: %s [ #{url} ]" % [i['title'], i['description']])}
-        return output
-      end
-      
-      def fetch_search(m, terms)
-        key = config[:key]
-        search_uri = URI.encode("http://api.usatoday.com/open/articles?tag=#{terms}&count=3&api_key=#{key}&encoding=json")
-        data = JSON.parse(open("#{search_uri}").read)
-        stories = data['stories']
-        output = []
-        stories.each{|i|
-        url = i['link']
-        url.gsub! /apidata./, ''
-        url = Cinch::Toolbox.shorten(url)
-        output.push("News: | \"%s\" | Description: %s [ #{url} ]" % [i['title'], i['description']])}
-        return output
-        rescue JSON::ParserError
-          return false
-      end
-      
-      def output_news(m, data)
-        return if data == false
-        data[0..2].each{|i| m.reply i}
-      end
-    end
-  end
-end
+# @author Richard Banks <namaste@rawrnet.net>
+
+# Feel free to join us in #Lobby on irc://rawr.sinsira.net where you can test this gem and get help!
+
+require 'cinch'
+require 'ostruct'
+require 'open-uri'
+require 'json'
+require 'cgi'
+require 'cinch/toolbox'
+require_relative "helpers/category_helper.rb"
+
+module Cinch
+  module Plugins
+    class News
+      include Cinch::Plugin
+      
+      set :plugin_name, 'news'
+      set :help, <<-USAGE.gsub(/^ {6}/, '')
+        This plugin is a comprehensive news aggregator and contacts several sources for articles.
+        Enable/Disable Usage:
+        * !n-categories: This command returns all the categories that you can choose from in a PM.
+        * !n-subcategories <category ID>: This command returns all the subcategories of the specified category and their useable ID.
+        * !news: This command retrieves the top three articles from the Top Stories subcategory of the Top News category.
+        * !news <category ID>: This command retrieves the top three articles from the specified category.
+        * !news <category ID> <subcategory ID>: This command retrieves the top three articles from the specified subcategory of the specified category.
+        * !s-category <category id> <query>: This command searches the specified category for your query.
+        USAGE
+      
+      match /n-categories/, method: :list_categories
+      
+      match /n-subcategories (.+)/, method: :list_subs
+      
+      match /news$/, method: :top_news
+
+      match /news (.+)$/, method: :c_topnews
+
+      match /news (.+?) (.+)/, method: :sc_topnews
+      
+      match /s-category (.+?) (.+)/, method: :search_category
+
+      match /s-subcategory (.+?) (.+?) (.+)/, method: :search_subcategory
+      
+      def list_categories(m)
+        cat_list = categories
+        ca_list = cat_list.join(", ")
+        m.user.notice "#{ca_list}"
+      end
+      
+      def list_subs(m, c_id)
+        sc_list = sub_categories(c_id)
+        s_list = sc_list.join(", ")
+        m.user.notice "#{s_list}"
+      end
+    
+      
+      def search_category(m, id, terms)
+        terms.gsub! /\s/, '+'
+        search_list = execute_c_search(id, terms)
+        search_list[0..2].each{|i| m.reply i}
+          rescue OpenURI::HTTPError
+            m.reply "Error: #{$!}"
+          end
+
+      def search_subcategory(m, id, sc_id, terms)
+        terms.gsub! /\s/, '+'
+        sc_search_list = execute_sc_search(id, sc_id, terms)
+        sc_search_list[0..2].each{|i| m.reply i}
+          rescue OpenURI::HTTPError
+            m.reply "Error #{$!}"
+          end 
+
+      def top_news(m)
+        news = fetch_news
+        news[0..2].each{|i| m.reply i}
+          rescue OpenURI::HTTPError
+            m.reply "Error #{$!}"
+          end
+
+      def c_topnews(m, id)
+        c_news = c_top_news(id)
+        c_news[0..2].each{|i| m.reply i}
+          rescue OpenURI::HTTPError
+            m.reply "Error #{$!}"
+          end
+
+      def sc_topnews(m, id, sc_id)
+        sc_news = sc_top_news(id, sc_id)
+        sc_news[0..2].each{|i| m.reply i}
+          rescue OpenURI::HTTPError
+            m.reply "Error #{$!}"
+          end
+
+
+        end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cinch-news
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '2.0'
 platform: ruby
 authors:
 - Richard Banks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -38,15 +38,16 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
-description: ! 'A news gem/plugin for the Cinch IRC bot framework that uses a USA
-  Today API. You can visit irc://rawr.sinsira.net #Lobby to get help, report issues
-  , test the gem, or just chat.'
+description: ! 'A news gem/plugin for the Cinch IRC bot framework that uses a FeedZilla
+  API. You can visit irc://rawr.sinsira.net #Lobby to get help, report issues , test
+  the gem, or just chat.'
 email:
 - namaste@rawrnet.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cinch/plugins/helpers/category_helper.rb
 - lib/cinch/plugins/news.rb
 homepage: https://github.com/RawrNet/cinch-news
 licenses: