Skip to content

Commit

Permalink
Merge 8ae1d01 into c80d38d
Browse files Browse the repository at this point in the history
  • Loading branch information
rosylilly committed Mar 18, 2016
2 parents c80d38d + 8ae1d01 commit 566fa0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
12 changes: 6 additions & 6 deletions grape-msgpack.gemspec
Expand Up @@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
spec.version = Grape::Msgpack::VERSION
spec.authors = ["Sho Kusano"]
spec.email = ["rosylilly@aduca.org"]
spec.summary = %q{msgpack formatter for grape}
spec.description = %q{msgpack formatter for grape}
spec.summary = %q{Messagepack formatter for grape}
spec.description = %q{Messagepack formatter for grape}
spec.homepage = ""
spec.license = "MIT"

Expand All @@ -20,10 +20,10 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'bundler'
spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec', '~> 2.14.1'
spec.add_development_dependency 'rspec', '~> 3.4'
spec.add_development_dependency 'rack-test', '~> 0.6.2'
spec.add_development_dependency 'grape-entity', '~> 0.3.0'
spec.add_development_dependency 'grape-entity', '~> 0.5.0'

spec.add_dependency 'grape', '>= 0.6.0'
spec.add_dependency 'msgpack', '~> 0.5.6'
spec.add_dependency 'grape'
spec.add_dependency 'msgpack', '>= 0.7.4'
end
14 changes: 3 additions & 11 deletions lib/grape/msgpack.rb
Expand Up @@ -36,17 +36,9 @@ def call(object, env)
end
end

class << Grape::Formatter::Base
FORMATTERS[:msgpack] = Grape::Msgpack::Formatter
end

class << Grape::ErrorFormatter::Base
FORMATTERS[:msgpack] = Grape::Msgpack::ErrorFormatter
end

class << Grape::Parser::Base
PARSERS[:msgpack] = Grape::Msgpack::Parser
end
Grape::Formatter.register(:msgpack, Grape::Msgpack::Formatter)
Grape::ErrorFormatter.register(:msgpack, Grape::Msgpack::ErrorFormatter)
Grape::Parser.register(:msgpack, Grape::Msgpack::Parser)

Grape::ContentTypes::CONTENT_TYPES[:msgpack] = 'application/x-msgpack'

Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Expand Up @@ -2,7 +2,6 @@
Coveralls.wear!

RSpec.configure do |config|
config.treat_symbols_as_metadata_keys_with_true_values = true
config.run_all_when_everything_filtered = true
config.filter_run :focus
end

0 comments on commit 566fa0f

Please sign in to comment.