bertrpc 0.3.4 → 0.4.0

data/History.txt

@@ -0,0 +1,3 @@
+= 0.4.0 / 2009-10-08
+  * Major changes
+    * Convert to use BERT gem.

data/Rakefile

@@ -9,6 +9,7 @@ begin
     gem.email = "tom@mojombo.com"
     gem.homepage = "http://github.com/mojombo/bertrpc"
     gem.authors = ["Tom Preston-Werner"]
+    gem.add_dependency('bert', '>= 0.1.0')
     gem.add_dependency('erlectricity', '>= 1.0.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/bertrpc.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "0.3.4"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-09-25}
+  s.date = %q{2009-10-08}
   s.email = %q{tom@mojombo.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -15,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "History.txt",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -55,11 +59,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<bert>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<erlectricity>, [">= 1.0.1"])
     else
+      s.add_dependency(%q<bert>, [">= 0.1.0"])
       s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
     end
   else
+    s.add_dependency(%q<bert>, [">= 0.1.0"])
     s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
   end
 end

data/lib/bertrpc/action.rb

@@ -11,7 +11,7 @@ module BERTRPC
     end
 
     def execute
-      bert_request = encode_ruby_request([@req.kind, @mod, @fun, @args])
+      bert_request = encode_ruby_request(t[@req.kind, @mod, @fun, @args])
       bert_response = transaction(bert_request)
       decode_bert_response(bert_response)
     end

data/lib/bertrpc/encodes.rb

@@ -1,15 +1,14 @@
 module BERTRPC
   module Encodes
     def encode_ruby_request(ruby_request)
-      ruby_payload = convert(ruby_request)
-      Erlectricity::Encoder.encode(ruby_payload)
+      BERT.encode(ruby_request)
     end
 
     def decode_bert_response(bert_response)
-      ruby_response = Erlectricity::Decoder.decode(bert_response)
+      ruby_response = BERT.decode(bert_response)
       case ruby_response[0]
         when :reply
-          deconvert(ruby_response[1])
+          ruby_response[1]
         when :noreply
           nil
         when :error
@@ -35,31 +34,5 @@ module BERTRPC
           raise
       end
     end
-
-    def convert(item)
-      if item.instance_of?(Hash)
-        a = [:dict]
-        item.each_pair { |k, v| a << [convert(k), convert(v)] }
-        a
-      elsif item.instance_of?(Array)
-        item.map { |x| convert(x) }
-      else
-        item
-      end
-    end
-
-    def deconvert(item)
-      if item.instance_of?(Array)
-        if item.first == :dict
-          item[1..-1].inject({}) do |acc, x|
-            acc[deconvert(x[0])] = deconvert(x[1]); acc
-          end
-        else
-          item.map { |x| deconvert(x) }
-        end
-      else
-        item
-      end
-    end
   end
 end

data/lib/bertrpc.rb

@@ -1,4 +1,4 @@
-require 'erlectricity'
+require 'bert'
 require 'socket'
 
 require 'bertrpc/service'

data/test/action_test.rb

@@ -20,24 +20,24 @@ class ActionTest < Test::Unit::TestCase
     end
 
     should "call with single-arity" do
-      req = @enc.encode_ruby_request([:call, :mymod, :myfun, [1]])
-      res = @enc.encode_ruby_request([:reply, 2])
+      req = @enc.encode_ruby_request(t[:call, :mymod, :myfun, [1]])
+      res = @enc.encode_ruby_request(t[:reply, 2])
       call = BERTRPC::Action.new(@svc, @req, :mymod, :myfun, [1])
       call.expects(:transaction).with(req).returns(res)
       assert_equal 2, call.execute
     end
 
     should "call with single-arity array" do
-      req = @enc.encode_ruby_request([:call, :mymod, :myfun, [[1, 2, 3]]])
-      res = @enc.encode_ruby_request([:reply, [4, 5, 6]])
+      req = @enc.encode_ruby_request(t[:call, :mymod, :myfun, [[1, 2, 3]]])
+      res = @enc.encode_ruby_request(t[:reply, [4, 5, 6]])
       call = BERTRPC::Action.new(@svc, @req, :mymod, :myfun, [[1, 2, 3]])
       call.expects(:transaction).with(req).returns(res)
       assert_equal [4, 5, 6], call.execute
     end
 
     should "call with multi-arity" do
-      req = @enc.encode_ruby_request([:call, :mymod, :myfun, [1, 2, 3]])
-      res = @enc.encode_ruby_request([:reply, [4, 5, 6]])
+      req = @enc.encode_ruby_request(t[:call, :mymod, :myfun, [1, 2, 3]])
+      res = @enc.encode_ruby_request(t[:reply, [4, 5, 6]])
       call = BERTRPC::Action.new(@svc, @req, :mymod, :myfun, [1, 2, 3])
       call.expects(:transaction).with(req).returns(res)
       assert_equal [4, 5, 6], call.execute

data/test/encodes_test.rb

@@ -6,66 +6,35 @@ class EncodesTest < Test::Unit::TestCase
       @enc = Enc.new
     end
 
-    context "converter" do
-      should "convert top level hashes to BERT-RPC dict form" do
-        arr = @enc.convert({:foo => 1, :bar => 2})
-        a = [:dict, [:foo, 1], [:bar, 2]] == arr
-        b = [:dict, [:bar, 2], [:foo, 1]] == arr
-        assert(a || b)
-      end
-
-      should "convert nested hashes in the same way" do
-        assert_equal([1, 2, [:dict, [:foo, 1]]], @enc.convert([1, 2, {:foo => 1}]))
-      end
-
-      should "keep everything else the same" do
-        assert_equal [1, 2, "foo", :bar, 3.14], @enc.convert([1, 2, "foo", :bar, 3.14])
-      end
-    end
-
-    context "deconverter" do
-      should "convert top level BERT-RPC dict forms to hashes" do
-        assert_equal({:foo => 1, :bar => 2}, @enc.deconvert([:dict, [:foo, 1], [:bar, 2]]))
-      end
-
-      should "convert nested dicts in the same way" do
-        assert_equal([1, 2, {:foo => 1}], @enc.deconvert([1, 2, [:dict, [:foo, 1]]]))
-      end
-
-      should "keep everything else the same" do
-        assert_equal [1, 2, "foo", :bar, 3.14], @enc.deconvert([1, 2, "foo", :bar, 3.14])
-      end
-    end
-
     context "ruby request encoder" do
       should "return BERT-RPC encoded request" do
-        bert = "\203h\004d\000\004calld\000\005mymodd\000\005myfunh\003a\001a\002a\003"
-        assert_equal bert, @enc.encode_ruby_request([:call, :mymod, :myfun, [1, 2, 3]])
+        bert = "\203h\004d\000\004calld\000\005mymodd\000\005myfunl\000\000\000\003a\001a\002a\003j"
+        assert_equal bert, @enc.encode_ruby_request(t[:call, :mymod, :myfun, [1, 2, 3]])
       end
     end
 
     context "bert response decoder" do
       should "return response when reply" do
-        req = @enc.encode_ruby_request([:reply, [1, 2, 3]])
+        req = @enc.encode_ruby_request(t[:reply, [1, 2, 3]])
         res = @enc.decode_bert_response(req)
         assert_equal [1, 2, 3], res
       end
 
       should "return nil when noreply" do
-        req = @enc.encode_ruby_request([:noreply])
+        req = @enc.encode_ruby_request(t[:noreply])
         res = @enc.decode_bert_response(req)
         assert_equal nil, res
       end
 
       should "raise a ProtocolError error when protocol level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:protocol, 1, "class", "invalid", []]])
+        req = @enc.encode_ruby_request(t[:error, [:protocol, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::ProtocolError) do
           @enc.decode_bert_response(req)
         end
       end
 
       should "raise a ServerError error when server level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:server, 1, "class", "invalid", []]])
+        req = @enc.encode_ruby_request(t[:error, [:server, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::ServerError) do
           @enc.decode_bert_response(req)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -07:00
+date: 2009-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bert
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: erlectricity
   type: :runtime
@@ -34,6 +44,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- History.txt
 - LICENSE
 - README.md
 - Rakefile