json_schema_tools 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 
 2013-10
+* allow all object properties in link href placeholders => contacts/{id}/{number}
 * add base_url option to schema hash creation. Prepends an url to all links of a rendered object
 * add to_schema_json for simpler model to json conversion
 * add option to exclude_root in to_schema hash method

data/lib/schema_tools/modules/hash.rb

@@ -90,8 +90,16 @@ module SchemaTools
       def parse_links(obj, schema, opts={})
         links = []
         schema['links'] && schema['links'].each do |link|
-          # substitute placeholders
-          href = link['href'].gsub(/\{id\}/, "#{obj.id}")
+          href = link['href'].dup
+          # placeholders: find all {xy}, create replacement ary with
+          # values, than replace
+          matches = href.scan(/{(\w+)}/) #{abc} => abc
+          replaces = []
+          matches.each do |match|
+            obj_val = obj.send(match[0]) if obj.respond_to?(match[0])
+            replaces << ["{#{match[0]}}", obj_val] if obj_val
+          end
+          replaces.each {|r| href.gsub!(r[0], r[1])}
           href = "#{opts[:base_url]}/#{href}" if opts[:base_url]
 
           links << { 'rel' => link['rel'],

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/fixtures/client.json

@@ -98,11 +98,6 @@
           "description": "Sort the results by the given field => number",
           "enum":["organisation", "number","email","first_name","last_name", "created_at", "updated_at"],
           "type": "string"
-        },
-        "sort":{
-          "title" : "Sort",
-          "enum":["ASC","DESC"],
-          "description": "Sort the results in ASC or DESC"
         }
       }
     },
@@ -121,11 +116,9 @@
     { "rel": "documents",
       "href": "clients/{id}/documents"
     },
-    { "rel": "attachments",
-      "href": "clients/{id}/attachments"
-    },
-    { "rel": "invoices",
-      "href": "clients/{id}/invoices"
+    { "rel": "test replacement",
+      "href": "clients/{id}/{first_name}"
     }
+
   ]
 }

data/spec/schema_tools/hash_spec.rb

@@ -71,7 +71,7 @@ describe SchemaTools::Hash do
 
     it 'should have _links on object if exclude root' do
       hash = SchemaTools::Hash.from_schema(contact, exclude_root: true, class_name: :client)
-      hash['_links'].length.should == 8
+      hash['_links'].length.should == 7
     end
 
     it 'should have _class_name on object if exclude root' do
@@ -170,12 +170,17 @@ describe SchemaTools::Hash do
 
     it 'should have links' do
       hash = SchemaTools::Hash.from_schema(client)
-      hash['links'].length.should == 8
+      hash['links'].length.should == 7
     end
 
     it 'should prepend base_url' do
       hash = SchemaTools::Hash.from_schema(client, base_url: 'http://json-hell.com')
-      hash['links'].first['href'].should == 'http://json-hell.com/clients/SomeID'
+      hash['links'].first['href'].should include( 'http://json-hell.com')
+    end
+
+    it 'should replace placeholders' do
+      hash = SchemaTools::Hash.from_schema(client, base_url: 'http://json-hell.com')
+      hash['links'].last['href'].should == 'http://json-hell.com/clients/SomeID/Peter'
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: