argh_ss 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c677377b4509e88a84daec6bd878144278d40c
-  data.tar.gz: '0513209f985af376a7f075555bc00bd83d67f86b'
+  metadata.gz: 76e4dcbadc62cdfae8249c0fb4ee9acd62db4e04
+  data.tar.gz: 6707d2d47696dbfd3c314763afdc671ea881934e
 SHA512:
-  metadata.gz: 381e350ee0d910ba36f1889a6c3c7ca335a49f44e15a0e370ffd868f6e2c8ff089c6e1087c1f8b6d4e63238d63ff52fbaa4e7d6175b0efce4d4c1a3044c7627d
-  data.tar.gz: 9a3f9e48b09b06ab1d3433e2c06fcda28d226d6ce2a87e8e69244d306da07e6fcad5715d8e12fa1a8b13e463bb95b6b0141ef39023cc21f1641bfb26c5721555
+  metadata.gz: 9f0891786f1263c476f965ed153c99998e6a614990526ec8081fd58d7143b0c41bd23aac9f127af1c6f54ab622be694bc90641aaf5b81bef9c3c64c04641fb60
+  data.tar.gz: ddc429398bf15bea46032536a6d6e02ebf0575c7b82c57624efd2d8c99c0dfdd8605ae0639e1bd59bb0d44c7f86e6d92ea0d2d0a5a77d763d28786f8d2506699

data/lib/argh_ss/resolve_url.rb

@@ -1,19 +1,74 @@
 class ResolveURL
 
-  def self.resolve(uri_str, limit = 10)
-    raise ArgumentError, 'Too many redirects!' if limit == 0
+  def self.resolve(url)
+    if url_redirects(url).is_a?(String)
+      return url_redirects(url)
+    elsif rss_redirect(url).is_a?(String)
+      return rss_redirect(url)
+    else
+      return nil
+    end
+  end
 
-    response = Net::HTTP.get_response(URI(uri_str))
+  def self.url_redirects(uri_str, limit = 10)
+    begin
+      raise ArgumentError, 'Too many redirects!' if limit == 0
 
-    case response
-    when Net::HTTPSuccess then
-      uri_str
-    when Net::HTTPRedirection then
-      location = response['location']
-      resolve(location, limit - 1)
-    else
-      uri_str
+      response = Net::HTTP.get_response(URI(uri_str))
+
+      case response
+      when Net::HTTPSuccess then
+        uri_str
+      when Net::HTTPRedirection then
+        location = response['location']
+        url_redirects(location, limit - 1)
+      else
+        uri_str
+      end
+    rescue
+      nil
     end
   end
 
+  def self.rss_redirect(url)
+    begin
+      rss = RSS::Parser.parse(url)
+      case rss.feed_type
+      when 'rss'
+        rss.channel.link
+      when 'atom'
+        rss.id.content
+      end
+    rescue
+      nil
+    end
+  end
+
+#   def self.resolve(uri_str, limit = 10)
+#     raise ArgumentError, 'Too many redirects!' if limit == 0
+
+#     response = Net::HTTP.get_response(URI(uri_str))
+
+#     case response
+#     when Net::HTTPSuccess then
+#       uri_str
+#     when Net::HTTPRedirection then
+#       location = response['location']
+#       resolve(location, limit - 1)
+#     else
+#       uri_str
+#     end
+#   end
+
+#   def self.rss_pluck(url)
+#     rss = RSS::Parser.parse(url, false)
+
+#     case rss.feed_type
+#     when 'rss'
+#       p rss.channel.link
+#     when 'atom'
+#       p rss.id.content
+#     end
+#   end
+
 end

data/lib/argh_ss/version.rb

@@ -1,3 +1,3 @@
 module ArghSs
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argh_ss
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Toby Holmes