roar 0.11.17 → 0.11.18

data/.travis.yml

@@ -1,7 +1,8 @@
-rvm:
-  - 1.9.3
-  - 1.8.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
 notifications:
   irc: "irc.freenode.org#cells"
-gemfile:
-  - gemfiles/Gemfile.representable-1.4

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+# 0.11.18
+
+* Updating to representable-1.5.2.
+
 # 0.11.17
 
 * Fixing HAL + Decorator.

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

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gemspec :path => '../'
+
+gem 'representable', '~> 1.5.0'
+gem 'json'

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

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

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

@@ -158,6 +158,7 @@ module Roar
           def replace(hash)
             # #marshal_load requires symbol keys: http://apidock.com/ruby/v1_9_3_125/OpenStruct/marshal_load
             marshal_load(hash.inject({}) { |h, (k,v)| h[k.to_sym] = v; h })
+            self
           end
         end
       end

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

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

@@ -159,7 +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.
-                :representer_exec => true,
+                :decorator_scope => true,
                 :getter => lambda { |*| links },
                 :setter => lambda { |val,*| self.links=(val) }
               }

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

data/lib/roar/version.rb

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

data/roar.gemspec

@@ -19,9 +19,14 @@ 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.0"
+  s.add_runtime_dependency "representable", ">= 1.5.2"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "test_xml", ">= 0.1.4"
-  s.add_development_dependency "minitest",	">= 2.8.1"
+  s.add_development_dependency "minitest",	">= 5.0.0"
+  s.add_development_dependency "sham_rack"
+  s.add_development_dependency "sinatra"
+  s.add_development_dependency "virtus"
+  s.add_development_dependency "faraday"
+  s.add_development_dependency "json"
 end

data/test/decorator_test.rb

@@ -2,15 +2,17 @@ require 'test_helper'
 require 'roar/decorator'
 
 class DecoratorTest < MiniTest::Spec
-  describe "Decorator" do
-    it "exposes ::prepare" do
-      class SongRepresentation < Roar::Decorator
-        include Roar::Representer::JSON
+  class SongRepresentation < Roar::Decorator
+    include Roar::Representer::JSON
 
-        property :name
-      end
+    property :name
+  end
 
-      SongRepresentation.prepare(OpenStruct.new(:name => "Not The Same")).to_hash.must_equal({"name"=>"Not The Same"})
+  describe "Decorator" do
+    let (:song) { OpenStruct.new(:name => "Not The Same") }
+
+    it "exposes ::prepare" do
+      SongRepresentation.prepare(song).to_hash.must_equal({"name"=>"Not The Same"})
     end
   end
 

data/test/http_verbs_feature_test.rb

@@ -55,7 +55,7 @@ class HttpVerbsTest < MiniTest::Spec
 
         it 'performs no HTTP error handling with NetHttpTransport' do
           @band.transport_engine = Roar::Representer::Transport::NetHTTP
-          assert_raises(JSON::ParserError) do
+          assert_raises(MultiJson::LoadError) do
             @band.get('http://roar.example.com/bands/anthrax', "application/json")
           end
         end
@@ -74,7 +74,7 @@ class HttpVerbsTest < MiniTest::Spec
       it "updates instance with incoming representation" do
         @band.name = "Strung Out"
         assert_equal nil, @band.label
-        
+
         @band.post("http://roar.example.com/bands", "application/xml")
         assert_equal "STRUNG OUT", @band.name
         assert_equal nil, @band.label

data/test/test_helper.rb

@@ -1,24 +1,10 @@
-require 'bundler'
-Bundler.setup
-
-require 'test/unit'
-require 'minitest/spec'
+require 'minitest/autorun'
 require 'ostruct'
 
 require 'roar/representer'
 require 'roar/representer/feature/http_verbs'
 require 'roar/representer/json/hal'
 
-begin
-  require 'turn'
-
-  Turn.config do |config|
-    config.format  = :dotted
-    # config.trace   = true
-  end
-rescue LoadError
-end
-
 module AttributesConstructor  # TODO: remove me.
   def initialize(attrs={})
     attrs.each do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-27 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.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,87 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Streamlines the development of RESTful, resource-oriented architectures
   in Ruby.
 email:
@@ -91,7 +171,8 @@ files:
 - README.textile
 - Rakefile
 - TODO.markdown
-- gemfiles/Gemfile.representable-1.4
+- gemfiles/Gemfile.representable-1.5.ruby-1.8
+- gemfiles/Gemfile.representable-1.5.ruby-1.9
 - lib/roar.rb
 - lib/roar/decorator.rb
 - lib/roar/representer.rb

data/gemfiles/Gemfile.representable-1.4

@@ -1,13 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '../'
-
-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