ffi-msgpack 0.1.2 → 0.1.3

data/ChangeLog.md

@@ -1,3 +1,16 @@
+### 0.1.3 / 2010-07-03
+
+* Added specs for {FFI::MsgPack::Packable}.
+* {FFI::MsgPack.pack} now accepts multiple arguments.
+* Fixed a typo in {FFI::MsgPack::Packable#to_msgpack} (thanks bb).
+* Fixed the packing of {Hash} objects.
+  * Fixed the struct layout of {FFI::MsgPack::MsgKeyValue}.
+
+### 0.1.2 / 2010-05-24
+
+* Require libmsgpack >= 0.5.0, due to changes in the
+  `msgpack_object_type` enum.
+
 ### 0.1.1 / 2010-05-21
 
 * Fixed {FFI::MsgPack::MsgObject#initialize} on JRuby.

data/Gemfile

@@ -1,16 +1,16 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-group :runtime do
+group(:runtime) do
   gem 'ffi',		'~> 0.6.0'
 end
 
-group :development do
+group(:development) do
   gem 'bundler',	'~> 0.9.25'
   gem 'rake',		'~> 0.8.7'
   gem 'jeweler',	'~> 1.4.0', :git => 'git://github.com/technicalpickles/jeweler.git'
 end
 
-group :doc do
+group(:doc) do
   case RUBY_PLATFORM
   when 'java'
     gem 'maruku',	'~> 0.6.0'
@@ -18,7 +18,7 @@ group :doc do
     gem 'rdiscount',	'~> 1.6.3'
   end
 
-  gem 'yard',			'~> 0.5.3'
+  gem 'yard',		'~> 0.5.3'
 end
 
 gem 'rspec',	'~> 1.3.0', :group => [:development, :test]

data/Rakefile

@@ -10,16 +10,15 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'rake/clean'
 require 'jeweler'
 
 Jeweler::Tasks.new do |gem|
   gem.name = 'ffi-msgpack'
   gem.licenses = ['MIT']
   gem.summary = %Q{FFI bindings for msgpack}
+  gem.description = %Q{Ruby FFI bindings for the msgpack library.}
   gem.email = 'postmodern.mod3@gmail.com'
   gem.homepage = %Q{http://github.com/postmodern/ffi-msgpack}
-  gem.description = %Q{Ruby FFI bindings for the msgpack library.}
   gem.authors = ['Postmodern']
   gem.requirements = ['libmsgpack, 0.5.0 or greater']
   gem.has_rdoc = 'yard'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/ffi-msgpack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-msgpack}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Postmodern"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-07-03}
   s.description = %q{Ruby FFI bindings for the msgpack library.}
   s.email = %q{postmodern.mod3@gmail.com}
   s.extra_rdoc_files = [
@@ -54,6 +54,14 @@ Gem::Specification.new do |s|
     "lib/ffi/msgpack/zone_chunk_list.rb",
     "lib/ffi/msgpack/zone_finalizer.rb",
     "lib/ffi/msgpack/zone_finalizer_array.rb",
+    "spec/extensions/array_spec.rb",
+    "spec/extensions/false_class_spec.rb",
+    "spec/extensions/float_spec.rb",
+    "spec/extensions/hash_spec.rb",
+    "spec/extensions/integer_spec.rb",
+    "spec/extensions/nil_class_spec.rb",
+    "spec/extensions/string_spec.rb",
+    "spec/extensions/true_class_spec.rb",
     "spec/msg_object_spec.rb",
     "spec/packer_spec.rb",
     "spec/spec_helper.rb",
@@ -67,6 +75,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{FFI bindings for msgpack}
   s.test_files = [
+    "spec/extensions/array_spec.rb",
+    "spec/extensions/false_class_spec.rb",
+    "spec/extensions/float_spec.rb",
+    "spec/extensions/hash_spec.rb",
+    "spec/extensions/integer_spec.rb",
+    "spec/extensions/nil_class_spec.rb",
+    "spec/extensions/string_spec.rb",
+    "spec/extensions/true_class_spec.rb",
     "spec/msg_object_spec.rb",
     "spec/packer_spec.rb",
     "spec/spec_helper.rb",

data/lib/ffi/msgpack.rb

@@ -1,3 +1,4 @@
 require 'ffi/msgpack/msgpack'
 require 'ffi/msgpack/packer'
 require 'ffi/msgpack/unpacker'
+require 'ffi/msgpack/extensions'

data/lib/ffi/msgpack/msg_key_value.rb

@@ -5,8 +5,8 @@ module FFI
   module MsgPack
     class MsgKeyValue < FFI::Struct
 
-      layout :key, :pointer,
-             :value, :pointer
+      layout :key, MsgObject,
+             :value, MsgObject
 
       #
       # The key.
@@ -15,7 +15,7 @@ module FFI
       #   The key Msg Object.
       #
       def key
-        MsgObject.new(self[:key])
+        self[:key]
       end
 
       #
@@ -25,7 +25,7 @@ module FFI
       #   The value Msg Object.
       #
       def value
-        MsgObject.new(self[:value])
+        self[:value]
       end
 
     end

data/lib/ffi/msgpack/msg_map.rb

@@ -1,8 +1,9 @@
 require 'ffi/msgpack/types'
-require 'ffi/msgpack/msg_key_value'
 
 module FFI
   module MsgPack
+    autoload :MsgKeyValue, 'ffi/msgpack/msg_key_value'
+
     class MsgMap < FFI::Struct
 
       layout :size, :uint32,

data/lib/ffi/msgpack/msg_object.rb

@@ -184,8 +184,8 @@ module FFI
         values.each_with_index do |(key,value),index|
           pair = MsgKeyValue.new(entries[index])
 
-          pair[:key] = MsgObject.new_object(key)
-          pair[:value] = MsgObject.new_object(value)
+          MsgObject.new_object(key,pair[:key].to_ptr)
+          MsgObject.new_object(value,pair[:value].to_ptr)
         end
 
         obj = MsgObject.new

data/lib/ffi/msgpack/msgpack.rb

@@ -94,15 +94,16 @@ module FFI
     #
     # Packs a Ruby object.
     #
-    # @param [Hash, Array, String, Symbol, Integer, Float, true, false, nil] obj
-    #   The Ruby object to pack.
+    # @param [Array[Hash, Array, String, Symbol, Integer, Float, true, false, nil]] objs
+    #   The Ruby object(s) to pack.
     #
     # @return [String]
     #   The packed Ruby object.
     #
-    def MsgPack.pack(obj)
+    def MsgPack.pack(*objs)
       packer = Packer.create
-      packer << obj
+
+      objs.each { |obj| packer << obj }
 
       return packer.to_s
     end

data/lib/ffi/msgpack/packable.rb

@@ -11,7 +11,7 @@ module FFI
       #
       def to_msgpack
         packer = Packer.create
-        packer << obj
+        packer << self
 
         return packer.to_s
       end

data/spec/extensions/array_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/array'
+
+describe Array do
+  subject { [1, 2] }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\x92\x01\x02"
+  end
+end

data/spec/extensions/false_class_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/false_class'
+
+describe FalseClass do
+  subject { false }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\xC2"
+  end
+end

data/spec/extensions/float_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/float'
+
+describe Float do
+  subject { 0.2 }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\xCB?\xC9\x99\x99\x99\x99\x99\x9A"
+  end
+end

data/spec/extensions/hash_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/hash'
+
+describe Hash do
+  subject { {1 => 'a', 2 => 'b'} }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\x82\x01\xA1a\x02\xA1b"
+  end
+end

data/spec/extensions/integer_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/integer'
+
+describe Integer do
+  subject { 0x02 }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\x02"
+  end
+end

data/spec/extensions/nil_class_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/nil_class'
+
+describe NilClass do
+  subject { nil }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\xC0"
+  end
+end

data/spec/extensions/string_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/string'
+
+describe String do
+  subject { "hello" }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\xA5hello"
+  end
+end

data/spec/extensions/true_class_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'ffi/msgpack/extensions/true_class'
+
+describe TrueClass do
+  subject { true }
+
+  it "should be packable" do
+    should be_kind_of(FFI::MsgPack::Packable)
+  end
+
+  it "should pack to a msg" do
+    subject.to_msgpack.should == "\xC3"
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-msgpack
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Postmodern
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 9
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -73,7 +69,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -89,7 +84,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -145,6 +139,14 @@ files:
 - lib/ffi/msgpack/zone_chunk_list.rb
 - lib/ffi/msgpack/zone_finalizer.rb
 - lib/ffi/msgpack/zone_finalizer_array.rb
+- spec/extensions/array_spec.rb
+- spec/extensions/false_class_spec.rb
+- spec/extensions/float_spec.rb
+- spec/extensions/hash_spec.rb
+- spec/extensions/integer_spec.rb
+- spec/extensions/nil_class_spec.rb
+- spec/extensions/string_spec.rb
+- spec/extensions/true_class_spec.rb
 - spec/msg_object_spec.rb
 - spec/packer_spec.rb
 - spec/spec_helper.rb
@@ -163,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -828906031
       segments: 
       - 0
       version: "0"
@@ -172,7 +174,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -184,6 +185,14 @@ signing_key:
 specification_version: 3
 summary: FFI bindings for msgpack
 test_files: 
+- spec/extensions/array_spec.rb
+- spec/extensions/false_class_spec.rb
+- spec/extensions/float_spec.rb
+- spec/extensions/hash_spec.rb
+- spec/extensions/integer_spec.rb
+- spec/extensions/nil_class_spec.rb
+- spec/extensions/string_spec.rb
+- spec/extensions/true_class_spec.rb
 - spec/msg_object_spec.rb
 - spec/packer_spec.rb
 - spec/spec_helper.rb