msgpack_rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2f1d29060724de7628414010d1ae64726a42031
-  data.tar.gz: 9af97cd66af6a9ac3b066cfe8a7de5f0cf0dd1d1
+SHA256:
+  metadata.gz: 00efa0feb39b9beea82cbace5192b43bb070f84e90507ed35b4bf36babcd6ef0
+  data.tar.gz: c25775d97ea9901a21ade994fe080b564ab9198d5b6c85570b5e0d705300aad4
 SHA512:
-  metadata.gz: 9a915f09a781a4148b62a79b3082006a8171accb70e95e449c907acea061e59472000fcffaf2297accd4f0622c92a6444e5b164d9e840b18372830ce909a71ea
-  data.tar.gz: 55241e38fe2ecf105a6dfdb4148542d64575bb9f74262dcae03f274c1e237bcc8b774eaf553b19ceebdd79fba2674caa43859876e05d81a21a8127007c8a94ee
+  metadata.gz: e790c4b03853ee64aae3496efbe93b1974cabcbd866747ee7a6df498e72743eba0ce5512edbf67dba2e0ce7594fa2738521e01ce0c1c725cd0e31e1fad9aeac8
+  data.tar.gz: 4d280dd65409fec590baae67e0561d7688d844b20cba9c3b7075dc29d309a23dad37280a61aee7bc53f85e8a4cec8c4d888246484ef12f59da1b0c8d63063c57

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+gemfiles/*.lock

data/.travis.yml

@@ -3,3 +3,51 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.2
+  - 2.3.0
+  - 2.4.1
+  - 2.5.0
+gemfile:
+  - gemfiles/rails_41.gemfile
+  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_edge.gemfile
+matrix:
+  exclude:
+    # Rails 5.0+ requires CRuby 2.2.2+
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_51.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_51.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_51.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_edge.gemfile
+    # Rails 6.0+ requires CRuby 2.4.1+
+    - rvm: 2.2.2
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_edge.gemfile
+    # CRuby 2.4+ requires Rails 4.2.8+
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_41.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_41.gemfile

data/gemfiles/rails_41.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.2.8"
+
+gemspec :path => "../"

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 5.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 5.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem "rails", :github => "rails/rails"
+
+gemspec :path => "../"

data/lib/msgpack_rails.rb

@@ -35,9 +35,16 @@ if defined?(::Rails)
 
         ::Mime::Type.register "application/msgpack", :msgpack
 
-        ::ActionController::Renderers.add :msgpack do |data, options|
-          self.content_type = Mime::MSGPACK
-          self.response_body = data.as_msgpack(options)
+        if ::Rails::VERSION::MAJOR > 3 || ::Rails::VERSION::MINOR > 0
+          ::ActionController::Renderers.add :msgpack do |data, options|
+            self.content_type = Mime[:msgpack]
+            data.is_a?(String) ? data : data.to_msgpack(options)
+          end
+        else
+          ::ActionController::Renderers.add :msgpack do |data, options|
+            self.content_type = Mime[:msgpack]
+            self.response_body = data.is_a?(String) ? data : data.to_msgpack(options)
+          end
         end
       end
     end

data/lib/msgpack_rails/activesupport/core_ext/object/to_msgpack.rb

@@ -8,7 +8,13 @@ end
 # The msgpack gem adds a few modules to Ruby core classes containing :to_msgpack definition, overwriting
 # their default behavior. That said, we need to define the basic to_msgpack method in all of them,
 # otherwise they will always use to_msgpack gem implementation.
-[Object, NilClass, TrueClass, FalseClass, Fixnum, Bignum, Float, String, Array, Hash, Symbol].each do |klass|
+klasses = [Object, NilClass, TrueClass, FalseClass, Float, String, Array, Hash, Symbol]
+if 1.class.name == "Integer"
+  klasses.push(Integer)
+else
+  klasses.push(Fixnum, Bignum)
+end
+klasses.each do |klass|
   klass.class_eval do
     alias_method :msgpack_to_msgpack, :to_msgpack if respond_to?(:to_msgpack)
     # Dumps object in msgpack. See http://msgpack.org for more infoa

data/lib/msgpack_rails/version.rb

@@ -1,3 +1,3 @@
 module MsgpackRails
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/msgpack_rails.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 10.3.1"
   spec.add_development_dependency "minitest", "~> 5.3.3"
-  spec.add_development_dependency "activemodel", "~> 4.1.0"
+  spec.add_development_dependency "rails", ">= 4.1.0"
 end

data/test/msgpack_rails/fake_app.rb

@@ -0,0 +1,15 @@
+require "action_controller/railtie"
+require "active_model/railtie"
+
+class FakeApp < Rails::Application
+  config.secret_token = config.secret_key_base = "1234567890"
+  config.session_store :cookie_store, key: '_myapp_session'
+  config.active_support.deprecation = :log
+  config.eager_load = false
+  config.root = File.dirname(__FILE__)
+end
+Rails.backtrace_cleaner.remove_silencers!
+Rails.application.initialize!
+
+class ApplicationController < ActionController::Base
+end

data/test/msgpack_rails/rendering_test.rb

@@ -0,0 +1,58 @@
+require_relative "../test_helper"
+
+class ContactsController < ApplicationController
+  def raw
+    @contact = new_contact
+    render msgpack: @contact
+  end
+  def serialized
+    @contact = new_contact
+    render msgpack: @contact.to_msgpack
+  end
+  private
+  def new_contact
+    contact = Contact.new
+    contact.name = 'Konata Izumi'
+    contact.age = 16
+    contact.created_at = Time.utc(2006, 8, 1)
+    contact.awesome = true
+    contact.preferences = { 'shows' => 'anime' }
+    contact
+  end
+end
+
+class RenderingTest < ActionController::TestCase
+  tests ContactsController
+
+  def setup
+    r = ActionDispatch::Routing::RouteSet.new
+    r.draw do
+      get ":controller/:action"
+    end
+    r.finalize!
+    @routes = r
+  end
+
+  def test_raw
+    get :raw, :format => :msgpack
+    verify_response
+  end
+
+  def test_serialized
+    get :serialized, :format => :msgpack
+    verify_response
+  end
+
+  private
+
+  def verify_response
+    assert_response :success
+
+    contact = MessagePack.unpack(response.body)
+    assert_equal 'Konata Izumi', contact['name']
+    assert_equal 16, contact['age']
+    assert_equal Time.utc(2006, 8, 1), contact['created_at']
+    assert_equal true, contact['awesome']
+    assert_equal({ 'shows' => 'anime' }, contact['preferences'])
+  end
+end

data/test/test_helper.rb

@@ -1,2 +1,4 @@
 require "minitest/autorun"
+require "rails"
 require_relative "../lib/msgpack_rails"
+require_relative "msgpack_rails/fake_app"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgpack_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jingwen Owen Ou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,17 +67,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.3.3
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 description: Message Pack for Rails.
@@ -93,6 +93,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_41.gemfile
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/msgpack_rails.rb
 - lib/msgpack_rails/activemodel/serializers/message_pack.rb
 - lib/msgpack_rails/activesupport/core_ext/object/to_msgpack.rb
@@ -104,7 +110,9 @@ files:
 - test/msgpack_rails/core_ext_test.rb
 - test/msgpack_rails/decoding_test.rb
 - test/msgpack_rails/encoding_test.rb
+- test/msgpack_rails/fake_app.rb
 - test/msgpack_rails/models/contact.rb
+- test/msgpack_rails/rendering_test.rb
 - test/msgpack_rails/serializer_test.rb
 - test/test_helper.rb
 homepage: https://github.com/jingweno/msgpack_rails
@@ -127,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The Rails way to serialize/deserialize with Message Pack.
@@ -135,6 +143,8 @@ test_files:
 - test/msgpack_rails/core_ext_test.rb
 - test/msgpack_rails/decoding_test.rb
 - test/msgpack_rails/encoding_test.rb
+- test/msgpack_rails/fake_app.rb
 - test/msgpack_rails/models/contact.rb
+- test/msgpack_rails/rendering_test.rb
 - test/msgpack_rails/serializer_test.rb
 - test/test_helper.rb