json_api_ruby 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42efcc7659bcd6df482b2f0a82f9434e2e65d7e
-  data.tar.gz: 3b111dbabfd9f66e0893af2c0b21f53a480d5711
+  metadata.gz: 91293b5565faf0ff2b9cbd1260c8e2da3a7b774b
+  data.tar.gz: e21ee8f390cd1fc36f0abea84201c240685b7f3a
 SHA512:
-  metadata.gz: 78d370d9fb0cbecbb2e46265610d7b8eee525d953bd0c786954d603cebe2800934a8995d944ff4fa9554888d697d43cc360dca217ab1ba5fe891a781f0c9be4f
-  data.tar.gz: ccdf63438c842cd0c6964633b755b45465246be9fb963f670e94af24dcb59334f3f2784cbf5d9a3ff2f7d07294748dc72bf33ebecaac18c67be3fd29ca455190
+  metadata.gz: 84c0dcd1ff3fec00ff7708a2db101448dad9b10abdba31dc0fbdecfc112a5ca2a9484ecaacb4636c384ec39b4acdad956330a1027d255cc11bb389d3c80c9e71
+  data.tar.gz: 05fe188da17d76795ce11e90074b21aa0e0046d9d359b82b1cfadf12f5907ee5669680aac1056f261a1c4ccae15ca72d18da1b5d9052c436cb4db16b286433f4

data/lib/json_api_ruby/resources/discovery.rb

@@ -3,8 +3,12 @@ module JsonApi
     class Discovery
       def self.resource_for_name(model, options={})
         @discovered_classes ||= {}
-        namespace = options.fetch(:namespace, nil)
         klass = options.fetch(:resource_class, nil)
+
+        # Duck typing. If klass responds to :new, we assume it's a class
+        return klass if klass.respond_to?(:new)
+
+        namespace = options.fetch(:namespace, nil)
         parent = options.fetch(:parent_resource, nil)
 
         if klass.blank?

data/lib/json_api_ruby/resources/relationships.rb

@@ -14,16 +14,19 @@ module JsonApi
 
       attr_reader :cardinality
 
+      attr_reader :explicit_resource_class
+
       def initialize(name, options)
         @name = name.to_s
         @cardinality = options.fetch(:cardinality)
+        @explicit_resource_class = options.fetch(:resource_class, nil)
       end
 
       def build_resources(options)
         if cardinality == :one
-          relationship = ToOneRelationship.new(name, options)
+          relationship = ToOneRelationship.new(name, options.merge(explicit_resource_class: explicit_resource_class))
         else
-          relationship = ToManyRelationship.new(name, options)
+          relationship = ToManyRelationship.new(name, options.merge(explicit_resource_class: explicit_resource_class))
         end
         relationship.build_resources(options)
         relationship
@@ -46,6 +49,8 @@ module JsonApi
       # included
       attr_reader :included
       attr_reader :name
+      attr_reader :explicit_resource_class
+
 
       # The resource object that represents this relationship
       attr_reader :resources
@@ -56,6 +61,7 @@ module JsonApi
         @parent = options.fetch(:parent_resource)
         @parent_model = parent._model
         @included = options.fetch(:included, false)
+        @explicit_resource_class = options.fetch(:explicit_resource_class)
       end
 
       def included?
@@ -90,7 +96,7 @@ module JsonApi
         resource_model = parent_model.send(name)
         return if resource_model.blank?
 
-        resource_class = Discovery.resource_for_name(resource_model, options.merge(parent_resource: parent))
+        resource_class = Discovery.resource_for_name(resource_model, options.merge(parent_resource: parent, resource_class: explicit_resource_class))
         @resources << resource_class.new(resource_model)
       end
 
@@ -112,7 +118,7 @@ module JsonApi
         return unless included?
 
         parent_model.send(name).each do |resource_model|
-          resource_class = Discovery.resource_for_name(resource_model, options.merge(parent_resource: parent))
+          resource_class = Discovery.resource_for_name(resource_model, options.merge(parent_resource: parent, resource_class: explicit_resource_class))
           @resources << resource_class.new(resource_model)
         end
       end

data/lib/json_api_ruby/version.rb

@@ -1,3 +1,3 @@
 module JsonApi
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/json_api_ruby/resources/discover_spec.rb

@@ -10,10 +10,14 @@ RSpec.describe JsonApi::Resources::Discovery do
       expect(JsonApi::Resources::Discovery.resource_for_name(Three.new, namespace: 'different_namespace')).to eq DifferentNamespace::ThreeResource
     end
 
-    it 'allows explicitly providing a resource class' do
+    it 'allows explicitly providing a resource class as a string' do
       expect(JsonApi::Resources::Discovery.resource_for_name(Two.new, resource_class: 'DifferentNamespace::ThreeResource')).to eq DifferentNamespace::ThreeResource
     end
 
+    it 'allows explicitly providing a resource class as an constant' do
+      expect(JsonApi::Resources::Discovery.resource_for_name(Two.new, resource_class: DifferentNamespace::ThreeResource)).to eq DifferentNamespace::ThreeResource
+    end
+
     it "raises an error if the resource can't be found" do
       expect {
         JsonApi::Resources::Discovery.resource_for_name(nil)

data/spec/json_api_ruby/resources/relationships_spec.rb

@@ -107,4 +107,32 @@ RSpec.describe JsonApi::Resources::RelationshipMeta do
       end
     end
   end
+
+  describe 'passing in a resource class' do
+    let(:simple_article_resource) do
+      SimpleArticleResource.new(article, include: ['author', 'comments'])
+    end
+
+    let(:author_relation) do
+      simple_article_resource.relationships.find do |rel|
+        rel.name == 'author'
+      end
+    end
+
+    let(:comment_relation) do
+      simple_article_resource.relationships.find do |rel|
+        rel.name == 'comments'
+      end
+    end
+
+    it 'uses the passed in resource_class for author' do
+      expect(author_relation.resource_object).to be_an_instance_of(SimplePersonResource)
+    end
+
+    it 'uses the passed in resource_class for each comment' do
+      comment_relation.resource_objects.each do |resource_object|
+        expect(resource_object).to be_an_instance_of(SimpleCommentResource)
+      end
+    end
+  end
 end

data/spec/support/resource_objects.rb

@@ -84,6 +84,22 @@ class ArticleResource < JsonApi::Resource
   has_many :comments
 end
 
+class SimplePersonResource < JsonApi::Resource
+  attribute :name
+end
+
+class SimpleCommentResource < JsonApi::Resource
+  id_field :uuid
+  attribute :comment_text
+end
+
+class SimpleArticleResource < JsonApi::Resource
+  attribute :title
+
+  has_one :author, resource_class: SimplePersonResource
+  has_many :comments, resource_class: 'SimpleCommentResource'
+end
+
 class CommentResource < JsonApi::Resource
   id_field :uuid
   attribute :author

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Tracey Eubanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport