roar 0.11.18 → 0.11.19

data/.travis.yml

@@ -2,7 +2,7 @@ matrix:
   include:
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.representable-1.5.ruby-1.9
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.representable-1.5.ruby-1.8
+#    - rvm: 1.8.7
+#      gemfile: gemfiles/Gemfile.representable-1.5.ruby-1.8
 notifications:
   irc: "irc.freenode.org#cells"

data/Gemfile

@@ -3,13 +3,4 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in roar.gemspec
 gemspec
 
-#gem "representable", :path => "../representable"#">= 1.3.2"
-
-
-group :test do
-  gem 'faraday'
-  gem 'turn'
-  gem 'virtus'
-  gem "sinatra",   "~> 1.3.2"
-  gem "sham_rack", "~> 1.3.0"
-end
+#gem "representable", :path => "../representable"

data/TODO.markdown

@@ -2,4 +2,5 @@
 * move #prepare_links! call to #_links or something so it doesn't need to be called in #serialize.
 * 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). remove lambdas when :representer_exec calls methods in decorator ctx, also
+* abstract ::links_definition_options and move them out of the generic representers (JSON, XML).
+* make 1.8 tests work, again (hash ordering!)

data/gemfiles/Gemfile.representable-1.5.ruby-1.8

@@ -2,5 +2,5 @@ source "http://rubygems.org"
 
 gemspec :path => '../'
 
-gem 'representable', '~> 1.5.0'
+gem 'representable', '~> 1.5.2'
 gem 'json'

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

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gemspec path: '../'
 
-gem 'representable', '~> 1.5.0'
+gem 'representable', '~> 1.5.2'

data/lib/roar/decorator.rb

@@ -1,3 +1,6 @@
+require 'roar/representer'
+require 'representable/decorator'
+
 class Roar::Decorator < Representable::Decorator
   extend Roar::Representer::InheritableArray
 

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

@@ -73,7 +73,7 @@ module Roar
         def links_definition_options
           # TODO: this method is never called.
           [:links_array, {:from => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true,
-            :representer_exec => true, :getter => lambda { |*| links_array }, :setter => lambda { |val,*| links_array=(val) } }] # TODO: merge with JSON.
+            :decorator_scope => true}] # TODO: merge with JSON.
         end
 
         # Setup hypermedia links by invoking their blocks. Usually called by #serialize.

data/lib/roar/representer/json.rb

@@ -47,7 +47,7 @@ module Roar
         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,
-            :decorator_scope => true, :getter => lambda { |*| links_array }, :setter => lambda { |val,*| self.links_array=(val) } }]
+            :decorator_scope => true}]
         end
       end
 

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

@@ -159,9 +159,7 @@ module Roar::Representer
               {
                 :extend   => HAL::Links::LinkCollectionRepresenter,
                 :instance => lambda { |*| LinkCollection.new(link_array_rels) }, # defined in InstanceMethods as this is executed in represented context.
-                :decorator_scope => true,
-                :getter => lambda { |*| links },
-                :setter => lambda { |val,*| self.links=(val) }
+                :decorator_scope => true
               }
             ]
           end

data/lib/roar/representer/xml.rb

@@ -40,7 +40,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,
-            :decorator_scope => true, :getter => lambda { |*| links_array }, :setter => lambda { |val,*| self.links_array=(val) } }] # TODO: merge with JSON.
+            :decorator_scope => true}] # TODO: merge with JSON.
         end
 
         # Generic entry-point for parsing.

data/lib/roar/version.rb

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

data/roar.gemspec

@@ -19,10 +19,10 @@ 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.2"
+  s.add_runtime_dependency "representable", "~> 1.5.3"
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "test_xml", ">= 0.1.4"
+  s.add_development_dependency "rake", ">= 0.10.1"
+  s.add_development_dependency "test_xml", ">= 0.1.6"
   s.add_development_dependency "minitest",	">= 5.0.0"
   s.add_development_dependency "sham_rack"
   s.add_development_dependency "sinatra"

data/test/hal_json_test.rb

@@ -8,7 +8,7 @@ class HalJsonTest < MiniTest::Spec
       include Roar::Representer::JSON::HAL
 
       links :self do
-        [{:lang => "en", :href => "http://en.hit"}, 
+        [{:lang => "en", :href => "http://en.hit"},
          {:lang => "de", :href => "http://de.hit"}]
       end
 
@@ -39,7 +39,7 @@ class HalJsonTest < MiniTest::Spec
     it "rejects single links declared as array when parsing" do
       assert_raises TypeError do
         subject.from_json("{\"_links\":{\"self\":{\"href\":\"http://next\"}}}")
-      end      
+      end
     end
 
     it "renders link and link array" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.18
+  version: 0.11.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement