reddit_bot 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71731b982933f8e4326cb498f7d9d26192ff106
-  data.tar.gz: 89fd6b15ed1cb5b6140499eeebaa3700f4e511d4
+  metadata.gz: 305bb60aab77793751a1ebd2a999dfc657cb7dfe
+  data.tar.gz: 6ca3d8ebf4d31cb980ab6694034a7b2d85197cc0
 SHA512:
-  metadata.gz: f50a272953603b3312ae011fb232253b90b32a14089ee05cdcacfbbeee2d2e615bc2c9218cfbc68e54a494489273ac759e8d36c73c9869b5f6778b062b4cd94b
-  data.tar.gz: 7c87aeff60aa38951ffbeeacde592da865142df88b083e670e9ef9c889a813759dbcdb21d87fd8eaa1081146b7afa67b6227d08d59790bdcf21132769c6b4019
+  metadata.gz: 6a02edccecbdb082ac0ef432d4402564931f47ff08c1c472e8370660f492e5fefab1c4eead7c5c3ff758342adaf738d6b394a50a231fa83e07eb3bbb12d0f3ec
+  data.tar.gz: 0fd8bbb254327df02bc65b0c2cf77cbefd4280b66542a8c4f35771ab273c0ae657b41ffe811732fb22f6d198eeb2be8c6afec40dcc049c6f1a438fa95929fb0a

data/examples/boilerplate.rb

@@ -7,9 +7,15 @@ require_relative File.join "../..",
   "download_with_retry"
 
 require "reddit_bot"
-# RedditBot.init *File.read(File.join(Dir.pwd, "secrets")).split, ignore_captcha: true
-RedditBot.init *File.read("secrets").split, ignore_captcha: true
+
+if RedditBot::VERSION <= "0.1.3"
+
+  RedditBot.init *File.read("secrets").split, ignore_captcha: true
+
+end
 
 require_relative File.join "../..",
   *(".." if ENV["LOGNAME"] == "nakilon"),
   "awsstatus/2.rb"
+
+require "yaml"

data/lib/reddit_bot.rb

@@ -8,24 +8,24 @@ require "json"
 
 
 module RedditBot
-  VERSION = "0.1.3"
+  VERSION = "1.0.0"
 
-  class << self
+  class Bot
 
-    attr_accessor :token_cached
-    attr_accessor :username
-    attr_accessor :iden_and_captcha
-    attr_accessor :ignore_captcha
-    attr_accessor :secrets
-
-    def init *secrets, **kwargs
-      @secrets = secrets
-      kwargs
+    def initialize secrets, **kwargs
+      @secrets = secrets.values_at *%i{ client_id client_secret password login }
       @ignore_captcha = kwargs[:ignore_captcha]
     end
 
-    def json mtd, url, form = []
-      response = JSON.parse resp_with_token mtd, url, Hash[form].merge({api_type: "json"})
+    # attr_accessor :token_cached
+    # attr_accessor :username
+    # attr_accessor :iden_and_captcha
+    # attr_accessor :ignore_captcha
+    # attr_accessor :secrets
+
+    def json mtd, url, _form = []
+      form = Hash[_form]
+      response = JSON.parse resp_with_token mtd, url, form.merge({api_type: "json"})
       if response.is_a?(Hash) && response["json"] # for example, flairlist.json and {"error": 403} do not have it      
         puts "ERROR OCCURED on #{[mtd, url]}" unless response["json"]["errors"].empty?
         # pp response["json"]
@@ -34,10 +34,10 @@ module RedditBot
           case error
           when "ALREADY_SUB" ; puts "was rejected by moderator if you didn't see in dups"
           when "BAD_CAPTCHA" ; update_captcha
-            json mtd, url, form.concat([
-                                        ["iden", @iden_and_captcha[0]],
-                                        ["captcha", @iden_and_captcha[1]],
-                                      ]) unless @ignore_captcha
+            json mtd, url, form.merger( {
+              iden: @iden_and_captcha[0],
+              captcha: @iden_and_captcha[1],
+            } ) unless @ignore_captcha
           else ; raise error
           end
         end
@@ -48,10 +48,8 @@ module RedditBot
     def wiki_edit subreddit, page, text
       json :post,
         "/r/#{subreddit}/api/wiki/edit",
-        [
-          ["page", page],
-          ["content", text]
-        ]
+        page: page,
+        content: text
       # ["previous", result["data"]["children"].last["id"]],
     end
 
@@ -60,13 +58,11 @@ module RedditBot
     def token
       return @token_cached if @token_cached
       response = JSON.parse(reddit_resp(:post,
-        "https://www.reddit.com/api/v1/access_token",
-        [
-          ["grant_type", "password"],
-          ["username", @username = @secrets[3]],
-          ["password", @secrets[2]],
-        ],
-        {}, # headers
+        "https://www.reddit.com/api/v1/access_token", {
+          grant_type: "password",
+          username: @username = @secrets[3],
+          password: @secrets[2],
+        }, {}, # headers
         [@secrets[0], @secrets[1]],
       ))
       raise response.inspect unless @token_cached = response["access_token"]
@@ -181,13 +177,13 @@ module RedditBot
       fail response.to_hash["x-ratelimit-remaining"][0] \
       if response.to_hash["x-ratelimit-remaining"] &&
          response.to_hash["x-ratelimit-remaining"][0].size <= 2
-# /home/ec2-user/largeimages/bot.rb:126:in `_resp': 288 (RuntimeError)
-      # File.write File.join(__dir__(), "temp.json"), response.body
-# if response.code == "401"
-#   puts request.path
-#   puts request.body
-#   pp request.to_hash
-# end
+
+      # if response.code == "401"
+      #   puts request.path
+      #   puts request.body
+      #   pp request.to_hash
+      # end
+
       response
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json