request_my_turn 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de338d9c27b44a4775be1525220b7bdd6e523f5d22efb05e77df9897e00d8b6
-  data.tar.gz: 8d536553f4fd9a630bd4de438fc52e19e5fc2b1c214490152ec04f3e4d56ed1b
+  metadata.gz: 49bfb4eb8f4642237f380883f8fcd6c037185cbcd798968fe3401fb573ca6e79
+  data.tar.gz: 06ccd80467f6dc64b6bb33227fbaa9a7a87b3fb9e4dc54ddccf1eace769ebb1c
 SHA512:
-  metadata.gz: 621f529c44f820030520a4079fcb0a7741e3fcf37f795fb067b9cd2f8d5756e3378d641a62f6e0304cd62d6fc91c224f8d78a883285d616e2198e5c73d2dc6b9
-  data.tar.gz: '008c58efef617d3ce9a866274b34ef8770424b982b6f570f729f512b0f9bcd8939eb889232e1eca753aba2a7741bbe9c15de36e366b7080800a738c17e881d09'
+  metadata.gz: d5939532dc27f74e38a209ac9f6e619055c1d78db5dc76d6fec5b3a7bf74763210c2f7d47608a3cff09c920c3bb8a148823dda75ab6b7eefe9eaeb79774b4599
+  data.tar.gz: 22af5a57eb80c50490e3500d559b258617bc420332ee3634d615b82b61a6d958a8444b294c82b34b42fc4ce16dbfd8cea6ee9ae51300106b5ef099a31d03b16d

data/lib/request_my_turn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RequestMyTurn
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/request_my_turn.rb

@@ -9,6 +9,8 @@ require 'uri'
 require_relative 'request_my_turn/version'
 
 class RequestMyTurn
+  attr_accessor :id, :locked
+
   class WithoutBlock < StandardError
     def initialize
       super 'This service must be used with `block\'!'
@@ -35,19 +37,34 @@ class RequestMyTurn
     def settings
       @settings ||= OpenStruct.new(
         url: nil,
-        switch: nil
+        after: nil,
+        before: nil,
+        switch: true,
+        timeout: nil,
+        lock_seconds: nil,
+        headers: nil,
+        ignore_timeout_error: nil
       )
     end
   end
 
+  %i[url after before switch timeout lock_seconds headers ignore_timeout_error method_added].each do |name|
+    define_method(name) do
+      value = instance_variable_get "@#{name}"
+      result = value.nil? ? self.class.settings[name] : value
+      result.is_a?(Proc) ? result.call(self) : result
+    end
+  end
+
   def initialize(queue_name, **options)
     @queue_name = queue_name
 
     @url = options[:url]
     @after = options[:after]
     @before = options[:before]
+    @switch = options[:switch]
     @timeout = options[:timeout]
-    @lock_seconds = options[:lock_seconds]
+    @lock_seconds = options[:lock_seconds] || 60
     @headers = options[:headers]
     @ignore_timeout_error = options[:ignore_timeout_error]
   end
@@ -56,27 +73,33 @@ class RequestMyTurn
     raise WithoutBlock unless block
     return yield unless switched_on?
 
-    id = take_my_turn
-    @before.call(id) if valid_callback? @before
+    self.id = take_my_turn
+    before.call(id) if valid_callback? before
 
     result = yield
     return result unless present? id
 
-    locked = leave_my_turn(id)
-    @after.call(locked) if valid_callback? @after
+    self.locked = leave_my_turn(id)
+    after.call(locked) if valid_callback? after
     result
   end
 
   private
 
   def switched_on?
-    return settings.switch.call(self) if settings.switch.is_a? Proc
-
-    present? current_url
+    switch
   end
 
-  def settings
-    self.class.settings.clone
+  def take_my_turn
+    timeout = self.timeout
+    response = Timeout.timeout(timeout.to_f) do
+      request "#{current_url}/#{@queue_name}?seconds=#{lock_seconds}"
+    rescue Timeout::Error
+      return false if ignore_timeout_error
+
+      raise TimeoutError, timeout
+    end
+    read_response(response, :id)
   end
 
   def current_url
@@ -84,23 +107,10 @@ class RequestMyTurn
   end
 
   def build_url
-    url = @url || settings.url
-    return false unless present?(url)
-
-    raise InvalidUrl, url unless url =~ URI::DEFAULT_PARSER.make_regexp
-
-    url
-  end
-
-  def take_my_turn
-    response = Timeout.timeout(@timeout.to_f) do
-      request "#{current_url}/#{@queue_name}?seconds=#{@lock_seconds}"
-    rescue Timeout::Error
-      return false if @ignore_timeout_error
+    current_url = url
+    raise InvalidUrl, current_url unless current_url =~ URI::DEFAULT_PARSER.make_regexp
 
-      raise TimeoutError, @timeout
-    end
-    read_response(response, :id)
+    current_url
   end
 
   def request(url, method: :get)
@@ -109,10 +119,14 @@ class RequestMyTurn
     https.use_ssl = url.start_with? 'https'
 
     request = method == :delete ? Net::HTTP::Delete.new(uri) : Net::HTTP::Get.new(uri)
-    @headers.each { |key, value| request[key] = value } if @headers.is_a?(Hash)
+    current_headers.each { |key, value| request[key] = value } if current_headers.is_a?(Hash)
     https.request(request)
   end
 
+  def current_headers
+    @current_headers ||= headers
+  end
+
   def leave_my_turn(id)
     response = request "#{current_url}/#{@queue_name}/#{id}", method: :delete
     read_response(response, :locked)
@@ -123,6 +137,10 @@ class RequestMyTurn
     hash[key.to_s]
   end
 
+  def valid_callback?(callback)
+    callback.is_a?(Proc) || callback.is_a?(Method)
+  end
+
   def present?(value)
     if value.nil?
       false
@@ -134,8 +152,4 @@ class RequestMyTurn
   rescue StandardError
     false
   end
-
-  def valid_callback?(callback)
-    callback.is_a?(Proc) || callback.is_a?(Method)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_my_turn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ralph baesso