balotelli 0.4.1 → 0.4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bfeedb4c09e7cdac32022e2cc033310c9254c48
-  data.tar.gz: 9f0af9c1914dc98ae0f61b6487a1ff40f71d3568
+  metadata.gz: 7addde5a832912208f7790a6559c172d818a555a
+  data.tar.gz: 0a86ccc08b3e928152d024d9e8e154aa36cdbf46
 SHA512:
-  metadata.gz: d580a3e378aee126aa667b675d6dec41d78d6c6e018f266bfbcdd7d36bc6cc9103ae33839f2400181b105386f50c312e820e77be570124edc489e34ac60405b9
-  data.tar.gz: 1687cc8f9f82a8d532fe2706f3812099c785c60e460208054e674ce75be6070de0e5763673b1f08a08cea45d4db4e3bd7376239cc599c89003fb250806092274
+  metadata.gz: a252b2a40886641e5912b5818416a53d014b3c2b1a026f9a688153c1a5397d162be1da2d4b755a36250ee27487cbe5526940eba3a77108c90a59b11982d18168
+  data.tar.gz: 9f37a6595af818d752e9cfcdd7814ad183ccf09364b6b36f6445ca8137e3b685bfdacd64cb9c1b809ec0307eccfc1f5910bdab42dfba919e1f59dfaa245d6450

data/.travis.yml

@@ -8,3 +8,12 @@ rvm:
   - 2.0
   - jruby-9
   - rbx
+  - 1.9.3
+  - ruby-head
+  - jruby-1.7
+matrix:
+  allow_failures:
+    - rvm: rbx
+    - rvm: 1.9.3
+    - rvm: ruby-head
+    - rvm: jruby-1.7

data/Gemfile.lock

@@ -1,16 +1,15 @@
 PATH
   remote: .
   specs:
-    balotelli (0.4.0)
+    balotelli (0.4.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.8.0)
+    minitest (5.8.5)
     rake (10.4.2)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/lib/balotelli/base.rb

@@ -9,19 +9,20 @@ require 'balotelli/config'
 
 module Balotelli
   class Base
-    def initialize(str, route, block, message, command)
-      @str = str
+    extend Core::Utils::ClassVariableGetter
+    class_variable_get :cache, :cvs, :mutex
+
+    def initialize(block, message, matchdata)
       @message = message
       @block = block
-      @route = route
-      @command = command
-      @matchdata = @command.match(@route)
+      @matchdata = matchdata
     end
 
-    def execute
+    def execute!
       instance_exec(@message, @matchdata, &@block)
     end
-    private :execute
+
+    alias execute execute!
 
     def out(message_string, destination = nil)
       self.class.privmsg((destination || @message.responder), message_string)
@@ -35,19 +36,20 @@ module Balotelli
       execute_in_mutex(channel) do
         self.class.names(channel)
       end
-      __CACHE__[:user_list][channel]
+      cache[:user_list][channel]
     end
 
     def execute_in_mutex(channel)
       cv = ConditionVariable.new
-      if __CVS__.key? channel
-        __CVS__[channel] << cv
+      if cvs.key? channel
+        cvs[channel] << cv
       else
-        __CVS__[channel] = [cv]
+        cvs[channel] = [cv]
       end
       yield
-      __MUTEX__.synchronize { cv.wait(__MUTEX__) }
+      mutex.synchronize { cv.wait(mutex) }
     end
+    private :execute_in_mutex
 
     def method_missing(method, *args, **params, &block)
       if method =~ /__([[[:upper:]]_]+)__/
@@ -93,6 +95,8 @@ module Balotelli
       def mod_match(str, priv = false)
         if str =~ /\A[^a-zA-Z0-9\s]?(\S+) ?(.*)/
           if (mod = @cache[:modules][Regexp.last_match(1).downcase])
+            str.slice!(0..Regexp.last_match(1).length)
+            str.lstrip!
             mod.match(Regexp.last_match(2), priv)
           end
         elsif str == :join
@@ -128,40 +132,52 @@ module Balotelli
 
       def process_message(str)
         if str =~ Core::Utils::PRIV_MSG_REGEX
-          metadata = { user: Regexp.last_match(1), channel: Regexp.last_match(2), message: Regexp.last_match(3) }
-          priv = !(Regexp.last_match(2) =~ /#.+/)
-          if (match = match(metadata[:message], priv)) ||
-             (match = mod_match(metadata[:message], priv))
-            new_response(str, match, metadata, Core::PrivMsg, priv)
-          end
+          process_private_message(str, *Regexp.last_match[1..3])
         elsif str =~ Core::Utils::JOIN_REGEX
-          metadata = { user: Regexp.last_match(1), channel: Regexp.last_match(2) }
-          if (match = match(:join)) || (match = mod_match(:join))
-            new_response(str, match, metadata, Core::Join)
-          end
+          process_join(str, *Regexp.last_match[1..2])
         end
       end
 
-      def new_response(str, match, metadata, klass, priv = nil)
-        route, block, mod, command = match.flatten
-        message = klass.new(*[metadata, priv].compact)
-        new(str, route, block, message, command).tap do |response|
-          response.extend(mod) if mod.class.to_s == 'Module'
-        end.send(:execute)
+      def process_private_message(str, user, channel, message)
+        privacy = !(channel =~ /#.+/)
+        if (route = match(message, privacy)) ||
+           (route = mod_match(message, privacy))
+          new_response(user, channel, message, route, Core::PrivMsg, privacy)
+        end
+      end
+
+      def process_join(str, user, channel)
+        if (route = match(:join)) || (route = mod_match(:join))
+          new_response(user, channel, nil, route, Core::Join)
+        end
+      end
+
+
+      def new_response(user, channel, message, route_match, klass, priv = nil)
+        route_pattern, block, module_name = route_match.flatten
+        message = klass.new(*[user, channel, message, priv].compact)
+        matchdata = message.content.match(route_pattern) if route_pattern.is_a?(Regexp)
+        new(block, message, matchdata).tap do |response|
+          response.extend(module_name) if module_name.class.to_s == 'Module'
+        end.execute!
       end
 
       def process_table(string)
         if @cvs.any? && string =~ (regex = Core::Utils.table_regex(@nick))
-          metadata = { channel: Regexp.last_match(2), message: Regexp.last_match(3) }
-          users = @cache[:user_list][metadata[:channel]] = metadata[:message]
+          channel = Regexp.last_match(2)
+          users = Regexp.last_match(3)
           until (str = sgets) =~ %r{End of \/NAME}i
             users << " #{str.match(regex).captures.first}"
           end
-          @cache[:user_list][metadata[:channel]] = users.split(' ')
-          @cvs[metadata[:channel]].shift.signal
-          @cvs.delete(metadata[:channel]) if @cvs[metadata[:channel]].empty?
+          @cache[:user_list][channel] = users.split(' ')
+          signal_cvs(channel)
         end
       end
+
+      def signal_cvs(channel)
+        @cvs[channel].shift.signal
+        @cvs.delete(channel) if @cvs[channel].empty?
+      end
     end
   end
 end

data/lib/balotelli/core/irc_logger.rb

@@ -23,37 +23,19 @@ module Balotelli
       def included(des)
         super
 
-        define_log_method
-
         des.instance_variable_set(:@log_file, log_file)
         des.instance_variable_set(:@logger, self)
+
+        define_log_method
+
         class << des
           alias_method :orig_sputs, :sputs
           private :orig_sputs
 
-          def sputs(str)
-            orig_sputs(str)
-            to_log = ">>#{str.inspect}\n"
-            @log_file.info(to_log)
-            if str =~ /\A:?\S+ (#\S+) .*/
-              @logger.channel_log(Regexp.last_match(1).downcase, to_log)
-            end
-            str
-          end
-
           alias_method :orig_sgets, :sgets
           private :orig_sgets
-
-          def sgets
-            str = orig_sgets
-            to_log = "<<#{str.inspect}\n"
-            @log_file.info(to_log)
-            if str =~ /\A:?\S+ \S+ (#\S+) .*/
-              @logger.channel_log(Regexp.last_match(1).downcase, to_log)
-            end
-            str
-          end
         end
+        des.extend(Methods)
       end
 
       def channel_log(channel, to_log)
@@ -62,16 +44,42 @@ module Balotelli
         end
       end
 
-      private
+      module Methods
+        def sgets
+          str = orig_sgets
+          to_log = "<<#{str.inspect}\n"
+          @log_file.info(to_log)
+          if str =~ /\A:?\S+ \S+ (#\S+) .*/
+            @logger.channel_log(Regexp.last_match(1).downcase, to_log)
+          end
+          str
+        end
+
+        def sputs(str)
+          orig_sputs(str)
+          to_log = ">>#{str.inspect}\n"
+          @log_file.info(to_log)
+          if str =~ /\A:?\S+ (#\S+) .*/
+            @logger.channel_log(Regexp.last_match(1).downcase, to_log)
+          end
+          str
+        end
+      end
 
       def define_log_method
+        define_method :log_file do |str|
+          class_variable_get(:@log_file)
+        end
+
         define_method :log do |str|
           log_string = "LOG: #{str.inspect}\n"
-          __LOG_FILE__.info log_string
+          log_file.info log_string
           puts log_string
         end
       end
 
+      private
+
       def channel_log_file(channel)
         "#{channel.tr('#', '')}_logs.log"
       end

data/lib/balotelli/core/join.rb

@@ -1,12 +1,15 @@
 module Balotelli
   module Core
     class Join
-      attr_reader :user, :channel, :user_nick, :responder
-      def initialize(metadata)
-        @user = metadata[:user]
+      attr_reader :user, :channel, :user_nick
+      def initialize(user, channel)
+        @user = user
         @user_nick = Core::Utils.nick_from_user(@user)
-        @channel = metadata[:channel]
-        @responder = @channel
+        @channel = channel
+      end
+
+      def responder
+        @channel
       end
     end
   end

data/lib/balotelli/core/priv_msg.rb

@@ -2,16 +2,12 @@ module Balotelli
   module Core
     class PrivMsg
       attr_reader :user, :channel, :content, :user_nick, :responder
-      def initialize(metadata, privacy = false)
-        @user = metadata[:user]
+      def initialize(user, channel, message, privacy = false)
+        @user = user
         @user_nick = @user.match(/\A(\S+)!.*/)[1]
-        @channel = metadata[:channel]
-        @content = metadata[:message]
-        @responder = if privacy
-                       @user_nick
-                     else
-                       @channel
-                     end
+        @channel = channel
+        @content = message
+        @responder = privacy ? @user_nick : @channel
       end
     end
   end

data/lib/balotelli/core/router.rb

@@ -38,7 +38,7 @@ module Balotelli
 
       def match(str, priv = false)
         if (m = @routes.detect { |k, v| match?(str, k) && v[priv] })
-          [m[0], m[1][priv], str]
+          [m[0], m[1][priv]]
         end
       end
     end

data/lib/balotelli/core/utils.rb

@@ -14,6 +14,14 @@ module Balotelli
       def table_regex(nick)
         /\A:?(\S+) \d+ #{nick} \S (#\S+) :?(.*)/
       end
+
+      module ClassVariableGetter
+        def class_variable_get(*args)
+          args.each do |s|
+            define_method(s) { self.class.instance_variable_get("@#{s}") }
+          end
+        end
+      end
     end
   end
 end

data/lib/balotelli/version.rb

@@ -1,3 +1,3 @@
 module Balotelli
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2.1'.freeze
 end

data/test/lib/balotelli/core/router_test.rb

@@ -20,7 +20,7 @@ class RouterTest < Minitest::Test
   def test_it_mathes_routes
     lam = -> { puts 'kk' }
     @route.on %r{ono}i, private: true, &lam
-    assert @route.match('onOmatopeja', true) == [%r{ono}i, [lam, @route], 'onOmatopeja']
+    assert @route.match('onOmatopeja', true) == [%r{ono}i, [lam, @route]]
     refute @route.match('onOmatopeja', false)
     @route.on 'asdf', &lam
     assert @route.match('asdf')

data/test/lib/balotelli/core/utils_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class SampleClass
+  extend Balotelli::Core::Utils::ClassVariableGetter
+  class_variable_get :one, :string
+
+  def initialize
+  end
+end
+
+class ClassVariableGetterTest < Minitest::Test
+  def setup
+    @instance = SampleClass.new
+    SampleClass.instance_variable_set(:@one, 1)
+    SampleClass.instance_variable_set(:@string, 'string')
+  end
+
+  def test_it_defines_methods
+    assert @instance.one == 1
+    assert @instance.string == 'string'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balotelli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2.1
 platform: ruby
 authors:
 - Marcin Henryk Bartkowiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - test/lib/balotelli/config_test.rb
 - test/lib/balotelli/core/irc_test.rb
 - test/lib/balotelli/core/router_test.rb
+- test/lib/balotelli/core/utils_test.rb
 - test/lib/balotelli/special_one.rb
 - test/lib/balotelli/xyz.rb
 - test/test_helper.rb
@@ -120,6 +121,7 @@ test_files:
 - test/lib/balotelli/config_test.rb
 - test/lib/balotelli/core/irc_test.rb
 - test/lib/balotelli/core/router_test.rb
+- test/lib/balotelli/core/utils_test.rb
 - test/lib/balotelli/special_one.rb
 - test/lib/balotelli/xyz.rb
 - test/test_helper.rb