roar-rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55ffa3152e3f698afddef93555e37f5b61d232c
-  data.tar.gz: b3a48ed2ee0c550d255e1a5b031609c53f050a8e
+  metadata.gz: 6817e161c3f12ef7ed0c8658a5bdd24aacbb5a7c
+  data.tar.gz: 20abccfffd64b3f03e6d57fb27bb76ad9cc27812
 SHA512:
-  metadata.gz: a6701490dd9bfbe6730bf702ac41d536e3158982ab469b7a8f217d6469051220b85cfe6019636a261196a5d91bedd579df740482dd6dbb909fedc342a221593c
-  data.tar.gz: 08128efd725c3cae0bf5c5a7bf78ed84e1f71c9c3f48b7569a8676dfe7470bbd21f26894f3f3c2bbfd9ad82ff33bfb450d70bf785bca53a83058a2ea8dc0bff1
+  metadata.gz: 3bb52c91e664b93082dffb57afab0572329f1312c0a5d9cd0f23b85a9457366fcc47e9072dc40d91294db51a9fcdbd27178c5b4af73d91a1eb9cd873ff5a5f71
+  data.tar.gz: bfcb2294190c92540ebdf091ce3c7371ba060e24258e69d578ea6c94870cd955f68edd0f2a6a3d6043845176fdc76df2b8a05e44d6d260c0b9d2d246365cbe46

data/.gitignore

@@ -4,6 +4,7 @@
 bin
 .bundle
 Gemfile*.lock
+gemfiles/*.gemfile.lock
 pkg/*
 test/dummy/log/*
 test/dummy/tmp/*

data/.travis.yml

@@ -1,9 +1,32 @@
+sudo: false
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-gemfile:
-  - gemfiles/Gemfile.rails3-0
-  - gemfiles/Gemfile.rails3-2
-  - gemfiles/Gemfile.rails4-0
-  - gemfiles/Gemfile.rails4-2
+cache: bundler
+matrix:
+  include:
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_3.0.gemfile }
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_3.2.gemfile }
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_4.2.gemfile }
+
+    - { rvm: 2.1,   gemfile: gemfiles/rails_3.0.gemfile }
+    - { rvm: 2.1,   gemfile: gemfiles/rails_3.2.gemfile }
+    - { rvm: 2.1,   gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 2.1,   gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 2.1,   gemfile: gemfiles/rails_4.2.gemfile }
+
+    - { rvm: 2.2.6, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 2.2.6, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 2.2.6, gemfile: gemfiles/rails_4.2.gemfile }
+    - { rvm: 2.2.6, gemfile: gemfiles/rails_5.0.gemfile }
+
+    - { rvm: 2.3.1, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 2.3.1, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 2.3.1, gemfile: gemfiles/rails_4.2.gemfile }
+    - { rvm: 2.3.1, gemfile: gemfiles/rails_5.0.gemfile }
+
+    - { rvm: 2.4.0, gemfile: gemfiles/rails_5.0.gemfile }
+
+    - { rvm: ruby-head, gemfile: gemfiles/rails_5.0.gemfile }
+  allow_failures:
+    - rvm: ruby-head

data/Appraisals

@@ -0,0 +1,49 @@
+appraise 'rails-3.0' do
+  gem 'railties',     '~> 3.0.11'
+  gem 'activerecord', '~> 3.0.11'
+  gem 'minitest-rails', '~> 1.0'
+end
+
+appraise 'rails-3.2' do
+  gem 'railties',     '~> 3.2.13'
+  gem 'activerecord', '~> 3.2.13'
+  gem 'minitest',     '~> 4.7.5'
+  gem 'minitest-rails', '~> 1.0'
+end
+
+appraise 'rails-4.0' do
+  gem 'railties',     '~> 4.0.0'
+  gem 'actionpack',   '~> 4.0.0'
+
+  gem 'activemodel',  '~> 4.0.0'
+  gem 'activerecord', '~> 4.0.0'
+  gem 'minitest',     '~> 4.7.5'
+  gem 'minitest-rails', '~> 1.0'
+end
+
+appraise 'rails-4.1' do
+  gem 'railties',     '~> 4.1.0'
+  gem 'actionpack',   '~> 4.1.0'
+
+  gem 'activemodel',  '~> 4.1.0'
+  gem 'activerecord', '~> 4.1.0'
+  gem 'minitest-rails', '~> 2.0'
+end
+
+appraise 'rails-4.2' do
+  gem 'railties',     '~> 4.2.0'
+  gem 'actionpack',   '~> 4.2.0'
+
+  gem 'activemodel',  '~> 4.2.0'
+  gem 'activerecord', '~> 4.2.0'
+  gem 'minitest-rails', '~> 2.0'
+end
+
+appraise 'rails-5.0' do
+  gem 'railties',     '~> 5.0.0'
+  gem 'actionpack',   '~> 5.0.0'
+
+  gem 'activemodel',  '~> 5.0.0'
+  gem 'activerecord', '~> 5.0.0'
+  gem 'minitest-rails', '~> 3.0'
+end

data/CHANGES.markdown

@@ -1,3 +1,8 @@
+## 1.0.2
+
+* Make Roar version requirement stricter: restrict to 1.0.x series.
+* Initial support for Rails 5 support.
+
 ## 1.0.1
 
 * Added a dependency on `responders` gem for Rails 4.2 support

data/Gemfile

@@ -5,6 +5,17 @@ gemspec
 
 group :test do
   # gem 'roar', path: "../roar" #">= 0.11.17"
-  #gem 'representable', path: "../representable"
+  # gem 'representable', path: "../representable"
   gem 'rake', '10.1.0'
-end
+end
+
+respond_to?(:install_if) and
+  install_if -> { RUBY_VERSION < '2.2.2' } do
+  gem 'actionpack',   '~> 4.2.0'
+  gem 'activemodel',  '~> 4.2.0'
+  gem 'activerecord', '~> 4.2.0'
+end
+
+gem 'nokogiri', '~> 1.6.8'
+
+gem 'appraisal'

data/README.markdown

@@ -2,7 +2,16 @@
 
 _Makes using Roar's representers in your Rails app fun._
 
-Roar is a framework for parsing and rendering REST documents. For a better overview about representers please check the [roar repository](https://github.com/apotonick/roar#roar).
+[![Build Status](https://travis-ci.org/apotonick/roar-rails.svg?branch=master)](https://travis-ci.org/apotonick/roar-rails)
+[![Gem Version](https://badge.fury.io/rb/roar-rails.svg)](http://badge.fury.io/rb/roar-rails)
+
+**IMPORTANT NOTE: roar-rails 1.0.2 does not support Roar 1.1**. Support is still under development and will be released as part of roar-rails 1.1. See [#130](https://github.com/apotonick/roar-rails/issues/130).
+
+_roar-rails development will be discontinued in the future and we will encourage users to begin migrating to [Trailblazer](trailblazer.to) (and [trailblazer-rails](https://github.com/trailblazer/trailblazer-rails))._
+
+---
+
+Roar is a framework for parsing and rendering REST documents. For a better overview about representers please check the [roar repository](https://github.com/trailblazer/roar#roar).
 
 Roar-rails gives you conventions and convenient access to a lot of Roar's functionality within your Rails app.
 
@@ -17,6 +26,20 @@ Roar-rails gives you conventions and convenient access to a lot of Roar's functi
 
 This gem works with all Rails >= 3.x.
 
+## Prerequisites
+
+Add it to your app's `Gemfile`.
+
+```ruby
+gem "roar-rails"
+```
+
+Note: For Rails >= 4.2, you need to add the `responders` gem, too, if you use `respond_with`. This has to be before the `roar-rails` entry in the Gemfile.
+
+```ruby
+gem "responders"
+gem "roar-rails"
+```
 
 ## Generators
 
@@ -170,6 +193,7 @@ If you prefer roar's decorator approach over extend, just go for it. roar-rails
 ```ruby
 class SingerRepresenter < Roar::Decorator
   include Roar::JSON
+  include Roar::Hypermedia
 
   property :name
 
@@ -229,7 +253,7 @@ To get the hyperlinks up and running, please make sure to set the right _host na
 config.representer.default_url_options = {:host => "127.0.0.1:3000"}
 ```
 
-Attention: If you are using representers from a gem your Rails URL helpers might not work in these modules. This is due to a [loading order problem](https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/5tG5unZ8jDQ) in Rails. As a workaround, don't require the representers in the gem but load them as lately as possible, usually it works when you require in the controller. We are working on fixing that problem.
+Attention: If you are using representers from a gem your Rails URL helpers might not work in these modules. This is due to a [loading order problem](https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/5tG5unZ8jDQ) in Rails. As a workaround, don't require the representers in the gem but load them as late as possible, usually it works when you require in the controller. We are working on fixing that problem.
 
 ## Representing Formats Exclusively
 
@@ -270,6 +294,16 @@ end
 
 Put your representers in `app/representers` and they will be autoloaded by Rails. Also, frequently used modules as media representers and features don't need to be required manually.
 
+## JSON-API
+
+In a JSON-API environment, only one representer is written for both singular and collection resources. However, you have to configure `represents` accordingly so it knows what representer to use for collections.
+
+```ruby
+class SongsController < ApplicationController
+  represents :json_api, entity: SongRepresenter, collection: SongRepresenter.for_collection
+```
+
+
 ## Rails 4.1+ and HAL/JSON-API
 
 **Note**: this is a temporary work-around, we're trying to fix that in Rails/roar-rails itself [May 2014].

data/gemfiles/rails_3.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 3.0.11"
+gem "activerecord", "~> 3.0.11"
+gem "minitest-rails", "~> 1.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 3.2.13"
+gem "activerecord", "~> 3.2.13"
+gem "minitest", "~> 4.7.5"
+gem "minitest-rails", "~> 1.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 4.0.0"
+gem "actionpack", "~> 4.0.0"
+gem "activemodel", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"
+gem "minitest", "~> 4.7.5"
+gem "minitest-rails", "~> 1.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 4.1.0"
+gem "actionpack", "~> 4.1.0"
+gem "activemodel", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"
+gem "minitest-rails", "~> 2.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 4.2.0"
+gem "actionpack", "~> 4.2.0"
+gem "activemodel", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"
+gem "minitest-rails", "~> 2.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "nokogiri", "~> 1.6.8"
+gem "appraisal"
+gem "railties", "~> 5.0.0"
+gem "actionpack", "~> 5.0.0"
+gem "activemodel", "~> 5.0.0"
+gem "activerecord", "~> 5.0.0"
+gem "minitest-rails", "~> 3.0"
+
+group :test do
+  gem "rake", "10.1.0"
+end
+
+gemspec :path => "../"

data/lib/roar-rails.rb

@@ -18,19 +18,23 @@ end
 
 module Roar
   module Rails
-    require 'uber/version'
     def self.rails_version
-      Uber::Version.new(::ActionPack::VERSION::STRING)
+      Gem::Version.new([ActionPack::VERSION::MAJOR, ActionPack::VERSION::MINOR].join('.'))
     end
 
-    if rails_version.~ 3.0
+    case rails_version
+    when Gem::Version.new(3.0)
       require 'roar/rails/rails3_0_strategy'
-    elsif rails_version.~ 3.1
+    when Gem::Version.new(3.1)
       require 'roar/rails/rails3_1_strategy'
-    elsif rails_version.~ 3.2
+    when Gem::Version.new(3.2)
       require 'roar/rails/rails3_2_strategy'
-    elsif rails_version.~ 4.2
+    when Gem::Version.new(4.0), Gem::Version.new(4.1)
+      require 'roar/rails/rails4_0_strategy'
+    when Gem::Version.new(4.2)
       require 'roar/rails/rails4_2_strategy'
+    when Gem::Version.new(5.0)
+      require 'roar/rails/rails5_0_strategy'
     else
       # fallback to 4.0 strategy
       require 'roar/rails/rails4_0_strategy'

data/lib/roar/rails/json_api.rb

@@ -5,3 +5,8 @@ Roar::JSON::JSONAPI.class_eval do
   def from_json_api(*args); from_json(*args); end
 end
 
+# allow the same for collections.
+Roar::JSON::JSONAPI::Document::Collection.class_eval do
+  def to_json_api(*args); to_json(*args); end
+  def from_json_api(*args); from_json(*args); end
+end

data/lib/roar/rails/rails5_0_strategy.rb

@@ -0,0 +1,16 @@
+require 'action_controller/responder'
+
+module Roar::Rails
+  class Responder < ActionController::Responder
+    module VersionStrategy
+    end
+  end
+
+  module TestCase
+    module VersionStrategy
+      def process_args(action, http_method, document="", params={})
+        [action, { method: http_method, params: params }]
+      end
+    end
+  end
+end

data/lib/roar/rails/railtie.rb

@@ -14,7 +14,7 @@ module Roar
       initializer "roar.set_configs" do |app|
         ::Roar::Representer.module_eval do
           include app.routes.url_helpers
-          include app.routes.mounted_helpers unless Roar::Rails.rails_version.~ 3.0
+          include app.routes.mounted_helpers unless (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 0)
 
           include UrlMethods  # provide an initial #default_url_options.
         end

data/lib/roar/rails/test_case.rb

@@ -1,8 +1,4 @@
-if ::ActionPack::VERSION::MAJOR == 4
-  require 'test_xml/mini_test'
-else
-  require 'test_xml/test_unit'
-end
+require 'minitest'
 
 module Roar
   module Rails

data/lib/roar/rails/version.rb

@@ -1,5 +1,5 @@
 module Roar
   module Rails
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/roar-rails.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Roar::Rails::VERSION
   s.authors     = ["Nick Sutterer"]
   s.email       = ["apotonick@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/apotonick/roar-rails"
   s.summary     = %q{Use Roar in Rails.}
   s.description = %q{Rails extensions for using Roar in the popular web framework.}
 
@@ -18,16 +18,19 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "roar",          ">= 1.0.0", "<= 1.1.0"
+  s.add_runtime_dependency "roar",          '~> 1.0.4'
   s.add_runtime_dependency "test_xml",      ">= 0.1.6"  # TODO: remove dependency as most people don't use XML.
   s.add_runtime_dependency "actionpack"
   s.add_runtime_dependency "railties",      ">= 3.0.0"
-  s.add_runtime_dependency "uber",          ">= 0.0.5"
+  s.add_runtime_dependency "uber",          "~> 0.0.7"
   s.add_runtime_dependency "responders"
 
-  s.add_development_dependency "minitest"
+  s.add_development_dependency 'minitest-rails'
+  s.add_development_dependency 'minitest'
+
   s.add_development_dependency "activemodel"
   s.add_development_dependency "activerecord"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "multi_json"
   s.add_development_dependency "tzinfo" # FIXME: why the hell do we need this for 3.1?
 end

data/test/consume_test.rb

@@ -56,6 +56,7 @@ end
 
 class ConsumeWithConfigurationTest < ActionController::TestCase
   include Roar::Rails::TestCase
+  SingerRepresenter  = ::SingerRepresenter
 
   module MusicianRepresenter
     include Roar::JSON
@@ -82,17 +83,18 @@ class ConsumeWithConfigurationTest < ActionController::TestCase
     assert_equal %{#<struct Singer name="Bumi">}, @response.body
   end
 
-  test "#do not consume missing content type" do
-    assert_raises Roar::Rails::UnsupportedMediaType do
-      post :consume_json, "{\"name\": \"Bumi\"}"
+  if ActiveRecord::VERSION::MAJOR < 5
+    test "#do not consume missing content type" do
+      assert_raises Roar::Rails::UnsupportedMediaType do
+        post :consume_json, "{\"name\": \"Bumi\"}"
+      end
     end
-  end
 
-
-  test "#do not consume parses unknown content type" do
-    @request.env['CONTENT_TYPE'] = 'application/custom+json'
-    assert_raises Roar::Rails::UnsupportedMediaType do
-      post :consume_json, "{\"name\": \"Bumi\"}"
+    test "#do not consume parses unknown content type" do
+      @request.env['CONTENT_TYPE'] = 'application/custom+json'
+      assert_raises Roar::Rails::UnsupportedMediaType do
+        post :consume_json, "{\"name\": \"Bumi\"}"
+      end
     end
   end
 end

data/test/dummy/config/environments/test.rb

@@ -32,7 +32,7 @@ Dummy::Application.configure do
 
   config.representer.default_url_options = {:host => "roar.apotomo.de"}
 
-  if Roar::Rails.rails_version.~ 4.2
+  if Rails::VERSION::MAJOR >= 4
     config.eager_load = false
     config.active_support.test_order = :random
   end

data/test/formats_test.rb

@@ -124,7 +124,7 @@ class FormatsTest < MiniTest::Spec
 
     it "returns nil when not present" do
       skip "not sure what to do when format is unknown"
-      subject.for(:xml, Class.new.new, "bands").must_equal nil
+      subject.for(:xml, Class.new.new, "bands").must_be_nil
     end
   end
 end
@@ -132,7 +132,7 @@ end
 class PathTest < MiniTest::Spec
   let (:path) { Roar::Rails::Formats::Path }
 
-  it { path.new("bands").namespace.must_equal nil }
+  it { path.new("bands").namespace.must_be_nil }
   it { path.new("v1/bands").namespace.must_equal "v1" }
   it { path.new("api/v1/bands").namespace.must_equal "api/v1" }
-end
+end

data/test/json_api_renderer_test.rb

@@ -1,35 +1,56 @@
 require 'test_helper'
 
-class HalRendererTest < ActionController::TestCase
+class JsonApiRendererTest < ActionController::TestCase
   include Roar::Rails::TestCase
 
   class SingersController < ActionController::Base
-    module JsonApiSingerRepresenter
+    module SingerRepresenter
       include Roar::JSON::JSONAPI
-
-      type :singer
+      type :song
       property :name
+
+      link(:self) { "//self"}
     end
 
     include Roar::Rails::ControllerAdditions
-    represents :json_api, :entity => JsonApiSingerRepresenter
+
+    represents :json_api, entity: SingerRepresenter, collection: SingerRepresenter.for_collection # should be inferred.
 
     def show
       singer = Musician.new("Bumi")
       respond_with singer
     end
+
+    def index
+      singers = [Musician.new("Bumi"), Musician.new("Chad")]
+      respond_with singers
+    end
+
   end
 
   tests SingersController
 
-  test "should render correctly in response to a application/vnd.api+json" do
-    get :show, :id => "bumi", :format => :json_api
-    assert_body '{"singer":{"name":"Bumi"}}'
+  test "should render single model correctly in response to a application/vnd.api+json" do
+    get :show, :id => "1", :format => :json_api
+
+    response.body.must_equal "{\"song\":{\"name\":\"Bumi\"},\"links\":{\"self\":{\"href\":\"//self\"}}}"
   end
 
-  test "should have a content_type of application/vnd.api+json" do
+  test "should render collection of models correctly in response to a application/vnd.api+json" do
+    get :index, :format => :json_api
+    # assert_body '{"people":[{"first_name":"Chad"},{"first_name":"Fremont"}]}'
+
+    response.body.must_equal "{\"song\":[{\"name\":\"Bumi\"},{\"name\":\"Chad\"}],\"links\":{\"self\":{\"href\":\"//self\"}}}"
+  end
+
+  test "should have a content_type of application/vnd.api+json for a single model" do
     get :show, :id => "bumi", :format => :json_api
     assert_equal response.content_type, 'application/vnd.api+json'
   end
-end
 
+  test "should have a content_type of application/vnd.api+json for a collection of models" do
+    get :index, :format => :json_api
+    assert_equal response.content_type, 'application/vnd.api+json'
+  end
+
+end

data/test/render_test.rb

@@ -4,28 +4,45 @@ class RenderTest < ActionController::TestCase
   include Roar::Rails::TestCase
 
   class SingersController < ActionController::Base
+
     module SingerRepresenter
       include Roar::JSON
-
       property :name, :as => :title
     end
 
+    module SingersRepresenter
+      include Representable::JSON::Collection
+      items :extend => SingerRepresenter
+    end
+
     include Roar::Rails::ControllerAdditions
     include Roar::Rails::ControllerAdditions::Render
 
-    represents :json, :entity => SingerRepresenter
+    represents :json, :entity => SingerRepresenter, :collection => SingersRepresenter
 
     def show
       singer = Musician.new("Bumi")
       render :json => singer, status: 201
     end
+
+    def index
+      singers = [Musician.new("Bumi"), Musician.new("Iggy")]
+      render :json => singers, status: 201
+    end
+
   end
 
   tests SingersController
 
   test "should use Representer for #render" do
     get :show, :id => "bumi", :format => :json
-    assert_body '{"title":"Bumi"}'
+    assert_equal response.body, '{"title":"Bumi"}'
+    assert_equal 201, response.status
+  end
+
+  test "should use Representer for #render on a model collection" do
+    get :index, :format => :json
+    assert_equal response.body, '[{"title":"Bumi"},{"title":"Iggy"}]'
     assert_equal 201, response.status
   end
 end

data/test/representer_generator_test.rb

@@ -24,13 +24,13 @@ class RepresentetGeneratorTest < Rails::Generators::TestCase
   test "create a representer with default json support" do
     run_generator %w(singer)
 
-    assert_file representer_path('singer'), /include Roar::Representer::JSON/
+    assert_file representer_path('singer'), /include Roar::JSON/
   end
 
   test "create a representer with different format support" do
     run_generator %w(singer --format=XML)
 
-    assert_file representer_path('singer'), /include Roar::Representer::XML/
+    assert_file representer_path('singer'), /include Roar::XML/
   end
 
   test "create a representer with property, class and exnted" do

data/test/responder_test.rb

@@ -417,7 +417,7 @@ class ResponderTest < ActionController::TestCase
   end
 
   def bumi_json
-    return "[\"Bumi\"]" if Roar::Rails.rails_version.~ 3.0
+    return "[\"Bumi\"]" if (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 0)
     "{\"name\":\"Bumi\"}"
   end
 end

data/test/test_helper.rb

@@ -1,9 +1,9 @@
-require 'minitest/autorun'
-require 'test_xml/mini_test'
-
 ENV['RAILS_ENV'] = 'test'
 require "dummy/config/environment"
 require "rails/test_help" # adds stuff like @routes, etc.
+require 'minitest/rails'
+
+require 'test_xml/mini_test'
 require "roar/rails/test_case"
 
 Singer = Struct.new(:name)
@@ -17,11 +17,11 @@ Mime::Type.register 'application/vnd.api+json', :json_api
 
 # see also https://github.com/jingweno/msgpack_rails/issues/3
 ::ActionController::Renderers.add :hal do |js, options|
-  self.content_type ||= Mime::HAL
+  self.content_type ||= Mime[:hal]
   js.is_a?(String) ? js : js.to_json
 end
 
 ::ActionController::Renderers.add :json_api do |js, options|
-  self.content_type ||= Mime::JSONAPI
+  self.content_type ||= Mime[:json_api]
   js.is_a?(String) ? js : js.to_json
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roar-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +70,16 @@ dependencies:
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -179,17 +201,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGES.markdown
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - TODO.md
-- gemfiles/Gemfile.rails3-0
-- gemfiles/Gemfile.rails3-2
-- gemfiles/Gemfile.rails4-0
-- gemfiles/Gemfile.rails4-1
-- gemfiles/Gemfile.rails4-2
+- gemfiles/rails_3.0.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - lib/generators/rails/USAGE
 - lib/generators/rails/representer_generator.rb
 - lib/generators/rails/templates/representer.rb
@@ -203,6 +227,7 @@ files:
 - lib/roar/rails/rails3_2_strategy.rb
 - lib/roar/rails/rails4_0_strategy.rb
 - lib/roar/rails/rails4_2_strategy.rb
+- lib/roar/rails/rails5_0_strategy.rb
 - lib/roar/rails/railtie.rb
 - lib/roar/rails/responder.rb
 - lib/roar/rails/test_case.rb
@@ -238,7 +263,7 @@ files:
 - test/test_case_test.rb
 - test/test_helper.rb
 - test/validations_test.rb
-homepage: ''
+homepage: https://github.com/apotonick/roar-rails
 licenses: []
 metadata: {}
 post_install_message: 
@@ -257,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roar-rails
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Use Roar in Rails.

data/gemfiles/Gemfile.rails3-0

@@ -1,9 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in roar-rails.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 3.0.11'
-gem 'activerecord', '~> 3.0.11'
-gem 'minitest', '4.7.5'
-

data/gemfiles/Gemfile.rails3-2

@@ -1,9 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in roar-rails.gemspec
-gemspec :path => '../'
-
-
-gem 'railties', '~> 3.2.13'
-gem 'activerecord', '~> 3.2.13'
-gem 'minitest', '4.7.5'

data/gemfiles/Gemfile.rails4-0

@@ -1,10 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in roar-rails.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.0.0'
-gem 'actionpack', '~> 4.0.0'
-
-gem 'activemodel', '~> 4.0.0'
-gem 'activerecord', '~> 4.0.0'

data/gemfiles/Gemfile.rails4-1

@@ -1,11 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in roar-rails.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.1.0'
-gem 'actionpack', '~> 4.1.0'
-
-gem 'activemodel', '~> 4.1.0'
-gem 'activerecord', '~> 4.1.0'
-gem 'minitest', '~> 5.2.0'

data/gemfiles/Gemfile.rails4-2

@@ -1,12 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in roar-rails.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.2.0'
-gem 'actionpack', '~> 4.2.0'
-
-gem 'activemodel', '~> 4.2.0'
-gem 'activerecord', '~> 4.2.0'
-
-gem 'minitest', '~> 5.5.0'