roar 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3ecc28432b3f2a039e743ea1503d71379cae06
-  data.tar.gz: dc4f0e29a6c0e62599809b02f700fa97b8971c3b
+  metadata.gz: 07ecc948debf57f733cbd0afa35239bee7c3690d
+  data.tar.gz: 4595104d851b4a1acee53c2968e610c035fd25d1
 SHA512:
-  metadata.gz: 096cf974e914065adc6bb7d098db53b9e4190a73402a3ae06be99a50e0ec7457186112ed5b78368d4c6a8d479c04f5832d86ac745a6907b1ab27fa0716909a81
-  data.tar.gz: e7e465c95e3430976763afd86e5fd2445f128a369eb11337ee456926b7631be92923af84155291359aad102570be14ec73dc2886a101caa0629f8cc09d552a8c
+  metadata.gz: e84a209d661459eaf5f4c666367112c45cb821ce5469e32536ff9a30714e45f8deb06b7b164f4684d27bbcc82906c98f12bccf935f4a72f8018e23c40b251dc1
+  data.tar.gz: eac108c9d10735a92ff60d38e21affa0465ef850ed1245084285f33fe7648000e8e68718672abd3da8838781892aef0e66eee9d119118524f23597bb0af4ed39

data/CHANGES.markdown

@@ -1,5 +1,6 @@
 # 0.12.5
 
+* Roar runs with representable <= 1.8.
 
 # 0.12.4
 

data/Gemfile

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in roar.gemspec
 gemspec
 
-#gem "representable", :path => "../representable"
+gem "representable", :path => "../representable"
 gem "sinatra-contrib", :git => "git@github.com:apotonick/sinatra-contrib.git", :branch => "runner"

data/lib/roar/representer/feature/hypermedia.rb

@@ -72,7 +72,7 @@ module Roar
       private
         def links_definition_options
           # TODO: this method is never called.
-          [:links_array, {:from => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true,
+          [:links_array, {:as => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true,
             :decorator_scope => true}] # TODO: merge with JSON.
         end
 

data/lib/roar/representer/json.rb

@@ -46,7 +46,7 @@ module Roar
         # TODO: move to instance method, or remove?
         def links_definition_options
           # FIXME: this doesn't belong into the generic JSON representer.
-          [:links_array, {:from => :links, :class => Feature::Hypermedia::Hyperlink, :extend => HyperlinkRepresenter, :collection => true,
+          [:links_array, {:as => :links, :class => Feature::Hypermedia::Hyperlink, :extend => HyperlinkRepresenter, :collection => true,
             :decorator_scope => true}]
         end
       end

data/lib/roar/representer/json/hal.rb

@@ -72,7 +72,7 @@ module Roar::Representer
 
       module ClassMethods
         def links_definition_options
-          super.tap { |options| options[1].merge!(:from => :_links) }
+          super.tap { |options| options[1].merge!(:as => :_links) }
         end
       end
 

data/lib/roar/representer/xml.rb

@@ -39,7 +39,7 @@ module Roar
 
         def links_definition_options
           # FIXME: this doesn't belong into the generic XML representer.
-          [:links_array, {:from => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true, :extend => XML::HyperlinkRepresenter,
+          [:links_array, {:as => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true, :extend => XML::HyperlinkRepresenter,
             :decorator_scope => true}] # TODO: merge with JSON.
         end
 

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

data/test/collection_json_test.rb

@@ -34,9 +34,11 @@ class CollectionJsonTest < MiniTest::Spec
 
   describe "#to_json" do
     it "renders document" do
+      collection_key = Representable::VERSION =~ /^1.8/ ? "collection" : :collection
+
       [song].extend(rpr).to_hash.must_equal(
       {
-        :collection=>{
+        collection_key=>{
           "version"=>"1.0",
           "href"=>"//songs/",
 
@@ -48,7 +50,7 @@ class CollectionJsonTest < MiniTest::Spec
           },
 
           "queries"=>[
-            {:rel=>:search, :href=>"//search", 
+            {:rel=>:search, :href=>"//search",
               :data=>[
                 {:name=>"q", :value=>""}
               ]

data/test/xml_representer_test.rb

@@ -153,7 +153,7 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
 
           self.representation_wrap= :order
           property :id
-          collection :items, :class => ItemRepresenter, :from => :item
+          collection :items, :class => ItemRepresenter, :as => :item
           attr_accessor :id, :items
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable