ruby-protocol-buffers 1.2.2 → 1.2.3.beta1

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3.beta1

data/lib/protocol_buffers/compiler/file_descriptor_to_ruby.rb

@@ -128,9 +128,6 @@ HEADER
         end
         line fieldline
       end
-
-      line
-      line "gen_methods! # new fields ignored after this point"
     end
     line
   end

data/lib/protocol_buffers/runtime/field.rb

@@ -120,22 +120,40 @@ module ProtocolBuffers
       @opts = opts.dup
     end
 
-    def add_methods_to(klass)
-      klass.class_eval <<-EOF, __FILE__, __LINE__+1
-        attr_reader :#{name}
-      EOF
+    def add_reader_to(klass)
+      if repeated?
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
+        def #{name}
+          unless @#{name}
+            @#{name} = RepeatedField.new(fields[#{tag}])
+          end
+          @#{name}
+        end
+        EOF
+      else
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
+        def #{name}
+          if @set_fields[#{tag}] == nil
+            # first access of this field, generate it
+            initialize_field(#{tag})
+          end
+          @#{name}
+        end
+        EOF
+      end
+    end
+
+    def add_writer_to(klass)
       if repeated?
         klass.class_eval <<-EOF, __FILE__, __LINE__+1
           def #{name}=(value)
             if value.nil?
-              @#{name}.clear
+              #{name}.clear
             else
-              @#{name}.clear
+              #{name}.clear
               value.each { |i| @#{name}.push i }
             end
           end
-
-          def has_#{name}?; true; end
         EOF
       else
         klass.class_eval <<-EOF, __FILE__, __LINE__+1
@@ -154,7 +172,23 @@ module ProtocolBuffers
               end
             end
           end
+        EOF
+      end
+    end
+
+    def add_methods_to(klass)
+      add_reader_to(klass)
+      add_writer_to(klass)
 
+      if repeated?
+        # repeated fields are always "set"
+        klass.initial_set_fields[tag] = true
+
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
+          def has_#{name}?; true; end
+        EOF
+      else
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
           def has_#{name}?
             value_for_tag?(#{tag})
           end
@@ -533,6 +567,8 @@ module ProtocolBuffers
 
     class MessageField < Field
       include WireFormats::LENGTH_DELIMITED
+      
+      attr_reader :proxy_class
 
       def initialize(proxy_class, otype, name, tag, opts = {})
         super(otype, name, tag, opts)

data/lib/protocol_buffers/runtime/message.rb

@@ -232,22 +232,7 @@ module ProtocolBuffers
     #   message = MyMessageClass.new
     #   message.attributes = attributes
     def initialize(attributes = {})
-      @set_fields = []
-
-      fields.each do |tag, field|
-        if field.repeated?
-          self.instance_variable_set("@#{field.name}", RepeatedField.new(field))
-          @set_fields[tag] = true # repeated fields are always "set"
-        else
-          value = field.default_value
-          self.__send__("#{field.name}=", value)
-          @set_fields[tag] = false
-          if field.class == Field::MessageField
-            value.notify_on_change(self, tag)
-          end
-        end
-      end
-
+      @set_fields = self.class.initial_set_fields.dup
       self.attributes = attributes
     end
 
@@ -354,6 +339,10 @@ module ProtocolBuffers
       @fields || @fields = {}
     end
 
+    def self.initial_set_fields
+      @set_fields ||= []
+    end
+
     # Returns a hash of { tag => ProtocolBuffers::Field }
     def fields
       self.class.fields
@@ -418,7 +407,6 @@ module ProtocolBuffers
     end
 
     def self.define_field(otype, type, name, tag, opts = {}) # :NODOC:
-      raise("gen_methods! already called, cannot add more fields") if @methods_generated
       type = type.is_a?(Module) ? type : type.to_sym
       name = name.to_sym
       tag  = tag.to_i
@@ -462,11 +450,13 @@ module ProtocolBuffers
       return true unless @has_required_field
 
       fields.each do |tag, field|
-        if field.otype == :required && !message.value_for_tag?(tag)
-          return false unless raise_exception
-          raise(ProtocolBuffers::EncodeError.new(field), "Required field '#{field.name}' is invalid")
-        end
+        next if field.otype != :required
+        next if message.value_for_tag?(tag) && (field.class != Field::MessageField || message.value_for_tag(tag).valid?)
+        return false unless raise_exception
+        raise(ProtocolBuffers::EncodeError.new(field), "Required field '#{field.name}' is invalid")
       end
+
+      true
     end
 
     def validate!
@@ -492,14 +482,21 @@ module ProtocolBuffers
       (@unknown_fields || []).size
     end
 
-    # Generate the initialize method using reflection, to improve speed. This is
-    # called by the generated .pb.rb code, it's not necessary to call this
-    # method directly.
+    # left in for compatibility with previously created .pb.rb files -- no longer used
     def self.gen_methods! # :NODOC:
       @methods_generated = true
-      # these generated methods have gone away for now -- the infrastructure has
-      # been left in place, since they'll probably make their way back in at
-      # some point.
+    end
+
+    protected
+
+    def initialize_field(tag)
+      field = fields[tag]
+      new_value = field.default_value
+      self.instance_variable_set("@#{field.name}", new_value)
+      if field.class == Field::MessageField
+        new_value.notify_on_change(self, tag)
+      end
+      @set_fields[tag] = false
     end
 
   end

data/spec/fields_spec.rb

@@ -46,4 +46,8 @@ describe ProtocolBuffers, "fields" do
     end
   end
 
+  it "provides a reader for proxy_class on message fields" do
+    ProtocolBuffers::Field::MessageField.new(nil, :optional, :fake_name, 1).should respond_to(:proxy_class)
+    ProtocolBuffers::Field::MessageField.new(Class, :optional, :fake_name, 1).proxy_class.should == Class
+  end
 end

data/spec/runtime_spec.rb

@@ -81,6 +81,45 @@ describe ProtocolBuffers, "runtime" do
     a1.sub2.has_subsub1?.should == true
   end
 
+  it "allows directly recursive sub-messages" do
+    ProtocolBuffers::Compiler.compile_and_load_string <<-EOS
+     package foo;
+      message Foo {
+        optional int32 payload = 1;
+        optional Foo foo = 2;
+      }
+    EOS
+
+    foo = Foo::Foo.new
+    foo.has_foo?.should == false
+    foo.foo.payload = 17
+    foo.has_foo?.should == true
+    foo.foo.has_foo?.should == false
+  end
+
+  it "allows indirectly recursive sub-messages" do
+    ProtocolBuffers::Compiler.compile_and_load_string <<-EOS
+     package foo;
+      message Foo {
+        optional int32 payload = 1;
+        optional Bar bar = 2;
+      }
+
+      message Bar {
+        optional Foo foo = 1;
+        optional int32 payload = 2;
+      }
+    EOS
+
+    foo = Foo::Foo.new
+    foo.has_bar?.should == false
+    foo.bar.payload = 17
+    foo.has_bar?.should == true
+    foo.bar.has_foo?.should == false
+    foo.bar.foo.payload = 23
+    foo.bar.has_foo?.should == true
+  end
+
   it "pretends that repeated fields are arrays" do
     # make sure our RepeatedField class acts like a normal Array
     ProtocolBuffers::Compiler.compile_and_load_string <<-EOS
@@ -239,10 +278,8 @@ describe ProtocolBuffers, "runtime" do
     sub.payload.should == ""
   end
 
-  it "doesn't allow defining fields after gen_methods is called" do
-    proc do
-      A.define_field(:optional, :string, "newfield", 15)
-    end.should raise_error()
+  it "responds to gen_methods! for backwards compat" do
+    A.gen_methods!
   end
 
   def filled_in_bit
@@ -496,16 +533,29 @@ describe ProtocolBuffers, "runtime" do
     res3 = TehUnknown3::MyResult.parse(serialized2)
     res3.field_1.should == 2
   end
-  
+
   it "can compile and instantiate a message in a package with under_scores" do
     Object.send(:remove_const, :UnderScore) if defined?(UnderScore)
-    
+
     ProtocolBuffers::Compiler.compile_and_load(
       File.join(File.dirname(__FILE__), "proto_files", "under_score_package.proto"))
-      
+
     proc do
       under_test = UnderScore::UnderTest.new
     end.should_not raise_error()
   end
 
+  describe "Message#valid?" do
+    it "should validate sub-messages" do
+      f = Featureful::A.new
+      f.i3 = 1
+      f.sub3 = Featureful::A::Sub.new
+      f.valid?.should == false
+      f.sub3.valid?.should == false
+      f.sub3.payload_type = Featureful::A::Sub::Payloads::P1
+      f.valid?.should == true
+      f.sub3.valid?.should == true
+    end
+  end
+
 end

metadata

@@ -1,105 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-protocol-buffers
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.2.3.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Brian Palmer
 - Rob Marable
 - Paulo Luis Franchini Casaretto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70124285265220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: autotest-standalone
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70124285265220
+- !ruby/object:Gem::Dependency
+  name: autotest-standalone
+  requirement: &70124285264800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70124285264800
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: &70124285264340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70124285264340
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70124285263920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70124285263920
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70124285263480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70124285263480
 description: 
-email: 
+email:
 - brian@codekitchen.net
-executables: 
+executables:
 - ruby-protoc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Changelog.md
-files: 
+files:
 - .document
 - .gitignore
 - Changelog.md
@@ -151,38 +128,29 @@ files:
 - spec/unicode_string_spec.rb
 homepage: https://github.com/mozy/ruby-protocol-buffers
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby compiler and runtime for the google protocol buffers library.
-test_files: 
+test_files:
 - spec/compiler_spec.rb
 - spec/fields_spec.rb
 - spec/negative_int32_spec.rb