roar 0.12.9 → 1.0.0.beta1

data/test/hal_json_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
-require 'roar/representer/json/hal'
+require 'roar/json/hal'
 
 class HalJsonTest < MiniTest::Spec
   let(:rpr) do
     Module.new do
-      include Roar::Representer::JSON
-      include Roar::Representer::JSON::HAL
+      include Roar::JSON
+      include Roar::JSON::HAL
 
       links :self do
         [{:lang => "en", :href => "http://en.hit"},
@@ -59,7 +59,7 @@ class HalJsonTest < MiniTest::Spec
 
       it "renders empty link array" do
         rpr = Module.new do
-          include Roar::Representer::JSON::HAL
+          include Roar::JSON::HAL
 
           links :self do [] end
         end
@@ -70,12 +70,12 @@ class HalJsonTest < MiniTest::Spec
     end
   end
 
-  describe "#prepare_links!" do
-    it "should map link arrays correctly" do
-      subject.send :prepare_links!
-      subject.links.must_equal "self" => [link("rel" => :self, "href" => "http://en.hit", "lang" => "en"),link("rel" => :self, "href" => "http://de.hit", "lang" => "de")], "next" => link("href" => "http://next", "rel" => :next)
-    end
-  end
+  # describe "#prepare_links!" do
+  #   it "should map link arrays correctly" do
+  #     subject.send :prepare_links!, {}
+  #     subject.links.must_equal :self => [link("rel" => "self", "href" => "http://en.hit", "lang" => "en"),link("rel" => :self, "href" => "http://de.hit", "lang" => "de")], "next" => link("href" => "http://next", "rel" => "next")
+  #   end
+  # end
 
   describe "#link_array_rels" do
     it "returns list of rels for array links" do
@@ -86,14 +86,14 @@ class HalJsonTest < MiniTest::Spec
 
   describe "HAL/JSON" do
     Bla = Module.new do
-      include Roar::Representer::JSON::HAL
+      include Roar::JSON::HAL
       property :title
       link :self do
         "http://songs/#{title}"
       end
     end
 
-    representer_for([Roar::Representer::JSON::HAL]) do
+    representer_for([Roar::JSON::HAL]) do
       property :id
       collection :songs, :class => Song, :extend => Bla, :embedded => true
       link :self do
@@ -123,13 +123,13 @@ class HalJsonTest < MiniTest::Spec
 
       # in newer representables, this is not overwritten to an empty [] anymore.
       assert_equal ["Beer"], @album.songs.map(&:title)
-      @album.links.must_equal({})
+      @album.links.must_equal nil
     end
   end
 end
 
 class LinkCollectionTest < MiniTest::Spec
-  subject { Roar::Representer::JSON::HAL::LinkCollection.new([:self, "next"]) }
+  subject { Roar::JSON::HAL::LinkCollection.new([:self, "next"]) }
   describe "#is_array?" do
     it "returns true for array link" do
       subject.is_array?(:self).must_equal true
@@ -144,7 +144,7 @@ end
 
 
 class HalCurieTest < MiniTest::Spec
-  representer!([Roar::Representer::JSON::HAL]) do
+  representer!([Roar::JSON::HAL]) do
     link "doc:self" do
       "/"
     end
@@ -156,5 +156,5 @@ class HalCurieTest < MiniTest::Spec
     end
   end
 
-  it { Object.new.extend(rpr).to_hash.must_equal({"_links"=>{"doc:self"=>{:href=>"/"}, "curies"=>[{:name=>:doc, :href=>"//docs/{rel}", :templated=>true}]}}) }
+  it { Object.new.extend(rpr).to_hash.must_equal({"_links"=>{"doc:self"=>{"href"=>"/"}, :curies=>[{"name"=>:doc, "href"=>"//docs/{rel}", "templated"=>true}]}}) }
 end

data/test/hal_links_test.rb

@@ -1,13 +1,13 @@
 require 'ostruct'
 require 'test_helper'
-require 'roar/representer/json/hal'
+require 'roar/json/hal'
 
 
 class HalLinkTest < MiniTest::Spec
   let(:rpr) do
     Module.new do
-      include Roar::Representer::JSON
-      include Roar::Representer::JSON::HAL::Links
+      include Roar::JSON
+      include Roar::JSON::HAL::Links
       link :self do
         "//songs"
       end

data/test/http_verbs_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
-require 'roar/representer/feature/http_verbs'
-require 'roar/representer/json'
+require 'roar/http_verbs'
+require 'roar/json'
 
 class HttpVerbsTest < MiniTest::Spec
   BandRepresenter = Integration::BandRepresenter
@@ -8,22 +8,26 @@ class HttpVerbsTest < MiniTest::Spec
   # keep this class clear of Roar modules.
   class Band
     attr_accessor :name, :label
+
+    def label=(v) # in ruby 2.2, #label= is not there, all at sudden. what *is* that?
+      @label = v
+    end
   end
 
-  let (:band) { OpenStruct.new(:name => "bodyjar").extend(Roar::Representer::Feature::HttpVerbs, BandRepresenter) }
+  let (:band) { OpenStruct.new(:name => "bodyjar").extend(Roar::HttpVerbs, BandRepresenter) }
 
 
   describe "HttpVerbs" do
     before do
       @band = Band.new
       @band.extend(BandRepresenter)
-      @band.extend(Roar::Representer::Feature::HttpVerbs)
+      @band.extend(Roar::HttpVerbs)
     end
 
     describe "transport_engine" do
       before do
-        @http_verbs = Roar::Representer::Feature::HttpVerbs
-        @net_http   = Roar::Representer::Transport::NetHTTP
+        @http_verbs = Roar::HttpVerbs
+        @net_http   = Roar::Transport::NetHTTP
       end
 
       it "has a default set in the transport module level" do
@@ -37,36 +41,27 @@ class HttpVerbsTest < MiniTest::Spec
       end
     end
 
-
-    describe "deprecations" do
-      it "old #get API still works" do
-        @band.get("http://localhost:4567/bands/slayer", "application/json")
-        assert_equal ["Slayer", "Canadian Maple"], [@band.name, @band.label]
-      end
-    end
-
-
     describe "HttpVerbs.get" do
       it "returns instance from incoming representation" do
-        band = @band.get("http://localhost:4567/bands/slayer", "application/json")
+        band = @band.get(uri: "http://localhost:4567/bands/slayer", as: "application/json")
         assert_equal "Slayer", band.name
         assert_equal "Canadian Maple", band.label
       end
 
       # FIXME: move to faraday test.
-      require 'roar/representer/transport/faraday'
+      require 'roar/transport/faraday'
       describe 'a non-existent resource' do
         it 'handles HTTP errors and raises a ResourceNotFound error with FaradayHttpTransport' do
-          @band.transport_engine = Roar::Representer::Transport::Faraday
+          @band.transport_engine = Roar::Transport::Faraday
           assert_raises(::Faraday::Error::ResourceNotFound) do
-            @band.get('http://localhost:4567/bands/anthrax', "application/json")
+            @band.get(uri: 'http://localhost:4567/bands/anthrax', as: "application/json")
           end
         end
 
         it 'performs no HTTP error handling with NetHttpTransport' do
-          @band.transport_engine = Roar::Representer::Transport::NetHTTP
+          @band.transport_engine = Roar::Transport::NetHTTP
           assert_raises(MultiJson::LoadError) do
-            @band.get('http://localhost:4567/bands/anthrax', "application/json")
+            @band.get(uri: 'http://localhost:4567/bands/anthrax', as: "application/json")
           end
         end
       end
@@ -116,7 +111,7 @@ class HttpVerbsTest < MiniTest::Spec
 
 
     describe "HTTPS and Authentication" do
-      let (:song) { OpenStruct.new(:name => "bodyjar").extend(Roar::Representer::Feature::HttpVerbs, BandRepresenter) }
+      let (:song) { OpenStruct.new(:name => "bodyjar").extend(Roar::HttpVerbs, BandRepresenter) }
 
       describe "Basic Auth: passing manually" do
 

data/test/hypermedia_feature_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class HypermediaTest < MiniTest::Spec
+
   describe "Hypermedia Feature" do
 
     let (:song) { Song.new(:title => "Brandy Wine") }
@@ -8,8 +9,8 @@ class HypermediaTest < MiniTest::Spec
     before do
       @bookmarks = Class.new do
         include AttributesConstructor
-        include Roar::Representer::XML
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::XML
+        include Roar::Hypermedia
 
         self.representation_wrap = "bookmarks"
       end
@@ -30,8 +31,8 @@ class HypermediaTest < MiniTest::Spec
     describe "#to_xml" do
       it "works when no links defined" do
         repr = Module.new do
-          include Roar::Representer::XML
-          include Roar::Representer::Feature::Hypermedia
+          include Roar::XML
+          include Roar::Hypermedia
 
           self.representation_wrap = "song"
           property :title
@@ -41,8 +42,8 @@ class HypermediaTest < MiniTest::Spec
       end
 
       let (:rpr) { Module.new do
-        include Roar::Representer::XML
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::XML
+        include Roar::Hypermedia
 
         self.representation_wrap = "song"
         property :title
@@ -68,8 +69,8 @@ class HypermediaTest < MiniTest::Spec
         song_rpr = rpr
 
         album_rpr = Module.new do
-          include Roar::Representer::XML
-          include Roar::Representer::Feature::Hypermedia
+          include Roar::XML
+          include Roar::Hypermedia
 
           self.representation_wrap = "album"
           collection :songs, :extend => song_rpr
@@ -92,8 +93,8 @@ class HypermediaTest < MiniTest::Spec
 
     describe "#to_json" do
       class Note
-        include Roar::Representer::JSON
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::JSON
+        include Roar::Hypermedia
         link(:self) { "http://me" }
       end
 
@@ -105,7 +106,7 @@ class HypermediaTest < MiniTest::Spec
       it "sets up links even when nested" do
         class Page
           include AttributesConstructor
-          include Roar::Representer::JSON
+          include Roar::JSON
           property :note, :class => Note
           attr_accessor :note
         end
@@ -118,43 +119,20 @@ class HypermediaTest < MiniTest::Spec
 
     describe "#from_xml" do
       it "extracts links from document" do
-        doc = @bookmarks_with_links.from_xml(%{
+        doc = @bookmarks_with_links.new.from_xml(%{
         <bookmarks>
           <link rel="self" href="http://bookmarks">
         </bookmarks>
         })
 
-        assert_kind_of Roar::Representer::Feature::Hypermedia::LinkCollection, doc.links
+        assert_kind_of Roar::Hypermedia::LinkCollection, doc.links
         assert_equal 1, doc.links.size
-        assert_equal(["self", "http://bookmarks"], [doc.links_array.first.rel, doc.links_array.first.href])
+        assert_equal(["self", "http://bookmarks"], [doc.links["self"].rel, doc.links["self"].href])
       end
 
       it "sets up an empty link list if no links found in the document" do
-        assert_equal [], @bookmarks_with_links.from_xml(%{<bookmarks/>}).links_array
-      end
-    end
-
-
-    describe "#links" do
-      subject { Object.new.extend(rpr).tap do |obj|
-        obj.send :prepare_links!
-      end }
-
-      representer_for do
-        link(:self) { "//self" }
-        link(:next) { "//next" }
+        @bookmarks_with_links.new.from_xml(%{<bookmarks/>}).links.must_equal nil
       end
-
-        it "returns link object" do
-          subject.links["self"].href.must_equal "//self"
-          subject.links[:self].href.must_equal "//self"
-          subject.links[:next].href.must_equal "//next"
-          subject.links["unknown"].must_equal nil
-        end
-
-#      it "returns an empty list when no links present" do
- #       assert_equal Roar::Representer::Feature::Hypermedia::LinkCollection.new, @bookmarks.new.links
-  #    end
     end
   end
 end
@@ -162,15 +140,15 @@ end
 
 class LinkCollectionTest < MiniTest::Spec
   describe "LinkCollection" do
-    subject { Roar::Representer::Feature::Hypermedia::LinkCollection.new }
+    subject {
+      Roar::Hypermedia::LinkCollection[
+        @self_link = link(:rel => :self), @next_link = link(:rel => :next)
+      ]
+    }
 
-    describe "#add" do
+    describe "::[]" do
       it "keys by using rel string" do
-        subject.size.must_equal 0
-        subject.add(link = link(:rel => :self))
-        subject.values.must_equal [link]
-        subject.add(link = link(:rel => "self"))
-        subject.values.must_equal [link]
+        subject.values.must_equal [@self_link, @next_link]
       end
     end
   end

data/test/hypermedia_test.rb

@@ -4,22 +4,22 @@ class HypermediaTest < MiniTest::Spec
   describe "inheritance" do
     before do
       module BaseRepresenter
-        include Roar::Representer::JSON
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::JSON
+        include Roar::Hypermedia
 
         link(:base) { "http://base" }
       end
 
       module Bar
-        include Roar::Representer::JSON
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::JSON
+        include Roar::Hypermedia
 
         link(:bar) { "http://bar" }
       end
 
       module Foo
-        include Roar::Representer::JSON
-        include Roar::Representer::Feature::Hypermedia
+        include Roar::JSON
+        include Roar::Hypermedia
         include BaseRepresenter
         include Bar
 
@@ -132,18 +132,6 @@ class HypermediaTest < MiniTest::Spec
         end
       end
     end
-
-    # private tests:
-
-    it "returns array of links for rendering" do
-      subject.send :prepare_links!
-      subject.links_array.must_equal [link(:rel => :self, :href => "//self")]
-    end
-
-    it "#links_array maps array to LinkCollection hash" do
-      subject.links_array= [link(:rel => :self, :href => "//self")]
-      subject.links.must_equal({"self" => link(:rel => :self, :href => "//self")})
-    end
   end
 end
 
@@ -177,10 +165,10 @@ class HyperlinkTest < MiniTest::Spec
   describe "Config inheritance" do
       it "doesn't mess up with inheritable_array" do  # FIXME: remove this test when uber is out.
         OpenStruct.new.extend( Module.new do
-                  include Roar::Representer::JSON
+                  include Roar::JSON
                   include(Module.new do
-                                      include Roar::Representer::JSON
-                                      include Roar::Representer::Feature::Hypermedia
+                                      include Roar::JSON
+                                      include Roar::Hypermedia
 
                                       property :bla
 
@@ -194,9 +182,9 @@ class HyperlinkTest < MiniTest::Spec
                   #puts representable_attrs.inheritable_array(:links).inspect
 
                   property :blow
-                  include Roar::Representer::Feature::Hypermedia
+                  include Roar::Hypermedia
                   link(:bla) { "boo" }
-                end).to_hash.must_equal({"links"=>[{:rel=>:self, :href=>"bo"}, {:rel=>:bla, :href=>"boo"}]})
+                end).to_hash.must_equal({"links"=>[{"rel"=>"self", "href"=>"bo"}, {"rel"=>"bla", "href"=>"boo"}]})
     end
   end
 end

data/test/integration/band_representer.rb

@@ -1,8 +1,8 @@
 module Integration
   module BandRepresenter
-    include Roar::Representer::JSON
+    include Roar::JSON
 
     property :name
     property :label
   end
-end
+end

data/test/integration/runner.rb

@@ -1,5 +1,6 @@
 require "integration/band_representer"
-require 'sinatra/runner'
+# require 'sinatra/runner' # TODO: merge that into sinatra-contrib.
+require 'lib/runner'
 
 class ServerRunner < Sinatra::Runner
   def app_file
@@ -35,7 +36,7 @@ runner.run
 ssl_runner = SslServerRunner.new
 ssl_runner.run
 
-MiniTest::Unit.after_tests do
+Minitest.after_run do
   runner.kill
   ssl_runner.kill
-end
+end

data/test/integration/server.rb

@@ -1,7 +1,7 @@
 require "bundler/setup"
 require "sinatra"
 require "ostruct"
-require "roar/representer/json"
+require "roar/json"
 require "sinatra/multi_route"
 
 require File.expand_path("../band_representer.rb", __FILE__)
@@ -77,6 +77,17 @@ delete '/bands/metallica' do
   status 204
 end
 
+route :get, :delete, :patch, :post, :put, %r{/bands/nirvana/status([\d]*)_and_data} do
+  status params[:captures]
+  OpenStruct.new(:name => "Nirvana", :label => "Sub Pop").
+    extend(Integration::BandRepresenter).
+    to_json
+end
+
+route :get, :delete, :patch, :post, :put, %r{/bands/nirvana/status([\d]*)_no_data} do
+  status params[:captures]
+end
+
 
 helpers do
   def protected!
@@ -106,4 +117,4 @@ end
 
 get "/ping" do
   "1"
-end
+end