amq-protocol 0.7.0.alpha4 → 0.7.0.alpha5

data/.travis.yml

@@ -2,6 +2,6 @@ script: "bundle exec rspec spec"
 rvm:
   - 1.8.7
   - 1.9.2
-  - ree
+  - jruby
   - rbx
-  - jruby
+  - ree

data/lib/amq/protocol/client.rb

@@ -26,13 +26,15 @@ module AMQ
     PACK_UCHAR_UINT32       = "CN".freeze
     PACK_CHAR_UINT16_UINT32 = "cnN".freeze
 
-    # @version 0.0.1
+    PACK_32BIT_FLOAT        = 'f'.freeze
+    PACK_64BIT_FLOAT        = 'd'.freeze
+
+
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
       Protocol::Class.classes
     end
 
-    # @version 0.0.1
     # @return [Array] Collection of subclasses of AMQ::Protocol::Method.
     def self.methods
       Protocol::Method.methods

data/lib/amq/protocol/table.rb

@@ -44,17 +44,19 @@ module AMQ
           when Integer then
             buffer << TYPE_INTEGER
             buffer << [value].pack(PACK_UINT32)
+          when Float then
+            buffer << TYPE_32BIT_FLOAT
+            buffer << [value].pack(PACK_32BIT_FLOAT)
           when TrueClass, FalseClass then
             value = value ? 1 : 0
             buffer << TYPE_INTEGER
             buffer << [value].pack(PACK_UINT32)
           when Hash then
-            buffer << TYPE_HASH # it will work as long as the encoding is ASCII-8BIT
+            buffer << TYPE_HASH # TODO: encoding support
             buffer << self.encode(value)
           when Time then
-            # TODO: encode timezone?
             buffer << TYPE_TIME
-            buffer << [value.to_i].pack(PACK_INT64).reverse # Don't ask. It works.
+            buffer << [value.to_i].pack(PACK_INT64).reverse # FIXME: there has to be a more efficient way
           else
             # We don't want to require these libraries.
             if defined?(BigDecimal) && value.is_a?(BigDecimal)
@@ -123,8 +125,12 @@ module AMQ
           when TYPE_SIGNED_8BIT then raise NotImplementedError.new
           when TYPE_SIGNED_16BIT then raise NotImplementedError.new
           when TYPE_SIGNED_64BIT then raise NotImplementedError.new
-          when TYPE_32BIT_FLOAT then raise NotImplementedError.new
-          when TYPE_64BIT_FLOAT then raise NotImplementedError.new
+          when TYPE_32BIT_FLOAT then
+            value = data.slice(offset, 4).unpack(PACK_32BIT_FLOAT).first
+            offset += 4
+          when TYPE_64BIT_FLOAT then
+            value = data.slice(offset, 8).unpack(PACK_64BIT_FLOAT).first
+            offset += 8
           when TYPE_VOID
             value = nil
           when TYPE_BYTE_ARRAY

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "0.7.0.alpha4"
+    VERSION = "0.7.0.alpha5"
   end # Protocol
 end # AMQ

data/spec/amq/protocol/table_spec.rb

@@ -17,6 +17,7 @@ module AMQ
         {
           {}                       => "\000\000\000\000",
           {"test" => 1}            => "\000\000\000\n\004testI\000\000\000\001",
+          {"float" => 1.0}         => "\000\000\000\v\005floatf\000\000\200?",
           {"test" => "string"}     => "\000\000\000\020\004testS\000\000\000\006string",
           {"test" => {}}           => "\000\000\000\n\004testF\000\000\000\000",
           {"test" => bigdecimal_1} => "\000\000\000\v\004testD\000\000\000\000\001",
@@ -27,6 +28,7 @@ module AMQ
         {
           {}                       => "\x00\x00\x00\x00",
           {"test" => 1}            => "\x00\x00\x00\n\x04testI\x00\x00\x00\x01",
+          {"float" => 1.0}         => "\000\000\000\v\005floatf\000\000\200?",
           {"test" => "string"}     => "\x00\x00\x00\x10\x04testS\x00\x00\x00\x06string",
           {"test" => {}}           => "\x00\x00\x00\n\x04testF\x00\x00\x00\x00",
           {"test" => bigdecimal_1} => "\x00\x00\x00\v\x04testD\x00\x00\x00\x00\x01",
@@ -46,10 +48,14 @@ module AMQ
           Table.encode(nil).should eql(encoded_value)
         end
 
-        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for {test: true}" do
+        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :test => true }" do
           Table.encode(:test => true).should eql("\x00\x00\x00\n\x04testI\x00\x00\x00\x01")
         end
 
+        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :latitude  => 59.35, :longitude => 18.066667 } }" do
+          Table.encode(:coordinates => { :latitude  => 59.35, :longitude => 18.066667 }).should eql("\x00\x00\x00.\vcoordinatesF\x00\x00\x00\x1D\blatitudefffmB\tlongitudef\x89\x88\x90A")
+        end
+
         DATA.each do |data, encoded|
           it "should return #{encoded.inspect} for #{data.inspect}" do
             Table.encode(data).should eql(encoded)
@@ -66,4 +72,4 @@ module AMQ
       end
     end
   end
-end
+end

metadata

@@ -1,10 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amq-protocol
-version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha4
+version: !ruby/object:Gem::Version 
+  hash: -3702664410
   prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - alpha
+  - 5
+  version: 0.7.0.alpha5
 platform: ruby
-authors:
+authors: 
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
@@ -12,19 +19,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-24 00:00:00.000000000Z
+
+date: 2011-05-29 00:00:00 Z
 dependencies: []
-description: ! "  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It
-  is not an\n  AMQP client: amq-protocol only handles serialization and deserialization.\n
-  \ If you want to write your own AMQP client, this gem can help you with that.\n"
-email:
+
+description: "  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an\n  AMQP client: amq-protocol only handles serialization and deserialization.\n  If you want to write your own AMQP client, this gem can help you with that.\n"
+email: 
 - michael@novemberain.com
 - stastny@101ideas.cz
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
-files:
+files: 
 - .gitignore
 - .gitmodules
 - .rspec
@@ -67,26 +76,38 @@ files:
 - tasks.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.1
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
+