rubyhexagon 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3e1687a1a39b22e8915a8e8c5b5aef05db5431c190d8aa2171be3e9472cbe9
-  data.tar.gz: e3f3497445b8ccd1b9929afcbf30ecc9cab45933940a4ad71c3c64b470d841f4
+  metadata.gz: c8a91cedb9b96a07c97813b28733d59051c3d607474a849060636b73a568d94c
+  data.tar.gz: 09aa61e926d1212638d9e196c6e303c47784f17ef9861b75187ca8b5fdec30ea
 SHA512:
-  metadata.gz: f60479622c6258f57c88d71ee9a04c3bba44e9644ad39faae5f838932622513965207730bd3f57beb048ad9c272d7327966e518e9837bdc56b8c9224db168216
-  data.tar.gz: 737e9e4763934026afddea9dfaefc0144a9d07366faf52ac6c1944bd9704de0b5a8e7aeb67b7b17a17221da6446987c64a5fd8185d4f41870a4ce292c45a1f70
+  metadata.gz: 9c3703e449a7f3b7a24bfacd98888d9aea0bbef0ec0fe118b3c271c80910e435bf1e0a94beceb14dd34ddcdb8ea14a1c298a5d54610a2e42db40357dce358cb0
+  data.tar.gz: f216be35a182ae536fccfe8f54d45e8d9b884a6b3e5f5fadd321ecb0a5fa3103468b3332328c209b58e61cd545bff26cdc8ae07b52be6b8030380e1a96b0920a

data/lib/rubyhexagon.rb

@@ -38,7 +38,7 @@ require 'rubyhexagon/search/tags'
 module E621
   MAJOR = 1
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
   NAME = 'rubyhexagon'.freeze
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}".freeze
 end

data/lib/rubyhexagon/helper/api.rb

@@ -62,17 +62,25 @@ module E621
       query = query.to_a.map { |q| "#{q.first}=#{q.last}" }.join('&')
       query = "?#{query}" unless query == ''
       uri = "#{@base}/#{noun}/#{action}.json#{query}"
-      lock do
-        if @rspec || !defined? RSpec
-          JSON.parse(open(uri, @user_agent).read, symbolize_names: true)
-        else # In RSpec environment?
-          JSON.parse(open(uri).read, symbolize_names: true)
-        end
-      end
+      fetch_data(uri)
     end
 
     private
 
+    # @author Maxine Michalski
+    #
+    def fetch_data(uri)
+      lock do
+        data = if @rspec || !defined? RSpec then open(uri, @user_agent).read
+               else File.open(uri).read
+               end
+        JSON.parse(data, symbolize_names: true)
+      end
+    rescue SocketError
+      sleep 5
+      retry
+    end
+
     # @author Maxine Michalski
     #
     # (see #fetch)

data/lib/rubyhexagon/search/posts.rb

@@ -38,8 +38,8 @@ module E621
         d = fetch_deleted(page)
         while block_given? && d != []
           d.each { |del| yield del }
-          d = fetch_deleted(page)
           page += 1
+          d = fetch_deleted(page)
         end
         d
       end
@@ -63,8 +63,8 @@ module E621
         posts = fetch_posts(parameters)
         while block_given? && posts != []
           posts.each { |post| yield post }
-          posts = fetch_posts(parameters)
           parameters[:before_id] = posts.last.nil? ? 0 : posts.last.id
+          posts = fetch_posts(parameters)
         end
         posts
       end

data/lib/rubyhexagon/search/tags.rb

@@ -118,7 +118,7 @@ module E621
         end
       end
       private_class_method :fetch_implications
-      
+
       # @author Maxine Michalski
       #
       # Helper function to fetch aliased tags

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyhexagon
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Maxine Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json