chrisk-protopuffs 0.2.1 → 0.3.0

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/coverage/
+/pkg/
+/rdoc/

data/.specification

@@ -0,0 +1,108 @@
+--- !ruby/object:Gem::Specification 
+name: protopuffs
+version: !ruby/object:Gem::Version 
+  version: 0.2.1
+platform: ruby
+authors: 
+- Chris Kampmeier
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-03-19 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: A new implementation of Protocol Buffers in Ruby
+email: chris@kampers.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+- LICENSE.txt
+files: 
+- LICENSE.txt
+- README.rdoc
+- VERSION.yml
+- lib/protopuffs
+- lib/protopuffs/message
+- lib/protopuffs/message/base.rb
+- lib/protopuffs/message/field.rb
+- lib/protopuffs/message/wire_type.rb
+- lib/protopuffs/parser
+- lib/protopuffs/parser/parser.rb
+- lib/protopuffs/parser/protocol_buffer.treetop
+- lib/protopuffs.rb
+- test/abstract_syntax_tree_test.rb
+- test/fixtures
+- test/fixtures/proto
+- test/fixtures/proto/person.proto
+- test/message_base_test.rb
+- test/message_field_test.rb
+- test/parse_tree_test.rb
+- test/protopuffs_test.rb
+- test/test_helper.rb
+- test/text_format_test.rb
+- test/wire_format_test.rb
+has_rdoc: true
+homepage: http://github.com/chrisk/protopuffs
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --inline-source
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.4
+signing_key: 
+specification_version: 2
+summary: Sex, drugs, and protocol buffers
+test_files: []
+

data/README.rdoc

@@ -59,7 +59,7 @@ or hashes, as well as <tt>#attributes=</tt>
 Protopuffs currently only supports a base set of the <tt>.proto</tt> file
 syntax. Here's what's missing:
 
-* sfixed32 and sfixed64 types
+* the sfixed64 type
 * sint32 and sint64 types (due to lack of support for ZigZag encoding)
 * packed repeated fields (the <tt>[packed=true]</tt> option)
 * enumerations

data/Rakefile

@@ -0,0 +1,48 @@
+# encoding: UTF-8
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rcov/rcovtask'
+begin require 'metric_fu'; rescue LoadError; end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "protopuffs"
+    s.summary = %Q{Sex, drugs, and protocol buffers}
+    s.email = "chris@kampers.net"
+    s.homepage = "http://github.com/chrisk/protopuffs"
+    s.description = "A new implementation of Protocol Buffers in Ruby"
+    s.authors = ["Chris Kampmeier"]
+    s.add_dependency "treetop"
+    s.add_development_dependency "mocha"
+    s.add_development_dependency "shoulda"
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Protopuffs'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('LICENSE*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+Rcov::RcovTask.new do |t|
+  t.libs << 'test'
+  t.rcov_opts << '--exclude "gems/*"'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 2
-:patch: 1
+:minor: 3
+:patch: 0

data/lib/protopuffs/message/base.rb

@@ -81,7 +81,7 @@ module Protopuffs
 
         until @buffer.eof?
           tag = MessageField.shift_tag(@buffer)
-          field = self.class.fields.find { |field| field.tag == tag }
+          field = self.class.fields.find { |f| f.tag == tag }
           next if field.nil?
           value_bytes = field.class.shift(@buffer)
 

data/lib/protopuffs/message/field.rb

@@ -18,6 +18,7 @@ module Protopuffs
       when "bytes"    then Bytes.new(*args)
       when "float"    then Float.new(*args)
       when "fixed32"  then Fixed32.new(*args)
+      when "sfixed32" then SFixed32.new(*args)
       else Embedded.new(type, *args)
       end
     end
@@ -139,6 +140,14 @@ module Protopuffs
     def self.encode(value); [value].pack('V') end
   end
 
+  class SFixed32 < Fixed32Base
+    def decode(bytes)
+      value = bytes.unpack('V').first
+      value >= 2**31 ? value -= 2**32 : value
+    end
+    def self.encode(value); [value].pack('V') end
+  end
+
   class Float < Fixed32Base
     def decode(bytes);      bytes.unpack('e').first end
     def self.encode(value); [value].pack('e') end

data/protopuffs.gemspec

@@ -0,0 +1,77 @@
+# 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{protopuffs}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Chris Kampmeier"]
+  s.date = %q{2009-09-21}
+  s.description = %q{A new implementation of Protocol Buffers in Ruby}
+  s.email = %q{chris@kampers.net}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     ".specification",
+     "LICENSE.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/protopuffs.rb",
+     "lib/protopuffs/message/base.rb",
+     "lib/protopuffs/message/field.rb",
+     "lib/protopuffs/message/wire_type.rb",
+     "lib/protopuffs/parser/parser.rb",
+     "lib/protopuffs/parser/protocol_buffer.treetop",
+     "protopuffs.gemspec",
+     "test/abstract_syntax_tree_test.rb",
+     "test/fixtures/proto/person.proto",
+     "test/message_base_test.rb",
+     "test/message_field_test.rb",
+     "test/parse_tree_test.rb",
+     "test/protopuffs_test.rb",
+     "test/test_helper.rb",
+     "test/text_format_test.rb",
+     "test/wire_format_test.rb"
+  ]
+  s.homepage = %q{http://github.com/chrisk/protopuffs}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Sex, drugs, and protocol buffers}
+  s.test_files = [
+    "test/abstract_syntax_tree_test.rb",
+     "test/message_base_test.rb",
+     "test/message_field_test.rb",
+     "test/parse_tree_test.rb",
+     "test/protopuffs_test.rb",
+     "test/test_helper.rb",
+     "test/text_format_test.rb",
+     "test/wire_format_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<treetop>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<treetop>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<treetop>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+  end
+end

data/test/message_field_test.rb

@@ -30,6 +30,7 @@ class MessageFieldTest < Test::Unit::TestCase
        [ "bytes",    Protopuffs::Bytes],
        [ "float",    Protopuffs::Float],
        [ "fixed32",  Protopuffs::Fixed32],
+       [ "sfixed32", Protopuffs::SFixed32],
        [ "embedded", Protopuffs::Embedded],
       ].each do |type, klass|
         assert_kind_of klass, Protopuffs::MessageField.factory(type, "optional", "a_string", 1, 2)
@@ -50,7 +51,8 @@ class MessageFieldTest < Test::Unit::TestCase
       numeric_types = [Protopuffs::Double, Protopuffs::Float,
                        Protopuffs::Int32, Protopuffs::Int64,
                        Protopuffs::UInt32, Protopuffs::UInt64,
-                       Protopuffs::Fixed32, Protopuffs::Fixed64]
+                       Protopuffs::Fixed32, Protopuffs::Fixed64,
+                       Protopuffs::SFixed32]
       numeric_types.each do |type|
         assert_equal 0, type.new("optional", "number", 1).default
         assert_equal 0, type.new("optional", "number", 1, nil).default

data/test/test_helper.rb

@@ -2,7 +2,14 @@
 
 require 'rubygems'
 require 'test/unit'
+
+gem "polyglot", "=0.2.9"
+gem "treetop", "=1.4.2"
+
+gem "thoughtbot-shoulda", "=2.10.2"
 require 'shoulda'
+
+gem "mocha", "=0.9.8"
 require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -58,5 +65,26 @@ class Test::Unit::TestCase
     end
   end
 
+  def self.should_encode_and_decode_wire_format_and_fields(bytes, fields)
+    self.should_encode_wire_format_from_fields(bytes, fields)
+    self.should_decode_wire_format_to_fields(bytes, fields)
+  end
+
+  def self.should_losslessly_encode_and_decode_a_random_sample(fields)
+    raise ArgumentError if fields.size > 1
+    name, range = fields.shift
+    should "get the same value back after encoding and decoding a random sample of the values #{range.inspect} for field #{name.inspect}" do
+      size = range.last - range.first
+      size -= 1 if range.exclude_end?
+      values_to_test = [range.first, range.first + size]
+      250.times { values_to_test << range.first + rand(size) }
+      values_to_test.each do |value|
+        @message.send("#{name}=", value)
+        @message.from_wire_format(@message.to_wire_format)
+        assert_equal value, @message.send(name)
+      end
+    end
+  end
+
 end
 

data/test/wire_format_test.rb

@@ -193,6 +193,21 @@ class WireFormatTest < Test::Unit::TestCase
   end
 
 
+  context "a message with one sfixed32 field tagged #1" do
+    setup do
+      fields = [Protopuffs::SFixed32.new("required", "a", 1)]
+      Protopuffs::Message::Base.define_message_class("Test1", fields)
+      @message = Protopuffs::Message::Test1.new
+    end
+
+    should_encode_and_decode_wire_format_and_fields [0x0D, 0x05, 0x00, 0x00, 0x80],
+                                                    :a => -2**31 + 5
+    should_encode_and_decode_wire_format_and_fields [0x0D, 0x05, 0x80, 0x00, 0x00],
+                                                    :a => 2**15 + 5
+    should_losslessly_encode_and_decode_a_random_sample :a => -2**31...2**31
+  end
+
+
   context "a message with one repeating int32 field tagged #1" do
     setup do
       fields = [Protopuffs::Int32.new("repeated", "a", 1)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chrisk-protopuffs
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,24 +49,23 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE.txt
+- README.rdoc
 files: 
+- .gitignore
+- .specification
 - LICENSE.txt
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- lib/protopuffs
-- lib/protopuffs/message
+- lib/protopuffs.rb
 - lib/protopuffs/message/base.rb
 - lib/protopuffs/message/field.rb
 - lib/protopuffs/message/wire_type.rb
-- lib/protopuffs/parser
 - lib/protopuffs/parser/parser.rb
 - lib/protopuffs/parser/protocol_buffer.treetop
-- lib/protopuffs.rb
+- protopuffs.gemspec
 - test/abstract_syntax_tree_test.rb
-- test/fixtures
-- test/fixtures/proto
 - test/fixtures/proto/person.proto
 - test/message_base_test.rb
 - test/message_field_test.rb
@@ -75,11 +74,11 @@ files:
 - test/test_helper.rb
 - test/text_format_test.rb
 - test/wire_format_test.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/chrisk/protopuffs
+licenses: 
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -98,9 +97,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Sex, drugs, and protocol buffers
-test_files: []
-
+test_files: 
+- test/abstract_syntax_tree_test.rb
+- test/message_base_test.rb
+- test/message_field_test.rb
+- test/parse_tree_test.rb
+- test/protopuffs_test.rb
+- test/test_helper.rb
+- test/text_format_test.rb
+- test/wire_format_test.rb