roar-rails 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6817e161c3f12ef7ed0c8658a5bdd24aacbb5a7c
-  data.tar.gz: 20abccfffd64b3f03e6d57fb27bb76ad9cc27812
+  metadata.gz: ace7c60c6e76e0b30246d345fa21e8187e2007b9
+  data.tar.gz: ac4249bc4fcb3d309ba932e1850c6e17baa0e991
 SHA512:
-  metadata.gz: 3bb52c91e664b93082dffb57afab0572329f1312c0a5d9cd0f23b85a9457366fcc47e9072dc40d91294db51a9fcdbd27178c5b4af73d91a1eb9cd873ff5a5f71
-  data.tar.gz: bfcb2294190c92540ebdf091ce3c7371ba060e24258e69d578ea6c94870cd955f68edd0f2a6a3d6043845176fdc76df2b8a05e44d6d260c0b9d2d246365cbe46
+  metadata.gz: 71c22671c3d5bfecebb9b1f2984f1a04bb5c853ca5db85f39e62f4ae32b2711f9ebd85942cea807751b56f995d675df4692c12612b18d3f55c04873c82174222
+  data.tar.gz: d77de20f05521b69c45d9d32c0832ed9338f638c42211a96583ded54778c709558cc9095c938b367f3329bd299bfdb6e18ddf7c37ce2373a5c3bdef81ae15225

data/CHANGES.markdown

@@ -1,7 +1,15 @@
+## 1.1.0
+
+**Roar 1.1 (and Representable 3.0) support** (see [Roar CHANGES](https://github.com/trailblazer/roar/blob/master/CHANGES.markdown#110))
+
+* Require Roar >= 1.1.0.
+* Improved support for JSON API (now requires separate [roar-jsonapi](https://github.com/trailblazer/roar-jsonapi) gem).
+* Fix Uber version requirement.
+
 ## 1.0.2
 
 * Make Roar version requirement stricter: restrict to 1.0.x series.
-* Initial support for Rails 5 support.
+* Initial support for Rails 5.
 
 ## 1.0.1
 
@@ -12,7 +20,7 @@
 ## 1.0.0
 
 * Requires Roar >= 1.0.0.
-* In `#consume!` roar-rails now finds the correct representer for the `Content-type:` header. In former version the representer name was infered using the `Accept:` header, which was totally wrong. Thanks to @pgaertig for fixing that.
+* In `#consume!` roar-rails now finds the correct representer for the `Content-type:` header. In former version the representer name was inferred using the `Accept:` header, which was totally wrong. Thanks to @pgaertig for fixing that.
 
 ## 0.1.6
 
@@ -47,7 +55,7 @@
 ## 0.1.0
 
 * `ActiveRecord::Relation` is now detected as a collection and the appropriate representer should be found.
-* Entity (singular) representers are now correctly infered even if you only specified `collection:` in `::represents`. That works by querying the model.
+* Entity (singular) representers are now correctly inferred even if you only specified `collection:` in `::represents`. That works by querying the model.
 * Entity representers are now *namespaced* when guessed (i.e., when you didn't specify them explicitly in `::represents`) as it works with collection representers already. If you have a namespaced controller and it suddenly doesn't find its entity representer anymore, either namespace the representer or specify its name in `::represents`.
 
 ## 0.0.14

data/README.markdown

@@ -5,8 +5,6 @@ _Makes using Roar's representers in your Rails app fun._
 [![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))._
 
 ---

data/lib/roar/rails/json_api.rb

@@ -1,12 +1,7 @@
 require 'roar/json/json_api'
 
-Roar::JSON::JSONAPI.class_eval do
+# FIXME: Hack. Add another module to Roar JSON API to hook into.
+Roar::JSON::JSONAPI::Document.class_eval do
   def to_json_api(*args);   to_json(*args);   end
   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/version.rb

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

data/roar-rails.gemspec

@@ -18,16 +18,17 @@ 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.4'
+  s.add_runtime_dependency "roar",          '~> 1.1.0'
   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.7"
+  s.add_runtime_dependency "uber",          "< 0.2.0"
   s.add_runtime_dependency "responders"
 
   s.add_development_dependency 'minitest-rails'
   s.add_development_dependency 'minitest'
 
+  s.add_development_dependency "roar-jsonapi", '>= 0.0.3'
   s.add_development_dependency "activemodel"
   s.add_development_dependency "activerecord"
   s.add_development_dependency "sqlite3"

data/test/consume_test.rb

@@ -130,12 +130,17 @@ end
 class ConsumeJsonApiTest < ActionController::TestCase
   include Roar::Rails::TestCase
 
-  module MusicianRepresenter
-    include Roar::JSON::JSONAPI
-    type :singer
-    property :name
-  end
+  Band      = Struct.new(:name, :id)
+  Singer    = Struct.new(:name, :id)
+  Musician  = Struct.new(:name, :id)
 
+  class MusicianRepresenter < Roar::Decorator
+    include Roar::JSON::JSONAPI.resource :singer
+
+    attributes do
+      property :name
+    end
+  end
 
   class SingersController < ActionController::Base
     include Roar::Rails::ControllerAdditions
@@ -151,9 +156,9 @@ class ConsumeJsonApiTest < ActionController::TestCase
 
   test "#consume parses JSON-API document and updates the model" do
     @request.env['CONTENT_TYPE'] = 'application/vnd.api+json'
-    post :consume_json_api, "{\"singer\": {\"name\": \"Bumi\"}}"
+    post :consume_json_api, %({"data":{"attributes":{"name":"Bumi"},"type":"song"}})
 
-    assert_equal %{#<struct Singer name="Bumi">}, @response.body
+    assert_equal %{#<struct ConsumeJsonApiTest::Singer name="Bumi", id=nil>}, @response.body
   end
 end
 

data/test/json_api_renderer_test.rb

@@ -3,11 +3,17 @@ require 'test_helper'
 class JsonApiRendererTest < ActionController::TestCase
   include Roar::Rails::TestCase
 
+  Band      = Struct.new(:name, :id)
+  Singer    = Struct.new(:name, :id)
+  Musician  = Struct.new(:name, :id)
+
   class SingersController < ActionController::Base
-    module SingerRepresenter
-      include Roar::JSON::JSONAPI
-      type :song
-      property :name
+    class SingerRepresenter < Roar::Decorator
+      include Roar::JSON::JSONAPI.resource :song
+
+      attributes do
+        property :name
+      end
 
       link(:self) { "//self"}
     end
@@ -33,14 +39,14 @@ class JsonApiRendererTest < ActionController::TestCase
   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\"}}}"
+    response.body.must_equal %({"data":{"attributes":{"name":"Bumi"},"type":"song","links":{"self":"//self"}}})
   end
 
   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\"}}}"
+    response.body.must_equal %({"data":[{"attributes":{"name":"Bumi"},"type":"song","links":{"self":"//self"}},{"attributes":{"name":"Chad"},"type":"song","links":{"self":"//self"}}]})
   end
 
   test "should have a content_type of application/vnd.api+json for a single model" do

data/test/responder_test.rb

@@ -298,8 +298,8 @@ class ResponderTest < ActionController::TestCase
     # FIXME: should be in generic roar-rails test.
     module DynamicSingerRepresenter
       include Roar::JSON
-      property :name, :setter => lambda { |val, opts| self.name = "#{opts[:title]} #{val}" },
-                      :getter => lambda { |opts| "#{opts[:title]} #{name}" }
+      property :name, :setter => lambda { |opts| self.name = "#{opts[:user_options][:title]} #{opts[:fragment]}" },
+                      :getter => lambda { |opts| "#{opts[:user_options][:title]} #{name}" }
     end
     class MusicianController < BaseController
       represents :json, :entity => DynamicSingerRepresenter, :collection => SingersRepresenter
@@ -310,7 +310,7 @@ class ResponderTest < ActionController::TestCase
     test "passes options to entity representer" do
       get do
         singer = Singer.new("Bumi")
-        respond_with singer, :title => "Mr."
+        respond_with singer, user_options: { title: "Mr." }
       end
 
       @response.body.must_equal("{\"name\":\"Mr. Bumi\"}")
@@ -318,7 +318,7 @@ class ResponderTest < ActionController::TestCase
 
     test "passes options to explicit collection representer" do
       get do
-        respond_with [Singer.new("Bumi"), Singer.new("Iggy")], :title => "Mr.", :represent_items_with => DynamicSingerRepresenter
+        respond_with [Singer.new("Bumi"), Singer.new("Iggy")], user_options: { title: "Mr." }, :represent_items_with => DynamicSingerRepresenter
       end
 
       @response.body.must_equal("[{\"name\":\"Mr. Bumi\"},{\"name\":\"Mr. Iggy\"}]")
@@ -330,7 +330,7 @@ class ResponderTest < ActionController::TestCase
       @request.env['CONTENT_TYPE'] = 'application/json'
 
       put singer.to_json do
-        created_singer = consume!(Singer.new, :title => "Mr.")
+        created_singer = consume!(Singer.new, user_options: { title: "Mr." })
         respond_with created_singer
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roar-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: roar-jsonapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement