argh_ss 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa1144d35720cdad9f20170c7e8e893f70cda47b
-  data.tar.gz: d5413a547590a1d5d9a4a3c2d5bd7576c2911762
+  metadata.gz: 245eb21da55999ec3b9a48ea2f6a2630855bcb55
+  data.tar.gz: bc6e86debdd6043734fc2c79766e548648273ad3
 SHA512:
-  metadata.gz: 458da9eb484f005da26e3642bcf4539f22f241cb41a20539c720840d7afb44bbf296a64789378b1492e9c7ffc95ed9ad79e7adf44832be628e204d1f0c966bc6
-  data.tar.gz: a1393801571068d95cfed5b9966ee2074aec916fd25ea88dc90862eb7dd97ce446bc9621db8693cce9a44225627ad7d5e002382e2f58307516733d99c64df8e0
+  metadata.gz: 109cb6d72122d94c70870f92515a433f6abc1dab661a112c84f34a22ec51fed5724452b501ba349fc1b3ab1618bdbfa0e246688f467c877eda706f8d8fd43e2d
+  data.tar.gz: 8a94c90df6d13ddf3f602862f6f1741b9a2d11707fb487ff5ec6d937292ce2993e0cd1f19af4a27acd5b9c147f96c67060956a762e240aae24adc50f06a93a0d

data/lib/argh_ss/rss_feed.rb

@@ -8,29 +8,24 @@ class RSSFeed
   
     [].tap do |result|
       open(url) do |rss|
-        begin
-          feed = RSS::Parser.parse(rss, false)
-          case feed.feed_type
-          when 'rss'
-            feed.items.each do |item|
-              hash = {}
-              args.each do |content|
-                hash[content] = item.send(rss_hash[content])
-              end
-              result << hash
+        feed = RSS::Parser.parse(rss, false)
+        raise NoMethodError, "Invalid feed" if !feed
+        case feed.feed_type
+        when 'rss'
+          feed.items.each_with_object({}) do |item, hash|
+            args.each do |content|
+              hash[content] = item.send(rss_hash[content])
             end
-          when 'atom'
-            feed.entries.each do |entry|
-              hash = {}
-              args.each do |content|
-                args_array = atom_hash[content]
-                hash[content] = entry.send(args_array[0]).send(args_array[1])
-              end
-              result << hash
+            result << hash
+          end
+        when 'atom'
+          feed.entries.each_with_object({}) do |entry, hash|
+            args.each do |content|
+              args_array = atom_hash[content]
+              hash[content] = entry.send(args_array[0]).send(args_array[1])
             end
+            result << hash
           end
-        rescue
-          next
         end
       end
     end
@@ -40,16 +35,13 @@ class RSSFeed
   def self.feed(url)
     {}.tap do |result|
       open(url) do |rss|
-        begin
-          feed = RSS::Parser.parse(rss)
-          case feed.feed_type
-          when 'rss'
-            feed.items.each { |item| result[item.title] = item.link }
-          when 'atom'
-            feed.items.each { |item| result[item.title.content] = item.link.content }
-          end
-        rescue 
-          next
+        feed = RSS::Parser.parse(rss)
+        raise NoMethodError, "Invalid feed" if !feed
+        case feed.feed_type
+        when 'rss'
+          feed.items.each { |item| result[item.title] = item.link }
+        when 'atom'
+          feed.items.each { |item| result[item.title.content] = item.link.content }
         end
       end
     end

data/lib/argh_ss/version.rb

@@ -1,3 +1,3 @@
 module ArghSs
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argh_ss
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Toby Holmes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler