telegram_bot_ruby 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb9b0f59bc8bfb6f12dad74e1ac411b9c8779b4
-  data.tar.gz: 5983a8a1acbb103e17f7ceb2f4e17c7157efdf9e
+  metadata.gz: d3f04284d4adc0dc0ea36b79f436306d14e575a6
+  data.tar.gz: b4188c3e144dca7c6e7d69228d475c606b8ca2c2
 SHA512:
-  metadata.gz: 2baa92312177181aa1b91d5056fe60c730ac486aa24ec63581e4863460b39545b4fedb2aeab4c1415510c35912d9a7b9d9126421fa70f350aefb43817b0e887d
-  data.tar.gz: 3b93fb3997d370af5ce6c7d33b9aef530cb54f607713a49a63f2b2a69a3b33c54ce8dcc0beec0a16141a0b54bfd7b9d4103969c85f8ffea0448a26ab87b22103
+  metadata.gz: 54eac803d445dd3c9a0d4168d182e2223c8b633c333489b872891807ee056b23bd856721b64f43ce2833aa44bd96edf6756954a8ba95ffbab4fa537ac49f090b
+  data.tar.gz: 56e8965c98679340262261e7eb616c216380d049372d9f9568e8867dd5f688f838ce82b583f3698375134b7d09e3a9f7806defe91fd688a6681143ce93a1aa59

data/README.md

@@ -40,26 +40,26 @@ bot.listen(method: :poll, interval: 1)
 ### Set up update listeners
 
 ```ruby
-bot.on_command 'ping' do  # /ping
+bot.on :command, 'ping' do  # /ping
   reply 'pong'
 end
 
-bot.on_command 'plus' do |num1, num2|  # /plus 1 2
+bot.on :command, 'plus' do |num1, num2|  # /plus 1 2
   reply (num1.to_i + num2.to_i).to_s
 end
 
-bot.on_text 'ping' do     # plain 'ping'
+bot.on :text 'ping' do     # plain 'ping'
   send_message 'pong'
 end
 
 # with block: false, message will keep passing through other listeners
-bot.on_text /(\d+)\+(\d+)\=\?/, block: false do |n1, n2|
+bot.on :text, /(\d+)\+(\d+)\=\?/, block: false do |n1, n2|
   send_chat_action :typing
   send_message (n1.to_i + n2.to_i).to_s
 end
 
 # a simple history logger
-bot.anything do |msg|
+bot.on :anything do |msg|
   Database.save [msg.from.username, msg.text] if !msg.text.empty?
 end
 ```

data/lib/telegram_bot/handler.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 require 'active_support/inflector'
 
 require_relative 'matcher'
-require_relative 'blank_slate'
+require_relative 'message_proxy'
 
 class TelegramBot
   module EventHandler
@@ -51,23 +51,14 @@ class TelegramBot
     end
 
     def handle(msg)
-      env = BlankSlate.new
-      self.extend_env(env)
-      msg.extend_env(env)
-
       @handlers.each do |hndlr|
         next unless hndlr === msg
 
-        hndlr.matcher.extend_env(env, msg)
-
-        env.extend do
-          define_method :handler do
-            hndlr
-          end
-        end
+        proxy = MessageProxy.new(self, msg, hndlr)
+        proxy.instance_exec(*hndlr.arguments(msg),
+                            &hndlr.action)
 
-        env.call(*hndlr.arguments(msg),
-                 &hndlr.action)
+        break unless hndlr.pass?
       end
     end
   end

data/lib/telegram_bot/matcher.rb

@@ -1,9 +1,5 @@
 class TelegramBot
   class Matcher
-    def env(msg)
-      msg.extend(BasicObject.new)
-    end
-
     def ===(_)
       false
     end
@@ -11,10 +7,6 @@ class TelegramBot
     def arguments(msg)
       []
     end
-
-    def extend_env(obj, msg)
-      obj
-    end
   end
 
   class TextMatcher < Matcher
@@ -30,22 +22,6 @@ class TelegramBot
       @pattern === msg.text
     end
 
-    def extend_env(obj, msg)
-      obj = super
-
-      if Regexp === @pattern
-        md = @pattern.match(msg.text)
-        obj.extend do
-          md.names.each do |grp|
-            value = md[grp]
-            define_method grp { value }
-          end
-        end
-      end
-
-      obj
-    end
-
     def arguments(msg)
       if Regexp === @pattern
         md = @pattern.match(msg.text)

data/lib/telegram_bot/message.rb

@@ -77,22 +77,4 @@ class TelegramBot::Message <
   def is_reply?
     !!reply_to_message
   end
-
-  def extend_env(obj)
-    msg = self
-    obj.instance_eval do
-      @message = msg
-    end
-
-    members = self.members
-
-    obj.extend do
-      extend Forwardable
-      attr_reader :message
-      def_delegators :@message, *members
-      def_delegators :@message, :is_forward?, :is_reply?
-    end
-
-    obj
-  end
 end

data/lib/telegram_bot/message_proxy.rb

@@ -0,0 +1,18 @@
+require 'forwardable'
+require_relative 'shorthand_methods'
+
+class TelegramBot
+  class MessageProxy
+    extend Forwardable
+
+    attr_accessor :bot, :message, :matcher
+
+    def initialize(bot, message, matcher)
+      @bot = bot
+      @message = message
+      @matcher = matcher
+    end
+
+    include TelegramBot::ShorthandMethods
+  end
+end

data/lib/telegram_bot/version.rb

@@ -1,3 +1,3 @@
 class TelegramBot
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/telegram_bot.rb

@@ -28,19 +28,7 @@ class TelegramBot
   end
 
   def extend_env(env)
-    telegram_bot = self
-    env.extend do
-      define_method :bot do
-        telegram_bot
-      end
-      alias_method :client, :bot
-
-      define_method :history do
-        telegram_bot.history
-      end
-
-      include ShorthandMethods
-    end
+
   end
 
   def append_history(message)

data/telegram_bot_ruby.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shouya/telegram-bot"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = '> 2.0.0'
+  spec.required_ruby_version = '> 2.1.0'
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_bot_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Shou Ya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,7 +82,6 @@ files:
 - lib/telegram_bot.rb
 - lib/telegram_bot/audio.rb
 - lib/telegram_bot/auto_from_methods.rb
-- lib/telegram_bot/blank_slate.rb
 - lib/telegram_bot/chat.rb
 - lib/telegram_bot/contact.rb
 - lib/telegram_bot/date.rb
@@ -93,6 +92,7 @@ files:
 - lib/telegram_bot/location.rb
 - lib/telegram_bot/matcher.rb
 - lib/telegram_bot/message.rb
+- lib/telegram_bot/message_proxy.rb
 - lib/telegram_bot/objects.rb
 - lib/telegram_bot/photo_size.rb
 - lib/telegram_bot/poll_listener.rb
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/telegram_bot/blank_slate.rb

@@ -1,11 +0,0 @@
-class TelegramBot
-  class BlankSlate < Object
-    def extend(&block)
-      self.singleton_class.class_eval(&block)
-    end
-
-    def call(*args, &block)
-      self.instance_exec(*args, &block)
-    end
-  end
-end