cyrax 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ececce0f435338b1fcd8df20a1cad2be6b7ce55d
-  data.tar.gz: 249d51c79b4adbf5555958964ea24856866ef610
+  metadata.gz: 06a2e5ace6afb79bf0a875113e4a88c1fbf73388
+  data.tar.gz: 082abc21ba19011f301817d2df10d8b581c199da
 SHA512:
-  metadata.gz: e995deb43d9d2e40686d073293e24eb07b19e09f2704db7f775d11be74cbb808e7d7ae4865ab7988467c80fd2cbbaf9231717cacfd764ae5904bc5d19b99c103
-  data.tar.gz: f5dc858c55d40b0ebd28af8e038f4f0012a19e03bd74e75541a64af75e39d5f6c77d7fb5c9db4526867a7a70ffb8aee90110f2984acb5a78f8d11f17c5dcb323
+  metadata.gz: fca6784ae81cec7e4c030d83b0fd852b743e7e360f37524cff294aa719b1dc9baebdabeab9776ad51a8a8d3e67290177595939ca46b5fb2d5268e97d40bb49bb
+  data.tar.gz: b9acd9e3f996b41d4f0cc2a8803020442d9c40debac6302ab8af8af37374f98e7ad41c7b4e9ed6584b5b224ddad76635eabcf6cecc02557c7d4fe1f53fd4fd1c

data/lib/cyrax/response.rb

@@ -62,7 +62,12 @@ class Cyrax::Response
   end
 
   def method_missing(method, *args, &block)
-    super unless assignments.has_key?(method)
-    assignments[method]
+    if method.to_s == resource_name
+      result
+    elsif assignments.has_key?(method)
+      assignments[method]
+    else
+      super
+    end
   end
 end

data/lib/cyrax/serializers/scope.rb

@@ -47,7 +47,9 @@ module Cyrax::Serializers
     end
 
     def serialize(resource, options = {})
-      if resource.respond_to?(:to_a)
+      if resource.nil?
+        nil
+      elsif resource.respond_to?(:to_a)
         resource.to_a.map{ |r| serialize_one(r, options) }
       else
         serialize_one(resource, options)

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/cyrax/serializer_spec.rb

@@ -8,16 +8,25 @@ class FooSerializer < Cyrax::Serializer
   relation :another do
     attributes :another_foo, :another_bar
   end
+  relation :empty_relation_many do
+    attributes :another_foo, :another_bar
+  end
+  relation :empty_relation_one do
+    attributes :another_foo, :another_bar
+  end
 end
 
 module Cyrax
   describe FooSerializer do
-    let(:serializable) { 
+    let(:serializable) {
       double(
         name: 'me',
         foo: '2342',
         bar: '4223',
-        another: double(another_foo: '1234', another_bar: '1234')) 
+        another: double(another_foo: '1234', another_bar: '1234'),
+        empty_relation_one: nil,
+        empty_relation_many: []
+      )
     }
     subject { FooSerializer.new(serializable).serialize }
 
@@ -25,6 +34,8 @@ module Cyrax
       subject[:name].should eq('me')
       subject[:some][:foo].should eq('2342')
       subject[:another][:another_foo].should eq('1234')
+      subject[:empty_relation_one].should eq(nil)
+      subject[:empty_relation_many].should eq([])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport