roar 0.11.19 → 0.12.0

data/.travis.yml

@@ -1,7 +1,9 @@
 matrix:
   include:
     - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.representable-1.5.ruby-1.9
+      gemfile: gemfiles/Gemfile.representable-1.6.ruby-1.9
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.representable-1.6.ruby-1.9
 #    - rvm: 1.8.7
 #      gemfile: gemfiles/Gemfile.representable-1.5.ruby-1.8
 notifications:

data/gemfiles/Gemfile.representable-1.6.ruby-1.9

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'representable', '~> 1.6.0'

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

@@ -12,8 +12,7 @@ module Roar::Representer::Feature
   module Coercion
     def self.included(base)
       base.class_eval do
-        include Virtus
-        extend Representable::Coercion::ClassMethods
+        include Representable::Coercion
       end
     end
   end

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

@@ -32,6 +32,12 @@ module Roar::Representer
           include Links       # overwrites #links_definition_options.
           extend ClassMethods # overwrites #links_definition_options, again.
           include Resources
+
+          def representable_mapper(*) # TODO: make this easier to override.
+            super.tap do |map|
+              map.extend Resources
+            end
+          end
         end
       end
 

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.19"
+  VERSION = "0.12.0"
 end

data/roar.gemspec

@@ -19,7 +19,7 @@ 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 "representable", "~> 1.5.3"
+  s.add_runtime_dependency "representable", "~> 1.6.0"
 
   s.add_development_dependency "rake", ">= 0.10.1"
   s.add_development_dependency "test_xml", ">= 0.1.6"

data/test/coercion_feature_test.rb

@@ -8,6 +8,8 @@ class CoercionFeatureTest < MiniTest::Spec
       include Roar::Representer::Feature::Coercion
 
       property :composed_at, :type => DateTime, :default => "May 12th, 2012"
+
+      attr_accessor :composed_at
     end
 
     it "coerces into the provided type" do

data/test/decorator_test.rb

@@ -25,21 +25,23 @@ class DecoratorTest < MiniTest::Spec
     let (:model_with_links) { model.singleton_class.instance_eval { attr_accessor :links }; model }
 
     describe "JSON" do
-      let (:decorator) { rpr_mod = rpr
+      let (:decorator_class) { rpr_mod = rpr
         Class.new(Roar::Decorator) do
           include rpr_mod
         end }
+      let (:decorator) { decorator_class.new(model) }
 
       it "rendering links works" do
-        decorator.new(model).to_hash.must_equal({"links"=>[{:rel=>:self, :href=>"http://self"}]})
+        decorator.to_hash.must_equal({"links"=>[{:rel=>:self, :href=>"http://self"}]})
       end
 
       it "sets links on decorator" do
-        decorator.new(model).from_hash("links"=>[{:rel=>:self, :href=>"http://next"}]).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+        decorator.from_hash("links"=>[{:rel=>:self, :href=>"http://next"}])
+        decorator.links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
       end
 
       it "does not set links on represented" do
-        decorator.new(model_with_links).from_hash("links"=>[{:rel=>:self, :href=>"http://self"}])
+        decorator_class.new(model_with_links).from_hash("links"=>[{:rel=>:self, :href=>"http://self"}])
         model_with_links.links.must_equal nil
       end
 
@@ -62,18 +64,21 @@ class DecoratorTest < MiniTest::Spec
         link(:self) { "http://self" } # TODO: test with HAL, too.
         #self.representation_wrap = :song   # FIXME: why isn't this working?
       end
-      let (:decorator) { rpr_mod = rpr
+      let (:decorator_class) { rpr_mod = rpr
         Class.new(Roar::Decorator) do
           include rpr_mod
           self.representation_wrap = :song
-        end }
+        end
+      }
+      let (:decorator) { decorator_class.new(model) }
 
       it "rendering links works" do
-        decorator.new(model).to_xml.must_equal_xml "<song><link rel=\"self\" href=\"http://self\"/></song>"
+        decorator.to_xml.must_equal_xml "<song><link rel=\"self\" href=\"http://self\"/></song>"
       end
 
       it "sets links on decorator" do
-        decorator.new(model).from_xml(%{<song><link rel="self" href="http://next"/></song>}).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+        decorator.from_xml(%{<song><link rel="self" href="http://next"/></song>})
+        decorator.links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
       end
     end
 
@@ -82,17 +87,20 @@ class DecoratorTest < MiniTest::Spec
       representer_for([Roar::Representer::JSON::HAL]) do
         link(:self) { "http://self" }
       end
-      let (:decorator) { rpr_mod = rpr
+      let (:decorator_class) { rpr_mod = rpr
         Class.new(Roar::Decorator) do
           include rpr_mod
-        end }
+        end
+      }
+      let (:decorator) { decorator_class.new(model) }
 
       it "rendering links works" do
-        decorator.new(model).to_hash.must_equal({"_links"=>{"self"=>{:href=>"http://self"}}})
+        decorator.to_hash.must_equal({"_links"=>{"self"=>{:href=>"http://self"}}})
       end
 
       it "sets links on decorator" do
-        decorator.new(model).from_hash({"_links"=>{"self"=>{:href=>"http://next"}}}).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+        decorator.from_hash({"_links"=>{"self"=>{:href=>"http://next"}}})
+        decorator.links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
       end
 
       describe "Decorator::HypermediaClient" do

data/test/hypermedia_test.rb

@@ -165,60 +165,6 @@ class HyperlinkTest < MiniTest::Spec
   end
 
   describe "Config inheritance" do
-    # TODO: this section will soon be moved to uber.
-    describe "inheritance when including" do
-      # TODO: test all the below issues AND if cloning works.
-      module TestMethods
-        def representer_for(modules=[Roar::Representer::Feature::Hypermedia, Representable], &block)
-          Module.new do
-            extend TestMethods
-            include *modules
-            module_exec(&block)
-          end
-        end
-      end
-      include TestMethods
-
-      it "inherits to uninitialized child" do
-        representer_for do # child
-          include(representer_for do # parent
-            representable_attrs.inheritable_array(:links) << "bar"
-          end)
-        end.representable_attrs.inheritable_array(:links).must_equal(["bar"])
-      end
-
-      it "works with uninitialized parent" do
-        representer_for do # child
-          representable_attrs.inheritable_array(:links) << "bar"
-
-          include(representer_for do # parent
-          end)
-        end.representable_attrs.inheritable_array(:links).must_equal(["bar"])
-      end
-
-      it "inherits when both are initialized" do
-        representer_for do # child
-          representable_attrs.inheritable_array(:links) << "bar"
-
-          include(representer_for do # parent
-            representable_attrs.inheritable_array(:links) << "stadium"
-          end)
-        end.representable_attrs.inheritable_array(:links).must_equal(["bar", "stadium"])
-      end
-
-      it "clones parent inheritables" do # FIXME: actually we don't clone here!
-        representer_for do # child
-          representable_attrs.inheritable_array(:links) << "bar"
-
-          include(parent = representer_for do # parent
-            representable_attrs.inheritable_array(:links) << "stadium"
-          end)
-
-          parent.representable_attrs.inheritable_array(:links) << "park"  # modify parent array.
-
-        end.representable_attrs.inheritable_array(:links).must_equal(["bar", "stadium"])
-      end
-
       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
@@ -241,9 +187,6 @@ class HyperlinkTest < MiniTest::Spec
                   include Roar::Representer::Feature::Hypermedia
                   link(:bla) { "boo" }
                 end).to_hash.must_equal({"links"=>[{:rel=>:self, :href=>"bo"}, {:rel=>:bla, :href=>"boo"}]})
-
-
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.19
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - TODO.markdown
 - gemfiles/Gemfile.representable-1.5.ruby-1.8
 - gemfiles/Gemfile.representable-1.5.ruby-1.9
+- gemfiles/Gemfile.representable-1.6.ruby-1.9
 - lib/roar.rb
 - lib/roar/decorator.rb
 - lib/roar/representer.rb