@@ -19,12 +19,6 @@ def initialize(message, backtrace, data)
1919 [ "json/pure" , :json_pure ]
2020 ]
2121
22- # TODO: Remove for 2.0 release (but no sooner)
23- def default_engine
24- deprecate ( "MultiJson.default_engine is deprecated and will be removed in the next major version. Use MultiJson.default_adapter instead." )
25- self . default_adapter
26- end
27-
2822 # The default adapter based on what you currently
2923 # have loaded and installed. First checks to see
3024 # if any adapters are already loaded, then checks
@@ -46,25 +40,17 @@ def default_adapter
4640 Kernel . warn "[WARNING] MultiJson is using the default adapter (ok_json). We recommend loading a different JSON library to improve performance."
4741 :ok_json
4842 end
49-
50- # TODO: Remove for 2.0 release (but no sooner)
51- def engine
52- deprecate ( "MultiJson.engine is deprecated and will be removed in the next major version. Use MultiJson.adapter instead." )
53- self . adapter
54- end
43+ # :nodoc:
44+ alias :default_engine :default_adapter
5545
5646 # Get the current adapter class.
5747 def adapter
5848 return @adapter if @adapter
5949 self . use self . default_adapter
6050 @adapter
6151 end
62-
63- # TODO: Remove for 2.0 release (but no sooner)
64- def engine = ( new_engine )
65- deprecate ( "MultiJson.engine= is deprecated and will be removed in the next major version. Use MultiJson.use instead." )
66- self . use ( new_engine )
67- end
52+ # :nodoc:
53+ alias :engine :adapter
6854
6955 # Set the JSON parser utilizing a symbol, string, or class.
7056 # Supported by default are:
@@ -79,6 +65,8 @@ def use(new_adapter)
7965 @adapter = load_adapter ( new_adapter )
8066 end
8167 alias :adapter= :use
68+ # :nodoc:
69+ alias :engine= :use
8270
8371 def load_adapter ( new_adapter )
8472 case new_adapter
@@ -94,12 +82,6 @@ def load_adapter(new_adapter)
9482 end
9583 end
9684
97- # TODO: Remove for 2.0 release (but no sooner)
98- def decode ( string , options = { } )
99- deprecate ( "MultiJson.decode is deprecated and will be removed in the next major version. Use MultiJson.load instead." )
100- self . load ( string , options )
101- end
102-
10385 # Decode a JSON string into Ruby.
10486 #
10587 # <b>Options</b>
@@ -112,6 +94,8 @@ def load(string, options={})
11294 rescue adapter ::ParseError => exception
11395 raise DecodeError . new ( exception . message , exception . backtrace , string )
11496 end
97+ # :nodoc:
98+ alias :decode :load
11599
116100 def current_adapter ( options )
117101 if new_adapter = ( options || { } ) . delete ( :adapter )
@@ -121,25 +105,12 @@ def current_adapter(options)
121105 end
122106 end
123107
124- # TODO: Remove for 2.0 release (but no sooner)
125- def encode ( object , options = { } )
126- deprecate ( "MultiJson.encode is deprecated and will be removed in the next major version. Use MultiJson.dump instead." )
127- self . dump ( object , options )
128- end
129-
130108 # Encodes a Ruby object as JSON.
131109 def dump ( object , options = { } )
132110 adapter = current_adapter ( options )
133111 adapter . dump ( object , options )
134112 end
113+ # :nodoc:
114+ alias :encode :dump
135115
136- # Sends of a deprecation warning
137- def deprecate ( raw_message )
138- @messages ||= { }
139- message = "#{ Kernel . caller [ 1 ] } : [DEPRECATION] #{ raw_message } "
140- unless @messages [ message ]
141- @messages [ message ] = true
142- Kernel . warn message
143- end
144- end
145116end
0 commit comments