arpie 0.0.6 → 0.1.0

data/spec/bytes_binary_type_spec.rb

@@ -11,7 +11,7 @@ describe "BytesBinaryType" do
     ]
   }
 
-    it_should_behave_like "Binary Tests with data"
+    include_examples "Binary Tests with data"
   end
 
   describe "virtual length" do subject {
@@ -24,7 +24,7 @@ describe "BytesBinaryType" do
     ]
   }
 
-    it_should_behave_like "Binary Tests with data"
+    include_examples "Binary Tests with data"
   end
 
   describe "length as virtual should not update the virtual" do subject {
@@ -37,7 +37,7 @@ describe "BytesBinaryType" do
     ]
   }
 
-    it_should_behave_like "Binary Tests with data"
+    include_examples "Binary Tests with data"
 
     it "does not change virtuals on data change" do
       dd, b = @c.from(@d + "xxyzz")
@@ -46,4 +46,17 @@ describe "BytesBinaryType" do
       dd.to.should == expect
     end
   end
+
+  describe "NULL-terminated strings" do subject {
+    [
+      Class.new(Arpie::Binary) do
+        field :s, :nstring
+        field :d, :uint8
+      end,
+      ["abcd", 4].pack("Z* C")
+    ]
+  }
+
+    include_examples "Binary Tests with data"
+  end
 end

data/spec/em_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+require 'eventmachine'
+
+describe 'Eventmachine usecase' do
+  specify do
+    $m = nil
+
+    EM::run {
+      EM::start_server "127.0.0.1", 19400, Arpie::EventMachine::ArpieProtocol,
+          Arpie::SeparatorProtocol.new do |proto|
+        def proto.receive(message)
+          $m = message
+          EventMachine::stop_event_loop
+        end
+      end
+
+      EM::connect "127.0.0.1", 19400, Arpie::EventMachine::ArpieProtocol,
+          Arpie::SeparatorProtocol.new do |proto|
+
+        proto.send("hi")
+      end
+    }
+
+    $m.should == "hi"
+  end
+end

data/spec/examples_spec.rb

@@ -0,0 +1,11 @@
+EXPATH = File.dirname(__FILE__) + "/../examples"
+
+describe "examples" do
+  for rb in Dir[EXPATH + "/*.rb"] do
+    describe rb do specify {
+      ret = `ruby -I#{File.dirname(__FILE__) + "/../lib"} #{rb}`
+      $?.should == 0
+      ret.strip.should == "ih"
+    } end
+  end
+end

data/spec/fixed_binary_type_spec.rb

@@ -15,11 +15,11 @@ describe FixedBinaryType do
   end
 
   it "should raise error on mismatch in #from" do
-    proc { subject.from("aaa", :value => "aaaa") }.should raise_error StreamError
+    proc { subject.from("aaa", :value => "aaaa") }.should raise_error Arpie::EIncomplete
   end
 
   it "raises error on mismatch in #to" do
-    proc { subject.to("aaa", :value => "aaaa") }.should raise_error StreamError
+    proc { subject.to("aaa", :value => "aaaa") }.should raise_error Arpie::StreamError
   end
 
   it "raiseserror on missing option" do

data/spec/list_binary_type_spec.rb

@@ -30,5 +30,14 @@ describe "ListBinaryType" do
     it "raises EIncomplete when partial data remains" do
       proc { Outer.from [8, 0, 1, 2, 3, 4, 5, 6, 7,  4, 1, 2 ].pack("C*") }.should raise_error Arpie::EIncomplete
     end
+
+    it "fails on invalid length specification" do
+      klass = Class.new(Arpie::Binary) do
+        list :maxonly, :of => :char,
+          :sizeof => :int8
+      end
+
+      proc { klass.from("\xff") }.should raise_error StreamError
+    end
   end
 end

data/spec/protocol_merge_and_split_spec.rb

@@ -36,7 +36,7 @@ class Merger < Arpie::Protocol
 end
 
 describe "Merger::Splitter::Sized" do subject { [Splitter, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChainSetup"
+  include_examples "ProtocolChainSetup"
 
   it "should split messages correctly" do
     chain_write(t = 'test')
@@ -48,7 +48,7 @@ describe "Merger::Splitter::Sized" do subject { [Splitter, Arpie::SizedProtocol]
 end
 
 describe "Merger::Splitter::Sized" do subject { [Merger, Splitter, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChainSetup"
+  include_examples "ProtocolChainSetup"
 
   it "should assemble split messages correctly" do
     chain_write(t = 'test')
@@ -57,7 +57,7 @@ describe "Merger::Splitter::Sized" do subject { [Merger, Splitter, Arpie::SizedP
 end
 
 describe "Merger::BufferedSplitter::Sized" do subject { [Merger, BufferedSplitter, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChainSetup"
+  include_examples "ProtocolChainSetup"
 
   it "should re-read io for more data if assembly fails" do
     @chain.write_message(@w, "split")

data/spec/protocol_spec.rb

@@ -1,11 +1,12 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe "ProtocolChain", :shared => true do
-  it_should_behave_like "ProtocolChainSetup"
+shared_examples "ProtocolChain" do
+  include_examples "ProtocolChainSetup"
 
   it "should convert without io correctly" do
     v = @chain.to @testdata_a
-    @chain.from(v).should == [@testdata_a]
+    from = @chain.from(v[0])
+    from[0].should == @testdata_a
   end
 
   it "should read written binary data correctly" do
@@ -40,8 +41,11 @@ describe "ProtocolChain", :shared => true do
   end
 
   it "should read messages greater than MTU correctly" do
-    chain_write(message = (@testdata_a * (Arpie::MTU + 10)))
-    chain_read.should == message
+    unless @testdata_a.is_a?(Array)
+      message = @testdata_a * (Arpie::MTU + 10)
+      chain_write(message)
+      chain_read.should == message
+    end
   end
 
   it "should not fail on interleaved io streams" do
@@ -54,8 +58,8 @@ describe "ProtocolChain", :shared => true do
   end
 end
 
-describe "ObjectProtocolChain", :shared => true do
-  it_should_behave_like "ProtocolChain"
+shared_examples "ObjectProtocolChain" do
+  include_examples "ProtocolChain"
   # Now, lets try some variations.
 
   it "should read written objects correctly" do
@@ -69,8 +73,8 @@ describe "ObjectProtocolChain", :shared => true do
   end
 end
 
-describe "RPCProtocolChain", :shared => true do
-  it_should_behave_like "RPCProtocolChainSetup"
+shared_examples "RPCProtocolChain" do
+  include_examples "RPCProtocolChainSetup"
 
   it "should send namespace-less RPC calls correctly encoded" do
     call = Arpie::RPCall.new(nil, 'meth', [1, 2, 3])
@@ -101,56 +105,29 @@ end
 # Now, lets try some variations.
 
 describe "Sized" do subject { [Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChain"
+  include_examples "ProtocolChain"
 end
 
 describe "Sized::Sized" do subject { [Arpie::SizedProtocol, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChain"
+  include_examples "ProtocolChain"
 end
 
 describe "Sized::Marshal::Sized" do subject { [Arpie::SizedProtocol, Arpie::MarshalProtocol, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChain"
+  include_examples "ProtocolChain"
 end
 
 describe "Zlib::Marshal::Sized" do subject { [Arpie::ZlibProtocol, Arpie::MarshalProtocol, Arpie::SizedProtocol] }
-  it_should_behave_like "ProtocolChain"
+  include_examples "ProtocolChain"
 end
 
 # Shellwords is a bit of a special case, because it only encodes arrays.
 describe "Shellwords::Separator" do subject { [Arpie::ShellwordsProtocol, Arpie::SeparatorProtocol] }
-  it_should_behave_like "ProtocolChain"
+  include_examples "ProtocolChain"
   before do
     @testdata_a, @testdata_b = ['I am test', '1'], ['I am test', '2']
   end
 end
 
-describe "HTTPTest" do subject { [Arpie::HTTPClientTestProtocol] }
-  it_should_behave_like "ProtocolChain"
-end
-
-describe "HTTPTest" do subject { [Arpie::HTTPServerTestProtocol] }
-  it_should_behave_like "ProtocolChain"
-end
-
-describe "YAML" do subject { [Arpie::YAMLProtocol] }
-  it_should_behave_like "ObjectProtocolChain"
+describe "YAML::Sized" do subject { [Arpie::YAMLProtocol, Arpie::SizedProtocol] }
+  include_examples "ObjectProtocolChain"
 end
-
-describe "XMLRPC::Sized" do subject {
-    [
-      [Arpie::XMLRPCClientProtocol, Arpie::SizedProtocol],
-      [Arpie::XMLRPCServerProtocol, Arpie::SizedProtocol]
-    ]
-  }
-  it_should_behave_like "RPCProtocolChain"
-end
-
-describe "XMLRPC::HTTPTest" do subject {
-    [
-      [Arpie::XMLRPCClientProtocol, Arpie::HTTPClientTestProtocol],
-      [Arpie::XMLRPCServerProtocol, Arpie::HTTPServerTestProtocol]
-    ]
-  }
-  it_should_behave_like "RPCProtocolChain"
-end
-

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ unless Object.const_defined?('Arpie')
 end
 include Arpie
 
-describe "IO Mockup", :shared => true do
+shared_examples "IO Mockup" do
   before do
     @r, @w = IO.pipe
   end
@@ -30,8 +30,8 @@ describe "IO Mockup", :shared => true do
   end
 end
 
-describe "ProtocolChainSetup", :shared => true do
-  it_should_behave_like "IO Mockup"
+shared_examples "ProtocolChainSetup" do
+  include_examples "IO Mockup"
 
   before do
     @chain = Arpie::ProtocolChain.new(* subject.map {|x| x.new })
@@ -46,8 +46,8 @@ describe "ProtocolChainSetup", :shared => true do
   end
 end
 
-describe "RPCProtocolChainSetup", :shared => true do
-  it_should_behave_like "IO Mockup"
+shared_examples "RPCProtocolChainSetup" do
+  include_examples "IO Mockup"
 
   before do
     @client = Arpie::ProtocolChain.new(* subject[0].map {|x| x.new })
@@ -59,15 +59,16 @@ end
 
 
 
-describe "Binary Setup", :shared => true do
+shared_examples "Binary Setup" do
+end
+
+shared_examples "Binary Tests" do
+  include_examples "Binary Setup"
+
   before do
     @c = subject[0]
     @d = subject[1]
   end
-end
-
-describe "Binary Tests", :shared => true do
-  it_should_behave_like "Binary Setup"
 
   it "reads and packs the given example binary" do
     dd, b = @c.from(@d)
@@ -75,8 +76,8 @@ describe "Binary Tests", :shared => true do
   end
 end
 
-describe "Binary Tests with data", :shared => true do
-  it_should_behave_like "Binary Tests"
+shared_examples "Binary Tests with data" do
+  include_examples "Binary Tests"
 
   it "should raise EIncomplete when not enough data is available" do
     proc { @c.from("")}.should raise_error Arpie::EIncomplete

metadata

@@ -1,102 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arpie
-version: !ruby/object:Gem::Version 
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bernhard Stoeckner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-08-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
-description: A high-performing layered networking protocol framework. Simple to use, simple to extend.
-email: elven@swordcoast.net
+date: 2012-04-30 00:00:00.000000000 Z
+dependencies: []
+description: Toolkit for handling binary data, network protocols, file formats, and
+  similar
+email:
+- le@e-ix.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-- COPYING
-- BINARY_SPEC
-files: 
-- COPYING
-- README
+extra_rdoc_files: []
+files:
+- .gitignore
+- .yardopts
+- BINARY.rdoc
+- Gemfile
+- LICENCE
+- PROTOCOLS.rdoc
+- README.rdoc
 - Rakefile
-- spec/protocol_merge_and_split_spec.rb
-- spec/protocol_spec.rb
-- spec/bytes_binary_type_spec.rb
-- spec/fixed_binary_type_spec.rb
-- spec/list_binary_type_spec.rb
-- spec/spec.opts
-- spec/rcov.opts
-- spec/spec_helper.rb
-- spec/binary_spec.rb
-- spec/client_server_spec.rb
-- lib/arpie/xmlrpc.rb
-- lib/arpie/proxy.rb
-- lib/arpie/server.rb
+- arpie.gemspec
+- examples/em.rb
+- lib/arpie.rb
 - lib/arpie/binary.rb
-- lib/arpie/protocol.rb
-- lib/arpie/error.rb
-- lib/arpie/client.rb
-- lib/arpie/binary_types.rb
 - lib/arpie/binary/bytes_type.rb
 - lib/arpie/binary/fixed_type.rb
 - lib/arpie/binary/list_type.rb
 - lib/arpie/binary/pack_type.rb
-- lib/arpie.rb
-- tools/protocol_benchmark.rb
-- tools/benchmark.rb
-- BINARY_SPEC
-has_rdoc: true
-homepage: http://arpie.elv.es
+- lib/arpie/binary_types.rb
+- lib/arpie/em.rb
+- lib/arpie/error.rb
+- lib/arpie/protocol.rb
+- lib/arpie/version.rb
+- spec/binary_spec.rb
+- spec/bytes_binary_type_spec.rb
+- spec/em_spec.rb
+- spec/examples_spec.rb
+- spec/fixed_binary_type_spec.rb
+- spec/list_binary_type_spec.rb
+- spec/protocol_merge_and_split_spec.rb
+- spec/protocol_spec.rb
+- spec/rcov.opts
+- spec/spec.opts
+- spec/spec_helper.rb
+homepage: https://github.com/elven/arpie
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --quiet
-- --line-numbers
-- --inline-source
-- --title
-- "arpie: A high-performing layered networking protocol framework. Simple to use, simple to extend."
-- --main
-- README
-- --exclude
-- ^(examples|extras)/
-require_paths: 
+post_install_message: ! "\n    You have installed arpie 0.1.0 or greater. This breaks\n
+  \   compatibility with previous versions (0.0.x).\n\n    Specifically, it removes
+  all client/server code, and\n    XMLRPC integration, since EventMachine and similar
+  does\n    all that in a much cleaner and more efficient way.\n  "
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: arpie
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A high-performing layered networking protocol framework. Simple to use, simple to extend.
-test_files: []
-
+summary: Toolkit for handling binary data, network protocols, file formats, and similar
+test_files:
+- spec/binary_spec.rb
+- spec/bytes_binary_type_spec.rb
+- spec/em_spec.rb
+- spec/examples_spec.rb
+- spec/fixed_binary_type_spec.rb
+- spec/list_binary_type_spec.rb
+- spec/protocol_merge_and_split_spec.rb
+- spec/protocol_spec.rb
+- spec/rcov.opts
+- spec/spec.opts
+- spec/spec_helper.rb
+has_rdoc: