roar 0.11.14 → 0.11.15

data/.gitignore

@@ -1,4 +1,4 @@
 pkg/*
 *.gem
 .bundle
-Gemfile.lock
+Gemfile*.lock

data/.travis.yml

@@ -1,13 +1,8 @@
-rvm: 1.9.3
+rvm:
+  - 1.9.3
+  - 1.8.7
 notifications:
   irc: "irc.freenode.org#cells"
-matrix:
-  include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.representable-1.3
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.representable-1.3
-	- rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.representable-1.4
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.representable-1.4
+gemfile:
+  - gemfiles/Gemfile.representable-1.3
+  - gemfiles/Gemfile.representable-1.4

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+# 0.11.15
+
+* Fixing [#66](https://github.com/apotonick/roar/issues/66).
+
 # 0.11.14
 
 * Fixing Gemfile.

data/README.textile

@@ -300,3 +300,7 @@ h2. Support
 
 Questions? Need help? Free 1st Level Support on irc.freenode.org#roar !
 We also have a "mailing list":https://groups.google.com/forum/?fromgroups#!forum/roar-talk, yiha!
+
+h2. License
+
+Roar is released under the "MIT License":http://www.opensource.org/licenses/MIT.

data/gemfiles/Gemfile.representable-1.3

@@ -2,11 +2,12 @@ source "http://rubygems.org"
 
 gemspec :path => '../'
 
-gem 'representable', '>= 1.3.1'
+gem 'representable', '~> 1.3.1'
 group :test do
   gem 'faraday'
   gem 'turn'
   gem 'virtus'
   gem "sinatra",   "~> 1.3.2"
   gem "sham_rack", "~> 1.3.0"
+  gem "json"
 end

data/gemfiles/Gemfile.representable-1.4

@@ -2,11 +2,12 @@ source "http://rubygems.org"
 
 gemspec :path => '../'
 
-gem 'representable', '>= 1.4.0'
+gem 'representable', '~> 1.4.1'
 group :test do
   gem 'faraday'
   gem 'turn'
   gem 'virtus'
   gem "sinatra",   "~> 1.3.2"
   gem "sham_rack", "~> 1.3.0"
+  gem 'json'
 end

data/lib/roar/decorator.rb

@@ -1 +1,3 @@
-Roar::Decorator = Representable::Decorator
+class Roar::Decorator < Representable::Decorator
+  extend Roar::Representer::InheritableArray
+end

data/lib/roar/representer.rb

@@ -19,7 +19,7 @@ module Roar
 
         def inherit(parent)
           super
-          
+
           parent.inheritable_arrays.keys.each do |k|
             inheritable_array(k).push *parent.inheritable_array(k).clone
           end
@@ -30,11 +30,13 @@ module Roar
     def self.included(base)
       base.class_eval do
         include Representable
+        extend InheritableArray # this adds InheritableArray::representable_attrs to the module, e.g. when a representer includes a  representer, we don't work with the instance method, yet.
       end
     end
 
     include InheritableArray
 
+
   private
     def before_serialize(*)
     end

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.14"
+  VERSION = "0.11.15"
 end

data/roar.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "representable", ">= 1.2.8"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "test_xml"
+  s.add_development_dependency "test_xml", ">= 0.1.4"
   s.add_development_dependency "minitest",	">= 2.8.1"
 end

data/test/hypermedia_test.rb

@@ -215,23 +215,32 @@ class HyperlinkTest < MiniTest::Spec
           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
-                  include Module.new do
-                    include Roar::Representer::JSON
-                    include Roar::Representer::Feature::Hypermedia
-        
-                    property :bla
-
-                    link( :self) {"bo"}
-                  end
+                  include(Module.new do
+                                      include Roar::Representer::JSON
+                                      include Roar::Representer::Feature::Hypermedia
+
+                                      property :bla
+
+                                      link( :self) {"bo"}
+
+                                      #puts "hey ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+                                      #puts representable_attrs.inheritable_array(:links).inspect
+                                    end)
+
+
+                  #puts representable_attrs.inheritable_array(:links).inspect
+
                   property :blow
-                end).to_json
+                  include Roar::Representer::Feature::Hypermedia
+                  link(:bla) { "boo" }
+                end).to_hash.must_equal({"links"=>[{:rel=>:self, :href=>"bo"}, {:rel=>:bla, :href=>"boo"}]})
 
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.14
+  version: 0.11.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roar
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Resource-oriented architectures in Ruby.