telegram-bot 0.9.0.alpha1 → 0.9.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 590c2a861f53a992a435eb30c21a1425a1929baf
-  data.tar.gz: e21c4caa819c6c7328d948c835bc807ed187d864
+  metadata.gz: 36cad9c75339c3e1119aec4f14645a7cdcb1c868
+  data.tar.gz: 0817596572b5667c47642cb2ad30dd5e51690a32
 SHA512:
-  metadata.gz: 358bd9e8f43cf07a6b8a3714570c3dcfd6d59dd5b3066cd4a20b51f754f0315a9fb9db448d5f65fc0098ac45bb18fbb2b538c9480d7ab31b94b21878a093e71f
-  data.tar.gz: 93846f47f24480df1288f51566df3d28d3be89230e974457fab2f4b4f8b604ce44cee97423173fadda47818e19fde3e14e4b8af029425f6289b90d26a6279e96
+  metadata.gz: d488af6c423477bc93fe182d73f9b104c45886097896dbd400bd29c2d5eb1455c6237a1eabd206397f9ba5799798b6d1b83936662e655b2606b0998136c5f228
+  data.tar.gz: 21468fbab556f7c31594e0b68be13f75b51465b6418b075e4441613435bb7dc5fe02a77ef6a3c6241475fd026792d02e55a1b106b0ea89e540a522157a47281c

data/lib/telegram/bot/async.rb

@@ -30,12 +30,18 @@ module Telegram
     #   client.send_message(message)
     #   client.async(false) { client.send_message(other_one) }
     #
+    # `#async=` sets global value for all threads,
+    # while `#async(val, &block)` is thread-safe.
+    #
     # It can be set with custom job class or classname. By default it defines
     # job classes for every client class, inherited from ApplicationRecord, which
     # can be accessed via `.default_async_job`. You can integrate it with any
     # other job provider by defining a class with `.perform_later(bot_id, *args)`
     # method. See Async::Job for implemetation.
     module Async
+      # Used to track missing key in a hash in local variable.
+      MISSING_VALUE = Object.new.freeze
+
       module Job
         class << self
           def included(base)
@@ -78,6 +84,16 @@ module Telegram
         def prepare_async_args(*args)
           args
         end
+
+        # Returns default_async_job if `true` is given,
+        # treats String as a constant name, or bypasses any other values.
+        def prepare_async_val(val)
+          case val
+          when true then default_async_job
+          when String then Object.const_get(val)
+          else val
+          end
+        end
       end
 
       class << self
@@ -91,38 +107,46 @@ module Telegram
           hash = hash.dup
           hash.each { |key, val| hash[key] = val.to_s if val.is_a?(Symbol) }
         end
+
+        # Thread-local hash to store async config for every client.
+        def thread_store
+          Thread.current[:telegram_bot_async] ||= {}
+        end
       end
 
       attr_reader :id
 
-      def initialize(*, id: nil, async: nil, **options)
+      def initialize(*, id: nil, async: nil, **)
         @id = id
         self.async = async
         super
       end
 
-      # Sets `@async` to `self.class.default_async_job` if `true` is given
-      # or uses given value.
-      # Pass custom job class to perform async calls with.
+      # Sets default async value for all threads.
+      # Uses `self.class.prepare_async_val` to prepare value.
       def async=(val)
-        @async =
-          case val
-          when true then self.class.default_async_job
-          when String then const_get(val)
-          else val
-          end
+        @async = self.class.prepare_async_val(val)
       end
 
-      # Returns value of `@async` if no block is given. Otherwise sets this value
-      # for a block.
+      # Sets async value in a thread-safe way for the block.
+      # Uses `self.class.prepare_async_val` to prepare value.
+      #
+      # If no block is given returns previously set value or the global one,
+      # set by #async=.
       def async(val = true)
-        return @async unless block_given?
+        thread_key = object_id
+        thread_store = Async.thread_store
+        return thread_store.fetch(thread_key) { @async } unless block_given?
         begin
-          old_val = @async
-          self.async = val
+          old_val = thread_store.fetch(thread_key) { MISSING_VALUE }
+          thread_store[thread_key] = self.class.prepare_async_val(val)
           yield
         ensure
-          @async = old_val
+          if MISSING_VALUE == old_val
+            thread_store.delete(thread_key)
+          else
+            thread_store[thread_key] = old_val
+          end
         end
       end
 

data/lib/telegram/bot/version.rb

@@ -1,6 +1,6 @@
 module Telegram
   module Bot
-    VERSION = '0.9.0.alpha1'.freeze
+    VERSION = '0.9.0.alpha2'.freeze
 
     def self.gem_version
       Gem::Version.new VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot
 version: !ruby/object:Gem::Version
-  version: 0.9.0.alpha1
+  version: 0.9.0.alpha2
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for building Telegram Bots with Rails integration