roar 0.11.3 → 0.11.4

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.11.4
+
+* Links can now return a hash of attributes as `link :self do {:href => fruit_path(self), :title => "Yummy stuff"} end`.
+
 ## 0.11.3
 
 * Fixed an installation issue under Windows.

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

@@ -20,6 +20,12 @@ module Roar
       #       "http://orders/#{id}"
       #     end
       #
+      # If you need dynamic attributes, the block can return a hash.
+      #
+      #     link :preview do
+      #       {:href => image.url, :title => image.name}
+      #     end
+      #
       # Sometimes you need values from outside when the representation links are rendered. Just pass them
       # to the render method, they will be available as block parameters.
       #
@@ -53,8 +59,9 @@ module Roar
           
           links_def.rel2block.each do |config|  # config is [{..}, block]
             options = config.first
-            options[:href] = run_link_block(config.last, *args) or next
-            
+            href = run_link_block(config.last, *args) or next
+            options.merge! href.is_a?(Hash) ? href : {:href => href}
+
             links.update_link(Feature::Hypermedia::Hyperlink.new(options))
           end
         end

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

@@ -36,12 +36,12 @@ 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.definition.options[:embedded]
+          return super unless bin.options[:embedded]
           super(bin, doc[:_embedded] ||= {})
         end
         
         def uncompile_fragment(bin, doc)
-          return super unless bin.definition.options[:embedded]
+          return super unless bin.options[:embedded]
           super(bin, doc["_embedded"] || {})
         end
       end

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.3"
+  VERSION = "0.11.4"
 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.2.2"
+  s.add_runtime_dependency "representable", ">= 1.2.8"
   
   s.add_development_dependency "rake"
   s.add_development_dependency "test_xml"

data/test/hypermedia_feature_test.rb

@@ -41,6 +41,16 @@ class HypermediaTest
 
         assert_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"http://self/1\"}]}", Object.new.extend(@mod).to_json(:id => 1)
       end
+
+      it "supports returning hash" do
+        @mod.class_eval do
+          link :self do
+            {:href => "http://self", :type => "image/jpg"}
+          end
+        end
+
+        assert_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"http://self\",\"type\":\"image/jpg\"}]}", Object.new.extend(@mod).to_json
+      end
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
-  requirement: &68886170 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *68886170
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &68885130 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68885130
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_xml
-  requirement: &68884080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68884080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &68883670 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *68883670
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 description: Streamlines the development of RESTful, resource-oriented architectures
   in Ruby.
 email:
@@ -150,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roar
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Resource-oriented architectures in Ruby.