wreddit 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7949c15f248490d5d34f2f43efdba83c9375d8
-  data.tar.gz: 9d3f05a3f587ccb7787966b7cfb3b31c7627213c
+  metadata.gz: 48a54f3d0b68d44639b23f8a333700f7e8e7486b
+  data.tar.gz: 5ef223b4ad95d3ca68e17600a0377fc5b7a3adb5
 SHA512:
-  metadata.gz: 81fd38581be2a1ede673c9bbc4663d710f90bd06cd3b666a0f6243dff0bc79ceedc043a5f2532e4599e63af505cf22102e1416ae84540f68f83548b09f8f7924
-  data.tar.gz: d94d33bca6eae3df8b092210d08045052d728fa487102e9708293bb0d69ee8f88e7487e6e25adb4689fe3d75f38c91f2c32f38959f2013cb94f4c08a7adf52e1
+  metadata.gz: bec4981cc81219c8f013b9ea11d10101f36d5907dca62267d651649f1ac7cedea5707d362cce6e496b6c9b88fce1235f570a882d0f7cf98502c4d98a52c4a3df
+  data.tar.gz: 8cd70deefd8523bf888ab6010bd9a4d7ee9c0fa2572661d6da2cacabab0830fb22cf83ce5b709f20f4d0a873c231640d69d1f97847659c5a41247fc36fbe3139

data/lib/test.rb

@@ -1,5 +1,3 @@
 require_relative 'wreddit'
-puts "Hello world"
-
 reddit = Wreddit.new
-puts reddit.subreddit('learnprogramming').parse('xml')
+puts reddit.subreddit('all').descriptions

data/lib/wreddit.rb

@@ -48,6 +48,7 @@ class Wreddit
       response = JSON.parse(self.json)
     rescue JSON::ParserError, TypeError => e
       puts e
+      response = self.json
     end
     unless response['data']['children'].nil?
       response['data']['children'].each do |child|
@@ -65,6 +66,7 @@ class Wreddit
       response = JSON.parse(self.json)
     rescue JSON::ParserError, TypeError => e
       puts e
+      response = self.json
     end
     unless response['data']['children'].nil?
       response['data']['children'].each do |child|
@@ -82,6 +84,7 @@ class Wreddit
       response = JSON.parse(self.json)
     rescue JSON::ParserError, TypeError => e
       puts e
+      response = self.json
     end
     unless response['data']['children'].nil?
       response['data']['children'].each do |child|
@@ -95,63 +98,46 @@ class Wreddit
 
   # parse helpers
   def json
-    response = ''
     @uri+='.json'
     res = @client.get(@uri)
-    if res
-      # if res exists
-      return res
-    else
+    unless res
       # if res doesn't exist get it from HTTParty
       res = HTTParty.get(URI(@uri))
       if res.code == 200
         # if res is an OK (we are getting data)
-        @client.set(@uri, res, ex: 1)
-      else
-        # return 401, 429, or 500 error codes
+        @client.set(@uri, res , ex: 10)
+        res = @client.get(@uri)
         return res
       end
-      return res
     end
+    return res
   end
 
   def xml
     @uri+='.xml'
     res = @client.get(@uri)
-    if res
-      # if res exists
-      return res
-    else
+    unless res
       # if res doesn't exist get it from HTTParty
       res = HTTParty.get(URI(@uri))
       if res.code == 200
         # if res is an OK (we are getting data)
-        @client.set(@uri, res)
-      else
-        # return 401, 429, or 500 error codes
-        return res
+        @client.set(@uri, res, ex: 10)
       end
-      return res
     end
+    return res
   end
 
   def html
     res = @client.get(@uri)
-    if res
-      # if res exists
-      return res
-    else
+    unless res
       # if res doesn't exist get it from HTTParty
       res = HTTParty.get(URI(@uri))
       if res.code == 200
         # if res is an OK (we are getting data)
-        @client.set(@uri, res)
-      else
-        # return 401, 429, or 500 error codes
-        return res
+        @client.set(@uri, res, ex: 10)
       end
-      return res
     end
+    return res
   end
 
   # general parsing

data/lib/wreddit/version.rb

@@ -1,3 +1,3 @@
 class Wreddit
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreddit
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Hulse