pubsub 0.0.0 → 0.0.1

data/.autotest

@@ -0,0 +1 @@
+require 'autotest/growl'

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -7,4 +7,8 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+
+  gem "rspec"
+  gem "ZenTest"
+  gem "autotest-growl"
 end

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/pubsub.rb

@@ -1,61 +1,2 @@
 require "ruby_events"
-require File.join(File.dirname(__FILE__), "pubsub/pubsub.rb")
-
-module DigitalPro
-  module Events
-    module PubSub
-      def subscribe(channel, procs = nil, &block)
-        logger.info "Subscribe #{self.class.name} to #{channel}"
-
-        PubSub.events.listen channel, procs, &block
-
-        procs_collected = []
-        if procs.respond_to?(:each) && procs.respond_to?(:to_a)
-          procs_collected += procs.to_a
-        elsif procs
-          procs_collected << procs
-        end
-        procs_collected << block if block
-
-        channel_handlers[channel] ||= []
-        channel_handlers[channel] += procs_collected
-      end
-
-      def unsubscribe(channel=nil, proc = nil)
-        # unsubscribe from all object channels
-        unless channel
-          channel_handlers.each_key{ |channel_name| unsubscribe channel_name}
-          return
-        end
-
-        if proc
-          logger.info "Unsubscribe #{self.class.name} to #{channel}"
-          PubSub.events.remove channel, proc
-          channel_handlers[channel].delete_if {|stored_event| stored_event == proc} if channel_handlers.include? channel
-        else
-          channel_handlers[channel].each { |proc_handler| unsubscribe channel, proc_handler} if channel_handlers.include? channel
-        end
-      end
-
-      def publish(channel, *args)
-        logger.info "Publish #{self.class.name} to #{channel} with #{args.to_s}"
-
-        channel.sub_before "/" do |sub_channel|
-          PubSub.events.fire sub_channel, *args
-        end
-        PubSub.events.fire "*", *args
-      end
-
-      protected
-
-      def channel_handlers
-        @channel_handlers ||= {}
-      end
-
-      def PubSub.events
-        @@events ||= RubyEvents::Events.new(self)
-      end
-
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), "pubsub/pubsub.rb")

data/lib/pubsub/logger.rb

@@ -0,0 +1,12 @@
+require "logger"
+
+class Object
+  @@logger = nil
+  def logger
+    unless @@logger
+      @@logger = Logger.new(STDERR)
+      @@logger.level = Logger::DEBUG
+    end
+    @@logger
+  end
+end

data/lib/pubsub/pubsub.rb

@@ -1,55 +1,108 @@
 require "ruby_events"
+require File.join(File.dirname(__FILE__), "logger.rb")
 require File.join(File.dirname(__FILE__), "string.rb")
 
 module PubSub
   def subscribe(channel, procs = nil, &block)
-    logger.info "Subscribe #{self.class.name} to #{channel}"
+    mutex.synchronize do
+      logger.info "Subscribe #{self.class.name} to #{channel}"
 
-    PubSub.events.listen channel, procs, &block
+      PubSub.events.listen channel, procs, &block
 
-    procs_collected = []
-    if procs.respond_to?(:each) && procs.respond_to?(:to_a)
-      procs_collected += procs.to_a
-    elsif procs
-      procs_collected << procs
-    end
-    procs_collected << block if block
+      procs_collected = []
+      if procs.respond_to?(:each) && procs.respond_to?(:to_a)
+        procs_collected += procs.to_a
+      elsif procs
+        procs_collected << procs
+      end
+      procs_collected << block if block
 
-    channel_handlers[channel] ||= []
-    channel_handlers[channel] += procs_collected
+      channel_handlers[channel] ||= []
+      channel_handlers[channel] += procs_collected
+    end
   end
 
   def unsubscribe(channel=nil, proc = nil)
-    # unsubscribe from all object channels
-    unless channel
-      channel_handlers.each_key{ |channel_name| unsubscribe channel_name}
-      return
+    mutex.synchronize do
+      unsubscribe_safe(channel, proc )
     end
+  end
 
-    if proc
-      logger.info "Unsubscribe #{self.class.name} to #{channel}"
-      PubSub.events.remove channel, proc
-      channel_handlers[channel].delete_if {|stored_event| stored_event == proc} if channel_handlers.include? channel
-    else
-      channel_handlers[channel].each { |proc_handler| unsubscribe channel, proc_handler} if channel_handlers.include? channel
+  def publish(channel, *args)
+    mutex.synchronize do
+      logger.info "Add to publish queue #{self.class.name} to #{channel} with #{args.to_s}"
+      PubSub.queue.push({:sender => self, :channel => channel, :params => args})
+      PubSub.thread.wakeup if PubSub.thread.status == "sleep"
     end
   end
 
-  def publish(channel, *args)
-    logger.info "Publish #{self.class.name} to #{channel} with #{args.to_s}"
+  def PubSub.run
+    @@stopped = false
+    PubSub.thread
+    while true
+      if @@stopped
+        PubSub.queue.clear
+        break
+      end
+
+      sleep if PubSub.queue.empty?
+
+      unless PubSub.queue.empty?
+        publish_info = PubSub.queue.shift
+        sender = publish_info[:sender]
+        channel = publish_info[:channel]
+        params = publish_info[:params]
+        logger.info "Publish ObjectID:#{sender.__id__} of class #{sender.class.name} to #{channel} with #{params.to_s}"
 
-    channel.sub_before "/" do |sub_channel|
-      PubSub.events.fire sub_channel, *args
+        channel.sub_before "/" do |sub_channel|
+          PubSub.events.fire sub_channel, *params
+        end
+        PubSub.events.fire "*", *params
+      end
     end
-    PubSub.events.fire "*", *args
+  end
+
+  def PubSub.stop
+    @@stopped = true
   end
 
   protected
 
+  def mutex
+    @mutex ||= Mutex.new
+  end
+
   def channel_handlers
     @channel_handlers ||= {}
   end
 
+  def unsubscribe_safe(channel=nil, proc = nil)
+      # unsubscribe from all object channels
+      unless channel
+        channel_handlers.each_key{ |channel_name| unsubscribe_safe channel_name}
+        return
+      end
+
+      unless proc
+        logger.info "Unsubscribe #{self.class.name} from #{channel}"
+        channel_handlers[channel].each { |proc_handler| PubSub.events.remove channel, proc_handler }if channel_handlers.include? channel
+        channel_handlers[channel].clear
+        return
+      end
+
+      logger.info "Unsubscribe #{self.class.name} from #{channel} listener #{proc}"
+      PubSub.events.remove channel, proc
+      channel_handlers[channel].delete_if {|stored_event| stored_event == proc} if channel_handlers.include? channel
+  end
+
+  def PubSub.thread
+    @@thread ||= Thread.current
+  end
+
+  def PubSub.queue
+    @@queue ||= []
+  end
+
   def PubSub.events
     @@events ||= RubyEvents::Events.new(self)
   end

data/spec/pubsup_spec.rb

@@ -0,0 +1,64 @@
+require File.join(File.dirname(__FILE__), "spec_helper.rb")
+
+describe "Object with PubSub pattern" do
+  before(:each) do
+    PubSub.events.events_collection.clear
+    @publisher  = Publisher.new
+    @subscriber = Subscriber.new
+  end
+
+  it "should subscribe on channel" do
+    @subscriber.subscribe "channel", @subscriber.method(:listener)
+    PubSub.events.events_collection.size.should == 1
+    PubSub.events.events_collection.should have_key "channel"
+  end
+
+  it "should unsubscribe specific listeners from channel" do
+    @subscriber.subscribe "channel", @subscriber.method(:listener)
+    @subscriber.unsubscribe "channel", @subscriber.method(:listener)
+    PubSub.events.events_collection["channel"].should be_empty
+  end
+
+  it "should unsubscribe all listeners from channel" do
+    @subscriber.subscribe "channel", @subscriber.method(:listener)
+    @subscriber.subscribe "channel", @subscriber.method(:listener1)
+    @subscriber.unsubscribe "channel"
+    PubSub.events.events_collection["channel"].should be_empty
+  end
+
+  it "should unsubscribe from all channels" do
+    @subscriber.subscribe "channel", @subscriber.method(:listener)
+    @subscriber.subscribe "channel1", @subscriber.method(:listener1)
+    @subscriber.unsubscribe
+    PubSub.events.events_collection["channel"].should be_empty
+    PubSub.events.events_collection["channel1"].should be_empty
+  end
+
+  it "should publish message to channel" do
+    @subscriber.should_receive(:listener).with("Hello world")
+    @subscriber.subscribe "channel", @subscriber.method(:listener)
+    @subscriber.subscribe "channel", @subscriber.method(:listener_with_stop)
+    @publisher.publish("channel", "Hello world")
+    PubSub.run
+  end
+
+  it "should publish message to channel and subchannel" do
+    @subscriber.should_receive(:listener).with("Hello world")
+    @subscriber.subscribe "test/channel", @subscriber.method(:listener)
+
+    @subscriber.should_receive(:listener1).with("Hello world")
+    @subscriber.subscribe "test", @subscriber.method(:listener1)
+
+    @subscriber.subscribe "test/channel", @subscriber.method(:listener_with_stop)
+    @publisher.publish("test/channel", "Hello world")
+    PubSub.run
+  end
+
+  it "should publish message to global channel" do
+    @subscriber.should_receive(:listener).with("Hello world")
+    @subscriber.subscribe "*", @subscriber.method(:listener)
+    @subscriber.subscribe "*", @subscriber.method(:listener_with_stop)
+    @publisher.publish("channel", "Hello world")
+    PubSub.run
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'pubsub'
+
+logger.level = Logger::WARN
+
+module PubSub
+  PubSub.events.class.class_eval do
+    def events_collection
+      @events
+    end
+  end
+end
+
+class Publisher
+  include PubSub
+end
+
+class Subscriber
+  include PubSub
+
+  def listener(message = nil)
+    logger.info "listener_with_stop"
+  end
+
+  def listener1(message = nil)
+  end
+
+  def listener_with_stop(message = nil)
+    PubSub.stop
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubsub
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 +04:00
+date: 2011-07-17 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_events
-  requirement: &11460780 !ruby/object:Gem::Requirement
+  requirement: &18948040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11460780
+  version_requirements: *18948040
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11458140 !ruby/object:Gem::Requirement
+  requirement: &18946840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11458140
+  version_requirements: *18946840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11419840 !ruby/object:Gem::Requirement
+  requirement: &18946080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11419840
+  version_requirements: *18946080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11418620 !ruby/object:Gem::Requirement
+  requirement: &18945200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *11418620
+  version_requirements: *18945200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &11417000 !ruby/object:Gem::Requirement
+  requirement: &18944220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11417000
+  version_requirements: *18944220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18943460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18943460
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &18928680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18928680
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: &18927540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18927540
 - !ruby/object:Gem::Dependency
   name: ruby_events
-  requirement: &11414840 !ruby/object:Gem::Requirement
+  requirement: &18921320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11414840
+  version_requirements: *18921320
 description: PubSub pattern
 email: maxkazargm@gmail.com
 executables: []
@@ -86,17 +119,21 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- .autotest
 - .document
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- autotest/discover.rb
 - lib/pubsub.rb
+- lib/pubsub/logger.rb
 - lib/pubsub/pubsub.rb
 - lib/pubsub/string.rb
-- test/helper.rb
-- test/test_pubsub.rb
+- spec/pubsup_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/maxkazar/pubsub
 licenses:
@@ -113,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3917047595112901718
+      hash: -2541202216032154175
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'pubsub'
-
-class Test::Unit::TestCase
-end

data/test/test_pubsub.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestPubsub < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end