multi_json 1.3.2 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.travis.yml CHANGED
@@ -1,9 +1,10 @@
1
1
  language: ruby
2
2
  rvm:
3
+ - rbx-18mode
4
+ - rbx-19mode
5
+ - jruby-18mode
6
+ - jruby-19mode
3
7
  - 1.8.7
4
8
  - 1.9.2
5
9
  - 1.9.3
6
- - jruby-18mode
7
- - jruby-19mode
8
- - rbx-18mode
9
- - rbx-19mode
10
+ - ruby-head
data/lib/multi_json.rb CHANGED
@@ -19,12 +19,6 @@ module MultiJson
19
19
  ["json/pure", :json_pure]
20
20
  ]
21
21
 
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
-
28
22
  # The default adapter based on what you currently
29
23
  # have loaded and installed. First checks to see
30
24
  # if any adapters are already loaded, then checks
@@ -46,12 +40,8 @@ module MultiJson
46
40
  Kernel.warn "[WARNING] MultiJson is using the default adapter (ok_json). We recommend loading a different JSON library to improve performance."
47
41
  :ok_json
48
42
  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
55
45
 
56
46
  # Get the current adapter class.
57
47
  def adapter
@@ -59,12 +49,8 @@ module MultiJson
59
49
  self.use self.default_adapter
60
50
  @adapter
61
51
  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
68
54
 
69
55
  # Set the JSON parser utilizing a symbol, string, or class.
70
56
  # Supported by default are:
@@ -79,6 +65,8 @@ module MultiJson
79
65
  @adapter = load_adapter(new_adapter)
80
66
  end
81
67
  alias :adapter= :use
68
+ # :nodoc:
69
+ alias :engine= :use
82
70
 
83
71
  def load_adapter(new_adapter)
84
72
  case new_adapter
@@ -94,12 +82,6 @@ module MultiJson
94
82
  end
95
83
  end
96
84
 
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
-
103
85
  # Decode a JSON string into Ruby.
104
86
  #
105
87
  # <b>Options</b>
@@ -112,6 +94,8 @@ module MultiJson
112
94
  rescue adapter::ParseError => exception
113
95
  raise DecodeError.new(exception.message, exception.backtrace, string)
114
96
  end
97
+ # :nodoc:
98
+ alias :decode :load
115
99
 
116
100
  def current_adapter(options)
117
101
  if new_adapter = (options || {}).delete(:adapter)
@@ -121,25 +105,12 @@ module MultiJson
121
105
  end
122
106
  end
123
107
 
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
-
130
108
  # Encodes a Ruby object as JSON.
131
109
  def dump(object, options={})
132
110
  adapter = current_adapter(options)
133
111
  adapter.dump(object, options)
134
112
  end
113
+ # :nodoc:
114
+ alias :encode :dump
135
115
 
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
145
116
  end
@@ -1,3 +1,3 @@
1
1
  module MultiJson
2
- VERSION = "1.3.2"
2
+ VERSION = "1.3.3"
3
3
  end
data/multi_json.gemspec CHANGED
@@ -13,26 +13,6 @@ Gem::Specification.new do |gem|
13
13
  gem.files = Dir['LICENSE.md', 'README.md', 'Rakefile', 'multi_json.gemspec', 'Gemfile', '.document', '.rspec', '.travis.yml' ,'spec/**/*', 'lib/**/*']
14
14
  gem.homepage = 'http://github.com/intridea/multi_json'
15
15
  gem.name = 'multi_json'
16
- gem.post_install_message =<<eos
17
- ********************************************************************************
18
-
19
- MultiJson.encode is deprecated and will be removed in the next major version.
20
- Use MultiJson.dump instead.
21
-
22
- MultiJson.decode is deprecated and will be removed in the next major version.
23
- Use MultiJson.load instead.
24
-
25
- MultiJson.engine is deprecated and will be removed in the next major version.
26
- Use MultiJson.adapter instead.
27
-
28
- MultiJson.engine= is deprecated and will be removed in the next major
29
- version. Use MultiJson.use instead.
30
-
31
- MultiJson.default_engine is deprecated and will be removed in the next major
32
- version. Use MultiJson.default_adapter instead.
33
-
34
- ********************************************************************************
35
- eos
36
16
  gem.rdoc_options = ["--charset=UTF-8"]
37
17
  gem.require_paths = ['lib']
38
18
  gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6")
data/spec/helper.rb CHANGED
@@ -8,7 +8,9 @@ end
8
8
 
9
9
  unless ENV['CI'] || macruby?
10
10
  require 'simplecov'
11
- SimpleCov.start
11
+ SimpleCov.start do
12
+ add_filter 'spec'
13
+ end
12
14
  end
13
15
  require 'multi_json'
14
16
  require 'rspec'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: multi_json
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.2
4
+ version: 1.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-04-17 00:00:00.000000000 Z
14
+ date: 2012-04-28 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rake
@@ -112,15 +112,7 @@ files:
112
112
  - lib/multi_json.rb
113
113
  homepage: http://github.com/intridea/multi_json
114
114
  licenses: []
115
- post_install_message: ! "********************************************************************************\n\n
116
- \ MultiJson.encode is deprecated and will be removed in the next major version.\n
117
- \ Use MultiJson.dump instead.\n\n MultiJson.decode is deprecated and will be removed
118
- in the next major version.\n Use MultiJson.load instead.\n\n MultiJson.engine
119
- is deprecated and will be removed in the next major version.\n Use MultiJson.adapter
120
- instead.\n\n MultiJson.engine= is deprecated and will be removed in the next major\n
121
- \ version. Use MultiJson.use instead.\n\n MultiJson.default_engine is deprecated
122
- and will be removed in the next major\n version. Use MultiJson.default_adapter
123
- instead.\n\n********************************************************************************\n"
115
+ post_install_message:
124
116
  rdoc_options:
125
117
  - --charset=UTF-8
126
118
  require_paths:
@@ -139,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
131
  version: 1.3.6
140
132
  requirements: []
141
133
  rubyforge_project:
142
- rubygems_version: 1.8.22
134
+ rubygems_version: 1.8.24
143
135
  signing_key:
144
136
  specification_version: 3
145
137
  summary: A gem to provide swappable JSON backends.