roar 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ecc948debf57f733cbd0afa35239bee7c3690d
-  data.tar.gz: 4595104d851b4a1acee53c2968e610c035fd25d1
+  metadata.gz: db7cda8e7774438e2c12828c256a93501719b176
+  data.tar.gz: 2f61956f6ea000358e40713d958af2e8c58219a6
 SHA512:
-  metadata.gz: e84a209d661459eaf5f4c666367112c45cb821ce5469e32536ff9a30714e45f8deb06b7b164f4684d27bbcc82906c98f12bccf935f4a72f8018e23c40b251dc1
-  data.tar.gz: eac108c9d10735a92ff60d38e21affa0465ef850ed1245084285f33fe7648000e8e68718672abd3da8838781892aef0e66eee9d119118524f23597bb0af4ed39
+  metadata.gz: 5b04289bf9e1b07ff13ffe52dea647c0c82b6154d49d5ac2e2b657498a031bf24574751a546ecce8dd76fb9511a3ded0eb2f3131eb3c1e16306849f115335da2
+  data.tar.gz: 28a0c35f6240627b1fe1b5924e2f7e8d8ca27761c4f56a12138fabd8768394dfe3ea63517892bdbb9f83f36ee5222c003d3d16a00cfc63e6ab1af3c03c87cad7

data/.travis.yml

@@ -4,5 +4,9 @@ matrix:
       gemfile: gemfiles/Gemfile.representable-1.7
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.representable-1.7
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.representable-1.8
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.representable-1.8
 notifications:
   irc: "irc.freenode.org#cells"

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+# 0.12.6
+
+* Remove deprecations (most of 'em) from representable-1.8. Sorry for that.
+
 # 0.12.5
 
 * Roar runs with representable <= 1.8.

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/TODO.markdown

@@ -3,4 +3,9 @@
 * alias Roar::Representer to Representer
 * remove #before_serialize and just overwrite #serialize
 * abstract ::links_definition_options and move them out of the generic representers (JSON, XML).
-* make 1.8 tests work, again (hash ordering!)
+* make 1.8 tests work, again (hash ordering!)
+
+* release 1.0
+* representable 1.8, only.
+* revise Hypermedia
+* work on HAL-Object

data/gemfiles/Gemfile.representable-1.8

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'representable', '~> 1.8.0'
+gem "sinatra-contrib", :git => "git@github.com:apotonick/sinatra-contrib.git", :branch => "runner"

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

@@ -137,7 +137,15 @@ module Roar
         private
           def create_links_definition
             return if representable_attrs.find { |d| d.is_a?(LinksDefinition) }
-            representable_attrs << LinksDefinition.new(*links_definition_options)
+
+            options = links_definition_options # TODO: remove in 1.0.
+            if Roar.representable_1_8?
+              opt = options.last
+              opt[:exec_context] = :decorator
+              opt.delete(:decorator_scope)
+            end
+
+            representable_attrs << LinksDefinition.new(*options)
           end
         end
 

data/lib/roar/representer/json.rb

@@ -3,6 +3,11 @@ require 'roar/representer/feature/hypermedia'
 require 'representable/json'
 
 module Roar
+  require 'representable/version'
+  def self.representable_1_8? # TODO: remove me in 1.0.
+    Representable::VERSION =~ /^1.8/
+  end
+
   module Representer
     module JSON
       def self.included(base)

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

@@ -60,12 +60,14 @@ module Roar::Representer
       module Resources
         # Write the property to the +_embedded+ hash when it's a resource.
         def compile_fragment(bin, doc)
-          return super unless bin.options[:embedded]
+          embedded = ::Roar.representable_1_8? ? bin[:embedded] : bin.options[:embedded]
+          return super unless embedded
           super(bin, doc[:_embedded] ||= {})
         end
 
         def uncompile_fragment(bin, doc)
-          return super unless bin.options[:embedded]
+          embedded = Roar.representable_1_8? ? bin[:embedded] : bin.options[:embedded]
+          return super unless embedded
           super(bin, doc["_embedded"] || {})
         end
       end
@@ -132,7 +134,7 @@ module Roar::Representer
           include Representable::JSON::Hash
 
           values :extend => lambda { |item, *| item.is_a?(Array) ? LinkArrayRepresenter : Roar::Representer::JSON::HyperlinkRepresenter },
-            :class => lambda { |hsh, *| hsh.is_a?(LinkArray) ? nil : Roar::Representer::Feature::Hypermedia::Hyperlink }
+            :instance => lambda { |fragment, *| fragment.is_a?(LinkArray) ? fragment : Roar::Representer::Feature::Hypermedia::Hyperlink.new }
 
           def to_hash(options)
             super.tap do |hsh|  # TODO: cool: super(:exclude => [:rel]).

data/lib/roar/version.rb

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

data/roar.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "roar/version"
 
@@ -12,7 +11,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Resource-oriented architectures in Ruby.}
   s.description = %q{Streamlines the development of RESTful, resource-oriented architectures in Ruby.}
   s.license = 'MIT'
-  s.rubyforge_project = "roar"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/collection_json_test.rb

@@ -108,12 +108,12 @@ class CollectionJsonTest < MiniTest::Spec
       song = subject.items.first
       song.title.must_equal "scarifice"
       song.length.must_equal 43
-      song.links.must_equal("download" => link({:rel=>:download, :href=>"//songs/scarifice.mp3"}), "stats" => link({:rel=>:stats, :href=>"//songs/scarifice/stats"}))
+      song.links.must_equal("download" => link({:rel=>"download", :href=>"//songs/scarifice.mp3"}), "stats" => link({:rel=>"stats", :href=>"//songs/scarifice/stats"}))
       song.href.must_equal link(:href => "//songs/scarifice")
     end
 
     it "provides #links" do
-      subject.links.must_equal({"feed" => link(:rel => :feed, :href => "//songs/feed")})
+      subject.links.must_equal({"feed" => link(:rel => "feed", :href => "//songs/feed")})
     end
   end
 

data/test/decorator_test.rb

@@ -78,7 +78,7 @@ class DecoratorTest < MiniTest::Spec
 
       it "sets links on decorator" do
         decorator.from_xml(%{<song><link rel="self" href="http://next"/></song>})
-        decorator.links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+        decorator.links.must_equal("self"=>link(:rel=>"self", :href=>"http://next"))
       end
     end
 
@@ -100,7 +100,7 @@ class DecoratorTest < MiniTest::Spec
 
       it "sets links on decorator" do
         decorator.from_hash({"_links"=>{"self"=>{:href=>"http://next"}}})
-        decorator.links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+        decorator.links.must_equal("self"=>link(:rel=>"self", :href=>"http://next"))
       end
 
       describe "Decorator::HypermediaClient" do
@@ -112,7 +112,7 @@ class DecoratorTest < MiniTest::Spec
 
         it "propagates links to represented" do
           decorator.new(model_with_links).from_hash("_links"=>{"self"=>{:href=>"http://self"}})
-          model_with_links.links[:self].must_equal(link(:rel=>:self, :href=>"http://self"))
+          model_with_links.links[:self].must_equal(link(:rel=>"self", :href=>"http://self"))
         end
       end
     end

data/test/hal_json_test.rb

@@ -24,17 +24,17 @@ class HalJsonTest < MiniTest::Spec
     describe "parsing" do
       it "parses link array" do # TODO: remove me.
         obj = subject.from_json("{\"_links\":{\"self\":[{\"lang\":\"en\",\"href\":\"http://en.hit\"},{\"lang\":\"de\",\"href\":\"http://de.hit\"}]}}")
-        obj.links.must_equal "self" => [link(:rel => :self, :href => "http://en.hit", :lang => :en), link(:rel => :self, :href => "http://de.hit", :lang => :de)]
+        obj.links.must_equal "self" => [link("rel" => "self", "href" => "http://en.hit", "lang" => "en"), link("rel" => "self", "href" => "http://de.hit", "lang" => "de")]
       end
 
       it "parses single links" do # TODO: remove me.
         obj = subject.from_json("{\"_links\":{\"next\":{\"href\":\"http://next\"}}}")
-        obj.links.must_equal "next" => link(:rel => :next, :href => "http://next")
+        obj.links.must_equal "next" => link("rel" => "next", "href" => "http://next")
       end
 
       it "parses link and link array" do
         obj = subject.from_json("{\"_links\":{\"next\":{\"href\":\"http://next\"}, \"self\":[{\"lang\":\"en\",\"href\":\"http://en.hit\"},{\"lang\":\"de\",\"href\":\"http://de.hit\"}]}}")
-        obj.links.must_equal "next" => link(:rel => :next, :href => "http://next"), "self" => [link(:rel => :self, :href => "http://en.hit", :lang => :en), link(:rel => :self, :href => "http://de.hit", :lang => :de)]
+        obj.links.must_equal "next" => link("rel" => "next", "href" => "http://next"), "self" => [link("rel" => "self", "href" => "http://en.hit", "lang" => "en"), link("rel" => "self", "href" => "http://de.hit", "lang" => "de")]
       end
 
       it "parses empty link array" do
@@ -73,7 +73,7 @@ class HalJsonTest < MiniTest::Spec
   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)
+      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
 

data/test/hal_links_test.rb

@@ -24,7 +24,7 @@ class HalLinkTest < MiniTest::Spec
 
   describe "#from_json" do
     it "uses 'links' key" do
-      subject.from_json("{\"links\":{\"self\":{\"href\":\"//lifer\"}}}").links.values.must_equal [link(:href => "//lifer", :rel => :self)]
+      subject.from_json("{\"links\":{\"self\":{\"href\":\"//lifer\"}}}").links.values.must_equal [link("href" => "//lifer", "rel" => "self")]
     end
   end
 end

data/test/hypermedia_test.rb

@@ -56,7 +56,7 @@ class HypermediaTest < MiniTest::Spec
     describe "#from_json" do
       it "parses" do
         subject.from_json "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\"}]}"
-        subject.links.must_equal({"self" => link(:rel => :self, :href => "//self")})
+        subject.links.must_equal({"self" => link("rel" => "self", "href" => "//self")})
       end
     end
 

data/test/test_helper.rb

@@ -51,15 +51,3 @@ MiniTest::Spec.class_eval do
     %w(get post put delete).each(&block)
   end
 end
-
-Roar::Representer::Feature::Hypermedia::Hyperlink.class_eval do
-  def ==(other)
-    stringify_hash(table) == stringify_hash(other.table)
-  end
-
-  def stringify_hash(hash)
-    hash.collect do |k,v|
-      [k.to_s, v.to_s]
-    end.sort
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -141,6 +141,7 @@ files:
 - examples/example.rb
 - examples/example_server.rb
 - gemfiles/Gemfile.representable-1.7
+- gemfiles/Gemfile.representable-1.8
 - lib/roar.rb
 - lib/roar/decorator.rb
 - lib/roar/representer.rb
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: roar
+rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
@@ -221,3 +222,4 @@ test_files:
 - test/representer_test.rb
 - test/test_helper.rb
 - test/xml_representer_test.rb
+has_rdoc: