protobuf 2.2.6 → 2.2.7

data/lib/protobuf/enum.rb

@@ -18,7 +18,7 @@ module Protobuf
     def self.fetch(value)
       case value
       when ::Protobuf::EnumValue then
-        value.value
+        value.to_i
       when Numeric then
         enum_by_value(value.to_i)
       when String, Symbol then

data/lib/protobuf/enum_value.rb

@@ -1,10 +1,22 @@
 require 'protobuf/enum'
 
+##
+# Adding extension to Numeric until
+# we can get people to stop calling #value
+# on EnumValue
+class Numeric
+  unless method_defined?(:value)
+    def value
+      self
+    end
+  end
+end
+
 module Protobuf
   class EnumValue
     include Comparable
 
-    attr_reader :parent_class, :name, :value
+    attr_reader :parent_class, :name
 
     ##
     # Constructor
@@ -21,7 +33,7 @@ module Protobuf
     def <=>(compared_value)
       case compared_value
       when ::Protobuf::EnumValue then
-        value <=> compared_value.value
+        value <=> compared_value.to_i
       when Numeric then
         value <=> compared_value.to_i
       end
@@ -36,10 +48,6 @@ module Protobuf
       "\#<Protobuf::EnumValue #{@parent_class}::#{@name}=#{@value}>"
     end
 
-    def to_hash_value
-      self.to_i
-    end
-
     def to_i
       @value
     end
@@ -58,6 +66,19 @@ module Protobuf
         self.to_i.to_s
       end
     end
+
+    def value
+      if ::Protobuf.print_deprecation_warnings?
+        $stderr.puts("[WARNING] Calling #value on an EnumValue is deprecated and no longer needed.")
+      end
+
+      @value
+    end
+
+    ##
+    # Instance Aliases
+    #
+    alias_method :to_hash_value, :to_i
   end
 end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.2.6'
+  VERSION = '2.2.7'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/enum_value_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe Protobuf::EnumValue do
 
+  def capture_stderr(&required_block)
+    real_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = real_stderr
+  end
+
 	subject { Test::EnumTestType::ONE }
   its(:class) { should eq(Fixnum) }
 	its(:parent_class) { should eq(Test::EnumTestType) }
@@ -16,4 +25,12 @@ describe Protobuf::EnumValue do
     array = [0, 1, 2, 3]
     array[::Test::EnumTestType::ONE].should eq(1)
   end
+
+  it "prints a Warning to $stderr when #value is called" do 
+    local_warning = capture_stderr do 
+      ::Test::EnumTestType::ONE.value
+    end
+
+    local_warning.should match(/deprecated/i)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -501,7 +501,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4600146451913985150
+      hash: 2356396609957916175
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -510,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4600146451913985150
+      hash: 2356396609957916175
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24