waveguide 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c675b5a4d39a3b4eb65c74f46d1bb5feb7a62982
-  data.tar.gz: 27cafb25c01831cfb17ce44cc3d6313164b46fa2
+  metadata.gz: 163022ccfce122fddc992b3b9ae47fb5ae592a2c
+  data.tar.gz: e223abb6070f4ab88b93eee195e40d6992880bdb
 SHA512:
-  metadata.gz: b227c1ac9708194d8d8d38a4cc2a1a07671bd3df6f3b2ad7e94e6d3e382314c0a463055e3e5072ef93e3e2bfcee00e1c4472cccc06bfd1288beac1daccbd4c77
-  data.tar.gz: 804965333418fe4e705965cc39476eac2d4e9879f3ec1d2673dffbf3d288874b16b5d6b8ba56ce9fa9befe835c94f2b1ba5cc414cf03de62ec2aeaca2e52164e
+  metadata.gz: 1e2e15688e74dec7df83a7d68566ab13a7bb4d662ec3504b232674af0e38f6516d78d288c4818bd68f4f05362f7f2d9175308ce4055c8a30fb1f155da233e4a3
+  data.tar.gz: f27c232cd99c38239537aeeaa6475cd52e6adce91fd5563782eb992bcdb4b887f482a49c8106e40284b4f5604296a322b14b82e7e8d396bc5db5276a2b87087c

data/lib/waveguide/serializer.rb

@@ -17,11 +17,11 @@ module Waveguide
 
       self.class.attributes_to_serialize.each do |key|
         output[key] = self.send(key)
-      end 
+      end
 
       self.class.conditional_attributes.each do |key|
         output[key] = self.send(key) if self.send("include_#{key}?")
-      end 
+      end
 
       output
     end
@@ -34,9 +34,9 @@ module Waveguide
 
       def inherited(base)
         super
-        base.attributes_to_serialize = attributes_to_serialize.dup || []
-        base.conditional_attributes = conditional_attributes.dup || []
-        base.serializer_methods = serializer_methods.dup || {}
+        base.attributes_to_serialize = (attributes_to_serialize || []).dup
+        base.conditional_attributes = (conditional_attributes || []).dup
+        base.serializer_methods = (serializer_methods || {}).dup
 
         (self.serializer_methods || {}).each do |key, block|
           base.send(:define_method, key, &block)
@@ -82,20 +82,24 @@ module Waveguide
         end
       end
 
-      def has_one(relation_name, as: nil, serializer:)
+      def has_one(relation_name, as: nil, serializer: nil)
         key = as || relation_name
         add_attribute(key)
-        define_serializer_method(key) do
-          serializer.new(object.send(relation_name)).as_json
+        if serializer
+          define_serializer_method(key) do
+            serializer.new(object.send(relation_name), scope).as_json
+          end
         end
       end
 
-      def has_many(relation_name, as: nil, serializer:)
+      def has_many(relation_name, as: nil, serializer: nil)
         key = as || relation_name
         add_attribute(key)
-        define_serializer_method(key) do
-          object.send(relation_name).map do |item|
-            serializer.new(item).as_json
+        if serializer
+          define_serializer_method(key) do
+            object.send(relation_name).map do |item|
+              serializer.new(item, scope).as_json
+            end
           end
         end
       end

data/lib/waveguide/version.rb

@@ -1,3 +1,3 @@
 module Waveguide
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waveguide
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Aaron Gough
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A fast serialization library for Ruby.