rest_model 0.1.11 → 0.1.12

data/examples/belongs_to/resource_id_from_source.rb

@@ -0,0 +1,16 @@
+$:.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
+  property :customer_id, field: :client_id, type: Integer
+end
+
+@service = Service.from_source(id: 123, client_id: 999).first
+
+inspect_rest_model(@service)

data/examples/belongs_to/resource_id_options.rb

@@ -0,0 +1,19 @@
+$:.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, resource_id: proc {resource_id}
+
+  def resource_id
+    123456789
+  end
+end
+
+@service = Service.new(id: 123)
+
+inspect_rest_model(@service)

data/examples/belongs_to/simple.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
+end
+
+@service = Service.new(id: 123, customer_id: 999)
+
+inspect_rest_model(@service)

data/lib/rest_model/key/builder.rb

@@ -7,6 +7,7 @@ class RestModel
 
       def key(key)
         fail "you can't define a key with name '#{key.name}'" if not_allowed?(key)
+
         key.model = self
         attr_accessor key.name
         self.keys  << key

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

@@ -18,6 +18,7 @@ class RestModel
       def belongs_to(name, options = {})
         options.merge!(many: false, has: false)
         relation(name, options)
+        attr_accessor "#{name}_id"
       end
     end
   end

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

@@ -4,11 +4,12 @@ class RestModel
       def to_resource(parent)
         included = parent.__send__(name)
         return {} unless visible?(parent) and included
+
         {name => resource_from_included(included)}
       end
 
       def to_relation(parent)
-        {rel: name, href: href(parent)}
+        {rel: name, href: href(parent)} if resource_id(parent)
       end
 
       private
@@ -17,21 +18,29 @@ class RestModel
         relation = parent.class.relations.find do |key|
           key.resource_class == self.resource_class
         end
+
         relation.name or fail
       end
 
       def resource_from_included(included)
         options = {root: false}
-        one? ?
-          included.resource(options)
-        : included.map {|r| r.resource(options)}
+        one? ? included.resource(options) : included.map {|r| r.resource(options)}
       end
 
       def href(parent)
-        id_key = parent.class.id_key.name
-        has? ?
-          "#{RestModel::Configuration.host}/#{parent.class.resource_name}/#{parent.send(id_key)}/#{relation_name(parent)}"
-        : "#{RestModel::Configuration.host}/#{relation_name(parent).to_s.pluralize}/#{parent.send(id_key)}/#{parent.class.resource_name}"
+        uri = has? ? "#{parent.class.resource_name}/#{resource_id(parent)}/#{relation_name(parent)}"
+                   : "#{relation_name(parent).to_s.pluralize}/#{resource_id(parent)}"
+
+        "#{RestModel::Configuration.host}/#{uri}"
+      end
+
+      def resource_id(parent)
+        if has?
+          parent.send(parent.class.id_key.name)
+        else
+          options[:resource_id] ? parent.instance_eval(&options[:resource_id])
+                                : parent.__send__("#{self.name}_id")
+        end
       end
     end
   end

data/lib/rest_model/key/relation.rb

@@ -21,6 +21,5 @@ class RestModel
     end
 
     alias :parse  :from_source
-
   end
 end

data/lib/rest_model/response.rb

@@ -11,18 +11,18 @@ class RestModel
         end
 
         if root and self.class.relations.any? and !options[:summarize]
-          resource.merge!({link: link})
+          links = build_links
+          resource.merge!({link: links}) if links.any?
         end
       end
     end
 
-    def link
-      self.class.relations.map {|key| key.to_relation(self)}
+    def build_links
+      self.class.relations.map {|key| key.to_relation(self)}.reject(&:nil?)
     end
 
     def resource_keys(options)
-      summarize?(options) ? self.class.summarized_keys + [Href.new]
-                          : self.class.keys
+      summarize?(options) ? self.class.summarized_keys + [Href.new] : self.class.keys
     end
 
     def summarize?(options)

data/lib/rest_model/version.rb

@@ -1,3 +1,3 @@
 class RestModel
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/rest_model.rb

@@ -48,6 +48,8 @@ class RestModel
 
     attrs = attrs.with_indifferent_access
 
+    assign_non_keys_attrs(attrs)
+
     self.class.keys.each do |key|
       __send__("#{key.name}=", key.from_hash(attrs[key.name])) if key.present?(self)
     end
@@ -58,6 +60,8 @@ class RestModel
 
     attrs = attrs.with_indifferent_access
 
+    assign_non_keys_attrs(attrs)
+
     self.class.keys.each do |key|
       value = attrs[key.name]
 
@@ -95,6 +99,17 @@ class RestModel
   end
 
   def self.not_allowed_names
-    %w(resource_id resource link)
+    %w(resource_id resource)
+  end
+
+  private
+
+  def assign_non_keys_attrs(attrs)
+    key_names = self.class.keys.map {|k| k.name}
+    non_keys = attrs.reject {|k, v| key_names.member?(k.to_sym)}
+
+    non_keys.each do |key, value|
+      __send__("#{key}=", value) if self.respond_to?("#{key}=")
+    end
   end
 end

data/spec/integration/belongs_to_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe "belongs_to" do
+  describe_example "belongs_to/simple" 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{/customers/999}
+      end
+    end
+  end
+
+  describe_example "belongs_to/resource_id_options" do
+    it 'parses properly' do
+      @service.id.should == 123
+      @service.customer_id.should be_nil
+    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{/customers/123456789}
+      end
+    end
+  end
+
+  describe_example "belongs_to/resource_id_from_source", wip: true 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{/customers/999}
+      end
+    end
+  end
+end

data/spec/unit/key/relation/response_spec.rb

@@ -85,8 +85,8 @@ describe RestModel::Response do
 
     subject {ExampleChild.keys[1]}
 
-    let(:example) {ExampleChild.new(id: 200)}
-    let(:result)  {{rel: :example, href: "http://example.com/examples/200/example_children"}}
+    let(:example) {ExampleChild.new(id: 200, example_id: 123)}
+    let(:result)  {{rel: :example, href: "http://example.com/examples/123"}}
 
     it_behaves_like "a relation"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_model
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70225631314800 !ruby/object:Gem::Requirement
+  requirement: &70204201993120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225631314800
+  version_requirements: *70204201993120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70225631314220 !ruby/object:Gem::Requirement
+  requirement: &70204201992620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70225631314220
+  version_requirements: *70204201992620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225631313740 !ruby/object:Gem::Requirement
+  requirement: &70204201992160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70225631313740
+  version_requirements: *70204201992160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70225631313260 !ruby/object:Gem::Requirement
+  requirement: &70204201991700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70225631313260
+  version_requirements: *70204201991700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70225631312800 !ruby/object:Gem::Requirement
+  requirement: &70204201991240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70225631312800
+  version_requirements: *70204201991240
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70225631312340 !ruby/object:Gem::Requirement
+  requirement: &70204201990780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70225631312340
+  version_requirements: *70204201990780
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -94,6 +94,9 @@ files:
 - README.md
 - Rakefile
 - examples/all.rb
+- examples/belongs_to/resource_id_from_source.rb
+- examples/belongs_to/resource_id_options.rb
+- examples/belongs_to/simple.rb
 - examples/embeds_many/invisible.rb
 - examples/embeds_many/simple.rb
 - examples/embeds_many/with_array.rb
@@ -177,6 +180,7 @@ files:
 - lib/rest_model/version.rb
 - rest_model.gemspec
 - spec/.DS_Store
+- spec/integration/belongs_to_spec.rb
 - spec/integration/embeds_many_spec.rb
 - spec/integration/embeds_one_spec.rb
 - spec/integration/has_many_spec.rb
@@ -237,6 +241,7 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- spec/integration/belongs_to_spec.rb
 - spec/integration/embeds_many_spec.rb
 - spec/integration/embeds_one_spec.rb
 - spec/integration/has_many_spec.rb