rest_model 0.1.13 → 0.1.14

data/examples/belongs_to/href_options.rb

@@ -0,0 +1,15 @@
+$:.push 'examples'; require 'helper'
+
+class Customer < RestModel
+  id field: :customer_id, type: Integer
+  has_many :services
+end
+
+class Service < RestModel
+  id type: Integer
+  belongs_to :customer, href: proc {"http://external.service.com/customers/#{customer_id}"}
+end
+
+@service = Service.new(id: 123, customer_id: 999)
+
+inspect_rest_model(@service)

data/examples/has_many/href_options.rb

@@ -0,0 +1,16 @@
+$:.push 'examples'; require 'helper'
+
+class Service < RestModel
+  property :name
+  belongs_to :customer
+end
+
+class Customer < RestModel
+  id field: :customer_id, type: Integer
+  property :login
+  has_many :services, href: proc {"http://external.service.com/customers/#{id}/services"}
+end
+
+@root = Customer.from_source!({customer_id: 123, login: 'jackiechan2010'}).first
+
+inspect_rest_model(@root)

data/examples/has_one/href_options.rb

@@ -0,0 +1,16 @@
+$:.push 'examples'; require 'helper'
+
+class Billing < RestModel
+  property :login
+  belongs_to :customer
+end
+
+class Customer < RestModel
+  id field: :customer_id, type: Integer
+  property :login
+  has_one  :billing, href: proc {"http://external.service.com/customers/#{id}/billing"}
+end
+
+@root = Customer.from_source!({customer_id: 123, login: 'jackiechan2010'}).first
+
+inspect_rest_model(@root)

data/examples/has_one/simple.rb

@@ -0,0 +1,16 @@
+$:.push 'examples'; require 'helper'
+
+class Billing < RestModel
+  property :login
+  belongs_to :customer
+end
+
+class Customer < RestModel
+  id field: :customer_id, type: Integer
+  property :login
+  has_one  :billing
+end
+
+@root = Customer.from_source!({customer_id: 123, login: 'jackiechan2010'}).first
+
+inspect_rest_model(@root)

data/lib/rest_model/key/relation/response.rb

@@ -28,10 +28,14 @@ class RestModel
       end
 
       def href(parent)
-        uri = has? ? "#{parent.class.resource_name}/#{resource_id(parent)}/#{relation_name(parent)}"
-                   : "#{relation_name(parent).to_s.pluralize}/#{resource_id(parent)}"
+        if options[:href]
+          parent.instance_eval(&options[:href])
+        else
+          host = "#{RestModel::Configuration.host}"
 
-        "#{RestModel::Configuration.host}/#{uri}"
+          has? ? "#{host}/#{parent.class.resource_name}/#{resource_id(parent)}/#{relation_name(parent)}"
+               : "#{host}/#{relation_name(parent).to_s.pluralize}/#{resource_id(parent)}"
+        end
       end
 
       def resource_id(parent)

data/lib/rest_model/version.rb

@@ -1,3 +1,3 @@
 class RestModel
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/spec/integration/belongs_to_spec.rb

@@ -49,7 +49,7 @@ describe "belongs_to" do
     end
   end
 
-  describe_example "belongs_to/resource_id_from_source", wip: true do
+  describe_example "belongs_to/resource_id_from_source" do
     it 'parses properly' do
       @service.id.should == 123
       @service.customer_id.should == 999
@@ -72,4 +72,28 @@ describe "belongs_to" do
       end
     end
   end
+
+  describe_example "belongs_to/href_options" do
+    it 'parses properly' do
+      @service.id.should == 123
+      @service.customer_id.should == 999
+    end
+
+    describe "#resource" do
+      subject {@service.resource}
+
+      it 'has a link' do
+        subject[:link].should be_an(Array)
+      end
+
+      it "has a customer relation" do
+        subject[:link].any? {|l| l[:rel] == :customer}.should be_true
+      end
+
+      it "has a href for customer relation" do
+        link = subject[:link].find {|l| l[:rel] == :customer}
+        link[:href].should =~ %r{http://external.service.com/customers/999}
+      end
+    end
+  end
 end

data/spec/integration/has_many_spec.rb

@@ -26,4 +26,28 @@ describe "has_many" do
       end
     end
   end
+
+  describe_example "has_many/href_options" do
+    it 'parses properly' do
+      @root.id.should == 123
+      @root.login.should == 'jackiechan2010'
+    end
+
+    describe "#resource" do
+      subject {@root.resource}
+
+      it 'has a link' do
+        subject[:link].should be_an(Array)
+      end
+
+      it "has a services relation" do
+        subject[:link].any? {|l| l[:rel] == :services}.should be_true
+      end
+
+      it "has a href for services relation" do
+        link = subject[:link].find {|l| l[:rel] == :services}
+        link[:href].should =~ %r{http://external.service.com/customers/123/services}
+      end
+    end
+  end
 end

data/spec/integration/has_one_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe "has_many" do
+  describe_example "has_one/simple" do
+    it 'parses properly' do
+      @root.id.should == 123
+      @root.login.should == 'jackiechan2010'
+    end
+
+    describe "#resource" do
+      subject {@root.resource}
+
+      it 'has a link' do
+        subject[:link].should be_an(Array)
+      end
+
+      it "has a billing relation" do
+        subject[:link].any? {|l| l[:rel] == :billing}.should be_true
+      end
+
+      it "has a href for billing relation" do
+        link = subject[:link].find {|l| l[:rel] == :billing}
+        link[:href].should =~ %r{/customers/123/billing}
+      end
+    end
+  end
+
+  describe_example "has_one/href_options" do
+    it 'parses properly' do
+      @root.id.should == 123
+      @root.login.should == 'jackiechan2010'
+    end
+
+    describe "#resource" do
+      subject {@root.resource}
+
+      it 'has a link' do
+        subject[:link].should be_an(Array)
+      end
+
+      it "has a billing relation" do
+        subject[:link].any? {|l| l[:rel] == :billing}.should be_true
+      end
+
+      it "has a href for billing relation" do
+        link = subject[:link].find {|l| l[:rel] == :billing}
+        link[:href].should =~ %r{http://external.service.com/customers/123/billing}
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_model
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70126490239840 !ruby/object:Gem::Requirement
+  requirement: &70289539178140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126490239840
+  version_requirements: *70289539178140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70126490239340 !ruby/object:Gem::Requirement
+  requirement: &70289539177640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70126490239340
+  version_requirements: *70289539177640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126490238880 !ruby/object:Gem::Requirement
+  requirement: &70289539177180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70126490238880
+  version_requirements: *70289539177180
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70126490238420 !ruby/object:Gem::Requirement
+  requirement: &70289539176720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70126490238420
+  version_requirements: *70289539176720
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70126490237960 !ruby/object:Gem::Requirement
+  requirement: &70289539176260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70126490237960
+  version_requirements: *70289539176260
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70126490237500 !ruby/object:Gem::Requirement
+  requirement: &70289535995500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70126490237500
+  version_requirements: *70289535995500
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -94,6 +94,7 @@ files:
 - README.md
 - Rakefile
 - examples/all.rb
+- examples/belongs_to/href_options.rb
 - examples/belongs_to/resource_id_from_source.rb
 - examples/belongs_to/resource_id_options.rb
 - examples/belongs_to/simple.rb
@@ -110,7 +111,10 @@ files:
 - examples/embeds_one/with_class_name.rb
 - examples/embeds_one/with_if.rb
 - examples/embeds_one/with_start_key.rb
+- examples/has_many/href_options.rb
 - examples/has_many/simple.rb
+- examples/has_one/href_options.rb
+- examples/has_one/simple.rb
 - examples/helper.rb
 - examples/initialize/embeds_many.rb
 - examples/initialize/embeds_many_array.rb
@@ -184,6 +188,7 @@ files:
 - spec/integration/embeds_many_spec.rb
 - spec/integration/embeds_one_spec.rb
 - spec/integration/has_many_spec.rb
+- spec/integration/has_one_spec.rb
 - spec/integration/property_spec.rb
 - spec/integration/summarization_spec.rb
 - spec/integration/to_source_spec.rb
@@ -245,6 +250,7 @@ test_files:
 - spec/integration/embeds_many_spec.rb
 - spec/integration/embeds_one_spec.rb
 - spec/integration/has_many_spec.rb
+- spec/integration/has_one_spec.rb
 - spec/integration/property_spec.rb
 - spec/integration/summarization_spec.rb
 - spec/integration/to_source_spec.rb