noam_lemma 0.2.1.1 → 0.2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7eb397588c86f4970ea279d375d8ad27c0a957e
-  data.tar.gz: a713c269ab80e02c0568ac72f4b73e3c53ed2eb4
+  metadata.gz: 3bbf10fe6a3bf7744dc6a6f82fc654591f905c79
+  data.tar.gz: ac505598a7cb384d97e0baa10b8fb99a24cf14aa
 SHA512:
-  metadata.gz: 79f3177eee34fa4c385c4cc4f4007b79122a53eb7e98d6cfefed4cf12e19e44bec21515f49e9377c4be79fef148416ddddb9f080757dead0aacca886a8d1c079
-  data.tar.gz: 3aafc64b965e14ba84c4015da43664d0e0d9d95abb5e7ed608bf3f0a017580183deda117f03d6af2426d9f428635071ebd3240d4365173b53e658825f8a4ab8b
+  metadata.gz: 6f364b904d08a0d7cf26ea98aa90f2c56ca409d14a3dda1d9a995722f43ff23b11b3b756dea0842ad6825bc6c0b8f3324f18301aab642a6fb6bd4f0528f80954
+  data.tar.gz: 6ba94ba53aacc4194915bc7d113060e3ba1e8c532eeb02ab007244eb67ff2ede969eefab39cd42c287cc41ae4e749f82e8d59f009852aa069bcd2e4ffc8484c2

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.0

data/Rakefile

@@ -9,3 +9,5 @@ desc "perform verification tests"
 task :verify do
   Noam::LemmaVerification.run
 end
+
+task :default => :spec

data/examples/lemma_verification.rb

@@ -2,42 +2,89 @@ require "noam_lemma"
 
 class Noam::LemmaVerification
   def self.run
-    echo
-    plus_one
-    sum
-    name
+    VerifyUsingReturns.new.run
+    VerifyUsingBlocks.new.run
   end
 
-  def self.echo
-    lemma = Noam::Lemma.new("verification", ["Echo"], ["EchoVerify"])
-    lemma.advertise("lemma_verification")
-    event = lemma.listen
-    lemma.speak("EchoVerify", event.value)
-    lemma.stop
-  end
+  class VerifyTemplate
+    attr_reader :lemma
+
+    def run
+      lemma.advertise("lemma_verification")
+      verify
+      lemma.stop
+    end
+
+    private
+
+    def echo(event)
+      lemma.speak("EchoVerify", event.value)
+    end
+
+    def plus_one(event)
+      lemma.speak("PlusOneVerify", event.value + 1)
+    end
+
+    def sum(event)
+      lemma.speak("SumVerify", event.value.inject {|sum, v| sum + v})
+    end
+
+    def name(event)
+      fullname = "#{event.value["firstName"]} #{event.value["lastName"]}"
+      lemma.speak("NameVerify", {fullName: fullname})
+    end
 
-  def self.plus_one
-    lemma = Noam::Lemma.new("verification", ["PlusOne"], ["PlusOneVerify"])
-    lemma.advertise("lemma_verification")
-    event = lemma.listen
-    lemma.speak("PlusOneVerify", event.value + 1)
-    lemma.stop
+    def events
+      ["Echo", "PlusOne", "Sum", "Name"]
+    end
+
+    def speaks
+      ["EchoVerify", "PlusOneVerify", "SumVerify", "NameVerify"]
+    end
   end
 
-  def self.sum
-    lemma = Noam::Lemma.new("verification", ["Sum"], ["SumVerify"])
-    lemma.advertise("lemma_verification")
-    event = lemma.listen
-    lemma.speak("SumVerify", event.value.inject {|sum, v| sum + v})
-    lemma.stop
+  class VerifyUsingReturns < VerifyTemplate
+    def initialize
+      @lemma ||= Noam::Lemma.new("verification", events, speaks)
+    end
+
+    private
+
+    def verify
+      events.length.times { handle_event(lemma.listen) }
+    end
+
+    def handle_event(event)
+      case event.event
+      when "Echo"
+        echo(event)
+      when "PlusOne"
+        plus_one(event)
+      when "Sum"
+        sum(event)
+      when "Name"
+        name(event)
+      end
+    end
   end
 
-  def self.name
-    lemma = Noam::Lemma.new("verification", ["Name"], ["NameVerify"])
-    lemma.advertise("lemma_verification")
-    event = lemma.listen
-    fullname = "#{event.value["firstName"]} #{event.value["lastName"]}"
-    lemma.speak("NameVerify", {fullName: fullname})
-    lemma.stop
+  class VerifyUsingBlocks < VerifyTemplate
+    def initialize
+      @lemma = Noam::Lemma.new("verification")
+      prepare_lemma
+    end
+
+    private
+
+    def prepare_lemma
+      lemma.hear("Echo")    {|event| echo(event)}
+      lemma.hear("PlusOne") {|event| plus_one(event)}
+      lemma.hear("Sum")     {|event| sum(event)}
+      lemma.hear("Name")    {|event| name(event)}
+    end
+
+    def verify
+      events.length.times { lemma.listen }
+    end
   end
 end

data/lib/noam_lemma/lemma.rb

@@ -24,6 +24,10 @@ module Noam
       start(polo.host, polo.port)
     end
 
+    def hear(event_name, &block)
+      @message_filter.hear(event_name, &block)
+    end
+
     def speak(event, value)
       if @player
         @player.put(Noam::Message::Playable.new(@name, event, value))
@@ -34,7 +38,7 @@ module Noam
     end
 
     def listen
-      @listener.take
+      @message_filter.receive(@listener.take)
     end
 
     def stop
@@ -48,10 +52,6 @@ module Noam
       @message_filter.hears
     end
 
-    def set_message_filter(message_filter)
-      @message_filter = message_filter
-    end
-
     private
 
     def start(host, port)

data/lib/noam_lemma/version.rb

@@ -1,3 +1,3 @@
 module NoamLemma
-  VERSION = "0.2.1.1"
+  VERSION = "0.2.1.2"
 end

data/spec/noam_lemma/lemma_spec.rb

@@ -1,33 +1,20 @@
 describe Noam::Lemma do
-  SERVER_DELAY = 0.05
-
-  before(:each) do
-    FakeManager.start
-    @server = FakeManager.server
-    @lemma = Noam::Lemma.new("Example Lemma", ["event1"], ["event1"])
-    @lemma.discover
-    sleep(SERVER_DELAY)
-  end
-
-  after do
-    @lemma.stop
-    FakeManager.stop
-  end
+  SERVER_DELAY = 0.075
 
   describe "#new" do
     context "with provided arguments" do
-      let(:lemma) { Noam::Lemma.new("Example Lemma", ["event1"], ["event1"]) }
+      let(:lemma) { Noam::Lemma.new("Example Lemma", ["example_event"], ["sample_event"]) }
 
       it "sets #name to the given name" do
         lemma.name.should  == "Example Lemma"
       end
 
       it "sets #hears to the given hears" do
-        lemma.hears.should == ["event1"]
+        lemma.hears.should == ["example_event"]
       end
 
       it "sets #speaks to the given speaks" do
-        lemma.speaks.should == ["event1"]
+        lemma.speaks.should == ["sample_event"]
       end
     end
 
@@ -45,44 +32,86 @@ describe Noam::Lemma do
   end
 
   describe "#hears" do
-    let(:lemma) { Noam::Lemma.new("Example Lemma", ["example_event"]) }
+    let(:lemma) { Noam::Lemma.new("Example Lemma") }
+
+    it "is all messages hearable to the Lemma" do
+      lemma.hear("example_event") {}
+      lemma.hear("sample_event") {}
+      lemma.hears.should == ["example_event", "sample_event"]
+    end
 
-    it "delegates to the MessageFilter when set" do
-      message_filter = Noam::MessageFilter.new
-      message_filter.hear("sample_event") {}
-      lemma.set_message_filter(message_filter)
-      lemma.hears.should == message_filter.hears
+    it "does not contain duplicate messages" do
+      lemma.hear("example_event") {}
+      lemma.hear("example_event") {}
+      lemma.hears.should == ["example_event"]
     end
   end
 
-  describe "#discover" do
-    it "sends a registration message" do
-      @server.clients.length.should == 1
-      @server.clients.first.port.should be_an(Integer)
-      @server.clients.first.port.should_not == 0
+  context "with server communication" do
+    let(:server)  { FakeManager.server }
+
+    before(:each) do
+      FakeManager.start
+      lemma.discover
+      sleep(SERVER_DELAY)
     end
 
-    it "initializes listener and player" do
-      @lemma.listener.should_not be_nil
-      @lemma.player.should_not be_nil
+    after(:each) do
+      lemma.stop
+      FakeManager.stop
     end
-  end
 
-  describe "#speak" do
-    it "sends an event to the server" do
-      @lemma.speak("an event", "some value")
-      sleep(SERVER_DELAY)
-      @server.messages.map{|m| m[2]}.include?("an event").should be_true
+    describe "#discover" do
+      let(:lemma) { Noam::Lemma.new("Example Lemma") }
+
+      it "sends a registration message" do
+        server.clients.length.should == 1
+        server.clients.first.port.should be_an(Integer)
+        server.clients.first.port.should_not == 0
+      end
+
+      it "initializes listener and player" do
+        lemma.listener.should_not be_nil
+        lemma.player.should_not be_nil
+      end
+    end
+
+    describe "#hear" do
+      let(:lemma) { Noam::Lemma.new("Example Lemma") }
+
+      it "registers messages with blocks" do
+        message = nil
+        lemma.hear("example_event") {|event| message = event}
+        send_message_from_server("example_event")
+        lemma.listen
+        message.event.should == "example_event"
+      end
+    end
+
+    describe "#speak" do
+      let(:lemma) { Noam::Lemma.new("Example Lemma") }
+
+      it "sends a message to the server" do
+        lemma.speak("an event", "some value")
+        sleep(SERVER_DELAY)
+        server.messages.map {|m| m[2]}.include?("an event").should be_true
+      end
+    end
+
+    describe "#listen" do
+      let(:lemma) { Noam::Lemma.new("Example Lemma", ["example_event"]) }
+
+      it "returns a message from the server" do
+        send_message_from_server("example_event")
+        message = lemma.listen
+        message.source.should == "test-server"
+        message.event.should  == "example_event"
+        message.value.should  == "noam event"
+      end
     end
-  end
 
-  describe "#listen" do
-    it "returns a message from the server" do
-      @server.send_message(["event", "test-server", "event1", "noam event"])
-      message = @lemma.listen
-      message.source.should == "test-server"
-      message.event.should  == "event1"
-      message.value.should  == "noam event"
+    def send_message_from_server(source = "test-server", value = "noam event", message)
+      server.send_message(["event", source, message, value])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noam_lemma
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.2.1.2
 platform: ruby
 authors:
 - John Van Enk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md