prepor-beefcake 1.1.0.pre1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915e8345407108ce58720d3ad23e18f213bf958e
-  data.tar.gz: 134cfad1c7d35baa319d865f8746b8a39b85aea5
+  metadata.gz: b05eb3a8400e0af12563f45411a2e95cfb762ab6
+  data.tar.gz: ea1e377af18cbfb73ee824731e2ecbb0b3550d98
 SHA512:
-  metadata.gz: 8fe0fad9ce257efb62ea6be7709fdbeee3121e0868213ab33765dbe7131d16a5ace2d48529815d8268f112304e3eedb9ddf9f0410e5613f4a7184fb21d2b8f8e
-  data.tar.gz: cf2294ec52db492116034ba0290b0c2def5075f1ac7c9c7c44ce28ac7f68808b3928b518b1b471e66841f8c07e281b2428cfb29921c618ce8e58d477b9a685d5
+  metadata.gz: 21a7d5536ea0f5181357987ccfb8a9e4ff20757e2ee5e34a52b450d966cc62f5330b0d7b11c2aadbcbc92b22656d2afb8c1ed4ecd77ba9953deef87d8e46a052
+  data.tar.gz: 40ae3e963de1fbcad69d9f8b48fbdaf5bfdfbea1de6b99b8e8c3e8803487d965b142a24e27ddc5d76a95902c448627329571fba5cd0aa2d9b95d0e45b91343ae

data/.travis.yml

@@ -3,13 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.1
+  - 2.1.2
   - jruby-19mode
-  - rbx-2.2.7
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head

data/lib/beefcake.rb

@@ -33,18 +33,6 @@ module Beefcake
       def <=>(o)
         fn <=> o.fn
       end
-
-      def same_type?(obj)
-        type == obj
-      end
-
-      def is_protobuf?
-        type.is_a?(Class) and type.include?(Beefcake::Message)
-      end
-
-      def required? ; rule == :required end
-      def repeated? ; rule == :repeated end
-      def optional? ; rule == :optional end
     end
 
 
@@ -197,8 +185,7 @@ module Beefcake
             end
           elsif fld.rule == :repeated
             val = buf.read(fld.type)
-            o[fld.name] ||= []
-            o[fld.name] << val
+            (o[fld.name] ||= []) << val
           else
             val = buf.read(fld.type)
             o[fld.name] = val
@@ -237,66 +224,10 @@ module Beefcake
       o.send(:include, Encode)
     end
 
-    # (see #assign)
     def initialize(attrs={})
-      assign attrs
-    end
-
-    # Handles filling a protobuf message from a hash. Embedded messages can
-    # be passed in two ways, by a pure hash or as an instance of embedded class(es).
-    #
-    # @example By a pure hash.
-    #   {:field1 => 2, :embedded => {:embedded_f1 => 'lala'}}
-    #
-    # @example Repeated embedded message by a pure hash.
-    #   {:field1 => 2, :embedded => [
-    #     {:embedded_f1 => 'lala'},
-    #     {:embedded_f1 => 'lulu'}
-    #   ]}
-    #
-    # @example As an instance of embedded class.
-    #   {:field1 => 2, :embedded => EmbeddedMsg.new({:embedded_f1 => 'lala'})}
-    #
-    # @param [Hash] data to fill a protobuf message with.
-    def assign(attrs)
       __beefcake_fields__.values.each do |fld|
-        attribute = attrs[fld.name]
-
-        if attribute.nil?
-          self[fld.name] = nil
-          next
-        end
-
-        unless fld.is_protobuf?
-          self[fld.name] = attribute
-          next
-        end
-
-        if fld.repeated? && attribute.is_a?(Hash)
-          self[fld.name] = fld.type.new(attribute)
-          next
-        end
-
-        if fld.repeated? && attribute.is_a?(fld.type)
-          self[fld.name] = [attribute]
-          next
-        end
-
-        if fld.repeated?
-          self[fld.name] = attribute.map do |i|
-            fld.same_type?(i) ? i : fld.type.new(i)
-          end
-          next
-        end
-
-        if fld.same_type? attribute
-          self[fld.name] = attribute
-          next
-        end
-
-        self[fld.name] = fld.type.new(attribute)
+        self[fld.name] = attrs[fld.name]
       end
-      self
     end
 
     def __beefcake_fields__
@@ -339,22 +270,10 @@ module Beefcake
 
     def to_hash
       __beefcake_fields__.values.inject({}) do |h, fld|
-        v = self[fld.name]
-        next h if v.nil?
-
-        h[fld.name] =
-          case
-          when v.respond_to?(:to_hash)
-            # A nested protobuf message, so let's call its 'to_hash' method.
-            v.to_hash
-          when v.is_a?(Array)
-            # There can be two field types stored in array.
-            # Primitive type or nested another protobuf message.
-            # The later one has got a 'to_hash' method.
-            v.map { |i| i.respond_to?(:to_hash) ? i.to_hash : i }
-          else
-            v
-          end
+        value = self[fld.name]
+        unless value.nil?
+          h[fld.name] = value
+        end
         h
       end
     end

data/lib/beefcake/generator.rb

@@ -140,10 +140,10 @@ module Beefcake
     T = CodeGeneratorRequest::FieldDescriptorProto::Type
 
 
-    def self.compile(ns, req)
+    def self.compile(req)
       file = req.proto_file.map do |file|
         g = new(StringIO.new)
-        g.compile(ns, file)
+        g.compile(file)
 
         g.c.rewind
         CodeGeneratorResponse::File.new(
@@ -266,7 +266,7 @@ module Beefcake
       puts "require \"beefcake\""
       puts
 
-      ns!(package.split('.').map { |v| camelize(v) }) do
+      ns!(file.package.split('.').map { |v| camelize(v) }) do
         Array(file.enum_type).each do |et|
           enum!(et)
         end

data/lib/beefcake/version.rb

@@ -1,3 +1,3 @@
 module Beefcake
-  VERSION = "1.1.0.pre1"
+  VERSION = "1.1.0"
 end

data/test/message_test.rb

@@ -102,70 +102,6 @@ class FieldsMessage
   repeated :fields, :string, 1
 end
 
-class FieldTest < Minitest::Test
-  FIELD = Beefcake::Message::Field
-
-  def test_required?
-    f = FIELD.new :required, :field1, :string, 1
-    assert f.required?
-    refute f.optional?
-    refute f.repeated?
-
-    f = FIELD.new :optional, :field1, :int32, 1
-    refute f.required?
-
-    f = FIELD.new :repeated, :field1, :int32, 1
-    refute f.required?
-  end
-
-  def test_optional?
-    f = FIELD.new :optional, :field1, :string, 1
-    assert f.optional?
-    refute f.required?
-    refute f.repeated?
-
-    f = FIELD.new :required, :field1, :int32, 1
-    refute f.optional?
-
-    f = FIELD.new :repeated, :field1, :int32, 1
-    refute f.optional?
-  end
-
-  def test_repeated?
-    f = FIELD.new :repeated, :field1, :string, 1
-    assert f.repeated?
-    refute f.required?
-    refute f.optional?
-
-    f = FIELD.new :optional, :field1, :int32, 1
-    refute f.repeated?
-
-    f = FIELD.new :required, :field1, :int32, 1
-    refute f.optional?
-  end
-
-  def test_same_type
-    f = FIELD.new(:required, :field1, :int32, 1)
-    assert f.same_type?(:int32)
-    refute f.same_type?(:int64)
-    refute f.same_type?(SimpleMessage)
-
-    f = FIELD.new(:required, :field1, SimpleMessage, 1)
-    assert f.same_type?(SimpleMessage)
-    refute f.same_type?(:int32)
-    refute f.same_type?(:string)
-    refute f.same_type?(NumericsMessage)
-  end
-
-  def test_is_protobuf?
-    f = FIELD.new(:required, :field1, SimpleMessage, 1)
-    assert f.is_protobuf?
-
-    f = FIELD.new(:required, :field1, :string, 1)
-    refute f.is_protobuf?
-  end
-end
-
 class MessageTest < Minitest::Test
   B = Beefcake::Buffer
 
@@ -227,12 +163,6 @@ class MessageTest < Minitest::Test
     )
 
     assert_equal buf2.to_s, msg.encode.to_s
-
-    msg = CompositeMessage.new(
-        :encodable => {:a => 123}
-    )
-    assert_equal buf2.to_s, msg.encode.to_s
-
   end
 
   def test_encode_to_string
@@ -266,9 +196,6 @@ class MessageTest < Minitest::Test
 
     msg = EnumsMessage.new :a => EnumsMessage::X::A
     assert_equal "\b\001", msg.encode.to_s
-
-    msg = EnumsMessage.new :a => 1
-    assert_equal "\b\001", msg.encode.to_s
   end
 
   def test_encode_invalid_enum_value
@@ -342,16 +269,6 @@ class MessageTest < Minitest::Test
     msg.encode.to_s
   end
 
-  def test_repeated_with_hash
-    before = { simple: { b: 'hello' } }
-    RepeatedNestedMessage.new before
-  end
-
-  def test_repeated_with_scalar
-    inner = SimpleMessage.new(b: 'hello')
-    RepeatedNestedMessage.new simple: inner
-  end
-
   ## Decoding
   def test_decode_numerics
     msg = NumericsMessage.new({
@@ -444,16 +361,6 @@ class MessageTest < Minitest::Test
     assert_equal 2, got.simple.size
     assert_equal 1, got.simple[0].a
     assert_equal "hello", got.simple[1].b
-
-    simple_pure = [
-      {:a => 1},
-      {:b => "hello"}
-    ]
-    msg = RepeatedNestedMessage.new(:simple => simple_pure).encode
-    got = RepeatedNestedMessage.decode(msg)
-    assert_equal 2, got.simple.size
-    assert_equal 1, got.simple[0].a
-    assert_equal "hello", got.simple[1].b
   end
 
   def test_equality
@@ -502,23 +409,7 @@ class MessageTest < Minitest::Test
   def test_to_hash
     msg =  SimpleMessage.new :a => 1
     exp = { :a => 1 }
-    assert_equal exp, msg.to_hash
-
-    msg = RepeatedNestedMessage.new(
-      :simple => [
-        SimpleMessage.new(:a => 1),
-        SimpleMessage.new(:b => 'abc dfg'),
-        SimpleMessage.new(:a => 2, :b => 'ijk lmn')
-      ]
-    )
-    exp = {
-      :simple =>[
-        {:a => 1},
-        {:b => 'abc dfg'},
-        {:a => 2, :b => 'ijk lmn'}
-      ]
-    }
-    assert_equal exp, msg.to_hash
+    assert_equal(exp, msg.to_hash)
   end
 
   def test_duplicate_index

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prepor-beefcake
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,7 +46,7 @@ email:
 - matt.proud@gmail.com
 - bkerley@brycekerley.net
 executables:
-- protoc-gen-beefcake
+- protoc-gen-prepor-beefcake
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,7 +59,7 @@ files:
 - Rakefile
 - beefcake.gemspec
 - bench/simple.rb
-- bin/protoc-gen-beefcake
+- bin/protoc-gen-prepor-beefcake
 - dat/code_generator_request.dat
 - lib/beefcake.rb
 - lib/beefcake/buffer.rb
@@ -89,9 +89,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3