THRIFT-2036 Thrift gem warns about class variable access from top level Patch: Takuya Hashimoto & Keith Barrette
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3bb141d3 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3bb141d3 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3bb141d3 Branch: refs/heads/master Commit: 3bb141d3689f0778af3dcf3218cfe760c36803bc Parents: 1bb0ed8 Author: Jens Geyer <[email protected]> Authored: Wed Aug 14 21:33:16 2013 +0200 Committer: Jens Geyer <[email protected]> Committed: Wed Aug 14 21:33:53 2013 +0200 ---------------------------------------------------------------------- lib/rb/lib/thrift/protocol/json_protocol.rb | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/3bb141d3/lib/rb/lib/thrift/protocol/json_protocol.rb ---------------------------------------------------------------------- diff --git a/lib/rb/lib/thrift/protocol/json_protocol.rb b/lib/rb/lib/thrift/protocol/json_protocol.rb index 8694b7d..2e85089 100644 --- a/lib/rb/lib/thrift/protocol/json_protocol.rb +++ b/lib/rb/lib/thrift/protocol/json_protocol.rb @@ -18,21 +18,6 @@ # under the License. # -@@kJSONObjectStart = '{' -@@kJSONObjectEnd = '}' -@@kJSONArrayStart = '[' -@@kJSONArrayEnd = ']' -@@kJSONNewline = '\n' -@@kJSONElemSeparator = ',' -@@kJSONPairSeparator = ':' -@@kJSONBackslash = '\\' -@@kJSONStringDelimiter = '"' - -@@kThriftVersion1 = 1 - -@@kThriftNan = "NaN" -@@kThriftInfinity = "Infinity" -@@kThriftNegativeInfinity = "-Infinity" module Thrift class LookaheadReader @@ -66,6 +51,7 @@ module Thrift # implementations # class JSONContext + @@kJSONElemSeparator = ',' # # Write context data to the trans. Default is to do nothing. # @@ -89,6 +75,8 @@ module Thrift # Context class for object member key-value pairs class JSONPairContext < JSONContext + @@kJSONPairSeparator = ':' + def initialize @first = true @colon = true @@ -146,6 +134,21 @@ module Thrift end class JsonProtocol < BaseProtocol + + @@kJSONObjectStart = '{' + @@kJSONObjectEnd = '}' + @@kJSONArrayStart = '[' + @@kJSONArrayEnd = ']' + @@kJSONNewline = '\n' + @@kJSONBackslash = '\\' + @@kJSONStringDelimiter = '"' + + @@kThriftVersion1 = 1 + + @@kThriftNan = "NaN" + @@kThriftInfinity = "Infinity" + @@kThriftNegativeInfinity = "-Infinity" + def initialize(trans) super(trans) @context = JSONContext.new
