easy_serializer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4bcd2510b26fd9bc5bce354fa24b8063ab3cd7
-  data.tar.gz: 6ad7cac70735ddc9ba2b5cec6285a04a8ef62f70
+  metadata.gz: 358888cc7f61e9b3510147bbe505d1418225b41e
+  data.tar.gz: 2de0f0cda813e67bd51a10166da9b05a5d854f8b
 SHA512:
-  metadata.gz: 8d7bedfffb05a5a67d7f6719cc6fdf2caea443d71506b227cdf10e840602516b1d8f92dcf86bcfcef5207953b42b60edc250e25b4cfd3f5cf7b5fc233139942e
-  data.tar.gz: 39425cec8ea178f8e7123483dceeac92b5790e277b7c7befa09feb4c11d950946459edcab9dc92ac1797444a7e372fa12b4299cc1e40ef1f973da20b0177a21a
+  metadata.gz: 09d793a662fb451a75f0a503361e62f1d38677f46e3297b432d31348f11d810c1c87dd88efbc00ff35177cde624189303273f3a730ec86c3c2d840f3f519b66c
+  data.tar.gz: 5855120cdba4d4eb42e77c7da6f0e25ab80225f62c9ada0cb19298cd09078c16c3126b66c7cf2766cce7bcd54cc905f2d4d05e6b1e6007d978fc9d83beaad568

data/lib/easy_serializer.rb

@@ -14,4 +14,5 @@ end
 
 require 'easy_serializer/helpers'
 require 'easy_serializer/cacher'
+require 'easy_serializer/attribute'
 require 'easy_serializer/base'

data/lib/easy_serializer/attribute.rb

@@ -0,0 +1,60 @@
+module EasySerializer
+  Attribute = Struct.new(:serializer, :setup) do
+    include Helpers
+    def self.call(serializer, setup)
+      new(serializer, setup).value
+    end
+
+    def object
+      serializer.object
+    end
+    def value
+      value_or_default
+    end
+
+    def value_or_default
+      value = attr_serializer
+      if value.nil? && setup[:default]
+        return option_to_value(setup[:default], object, serializer)
+      end
+      value
+    end
+
+    def attr_serializer
+      value = cache_or_attribute
+      return value.output if value.is_a?(CacheOutput)
+      return value unless serializer_class = setup[:serializer]
+      if setup[:collection]
+        Array.wrap(value).map { |o| serialize!(serializer_class, o) }
+      else
+        serialize!(serializer_class, value)
+      end
+    end
+    def send_name(obj)
+      obj.send(setup[:name])
+    end
+
+    def cache_or_attribute
+      execute = setup[:block] || method(:send_name)
+      if EasySerializer.perform_caching && setup[:cache]
+        Cacher.call(serializer, setup, nil, &execute)
+      else
+        serializer.instance_exec object, &execute
+      end
+    end
+
+    def send_to_serializer(serializer_class, value)
+      return unless value
+      option_to_value(serializer_class, value, serializer).call(value)
+    end
+
+    def serialize!(serializer_class, value)
+      return unless value
+      if EasySerializer.perform_caching && setup[:cache]
+        Cacher.call(serializer, setup, value)
+      else
+        send_to_serializer(serializer_class, value)
+      end
+    end
+  end
+end

data/lib/easy_serializer/base.rb

@@ -47,10 +47,15 @@ module EasySerializer
     alias_method :to_hash, :serialize
     alias_method :to_s, :to_json
 
+    def send_to_serializer(serializer, value)
+      return unless value
+      option_to_value(serializer, value).call(value)
+    end
+
     private
 
     def _serialize
-      __serializable_attributes.each_with_object(HashWithIndifferentAccess.new) do |setup, hash|
+      __serializable_attributes.each_with_object({}) do |setup, hash|
         if setup[:key] === false
           hash.merge!(value_or_default(setup))
         else
@@ -64,7 +69,7 @@ module EasySerializer
       return false unless EasySerializer.perform_caching
       cache = __cache
       return false unless cache
-      Cacher.root_call(self, cache, object) { _serialize }
+      Cacher.root_call(self, cache, object) { _serialize }.output
     end
 
     def __cache
@@ -76,45 +81,50 @@ module EasySerializer
     end
 
     def value_or_default(setup)
-      value = attr_serializer(setup)
-      if value.nil? && setup[:default]
-        return option_to_value(setup[:default], object)
-      end
-      value
+      Attribute.call(self, setup)
     end
 
-    def attr_serializer(setup)
-      value = cache_or_attribute(setup)
-      return value unless serializer = setup[:serializer]
-      if setup[:collection]
-        Array.wrap(value).map { |o| cache_or_serialize(serializer, o, setup) }
-      else
-        cache_or_serialize(serializer, value, setup)
-      end
-    end
+    # def value_or_default(setup)
+    #   value = attr_serializer(setup)
+    #   if value.nil? && setup[:default]
+    #     return option_to_value(setup[:default], object)
+    #   end
+    #   value
+    # end
+    #
+    # def attr_serializer(setup)
+    #   value = cache_or_attribute(setup)
+    #   return value if value.respond_to?(:fetch) || value.respond_to?(:each)
+    #   return value unless serializer = setup[:serializer]
+    #   if setup[:collection]
+    #     Array.wrap(value).map { |o| cache_or_serialize(serializer, o, setup) }
+    #   else
+    #     cache_or_serialize(serializer, value, setup)
+    #   end
+    # end
+    #
+    # def cache_or_attribute(setup)
+    #   execute = setup[:block] || proc { |o| o.send(setup[:name]) }
+    #   if EasySerializer.perform_caching && setup[:cache]
+    #     Cacher.call(self, setup, nil, &execute)
+    #   else
+    #     if object.respond_to?(:each)
+    #       object.map { |o| instance_exec o, &execute }
+    #     else
+    #       instance_exec object, &execute
+    #     end
+    #   end
+    # end
+    #
+    # def cache_or_serialize(serializer, value, opts)
+    #   return unless value
+    #   if EasySerializer.perform_caching && opts[:cache]
+    #     Cacher.call(self, opts, value)
+    #   else
+    #     send_to_serializer(serializer, value)
+    #   end
+    # end
 
-    def cache_or_attribute(setup)
-      execute = setup[:block] || proc { |o| o.send(setup[:name]) }
-      if EasySerializer.perform_caching && setup[:cache]
-        Cacher.call(self, setup, nil, &execute)
-      else
-        instance_exec object, &execute
-      end
-    end
 
-    def cache_or_serialize(serializer, value, opts)
-      return unless value
-      if EasySerializer.perform_caching && opts[:cache]
-        Cacher.call(self, opts, value)
-      else
-        send_to_serializer(serializer, value)
-      end
-    end
-
-
-    def send_to_serializer(serializer, value)
-      return unless value
-      option_to_value(serializer, value).call(value)
-    end
   end
 end

data/lib/easy_serializer/cacher.rb

@@ -1,4 +1,5 @@
 module EasySerializer
+  CacheOutput = Struct.new(:output)
   Cacher = Struct.new(:serializer) do
     include Helpers
 
@@ -29,14 +30,14 @@ module EasySerializer
       @value ||= serializer.instance_exec object, &block
     end
 
-
-    def key
+    def key(_value = nil)
+      _value ||= value
       @key ||= if options[:cache_key]
-                 option_to_value(options[:cache_key], value, serializer)
+                 option_to_value(options[:cache_key], _value, serializer)
                elsif options[:serializer] || options[:root_call]
-                 [value, 'EasySerialized'].flatten
+                 [_value, 'EasySerialized'].flatten
                else
-                 [value, options[:name], 'EasySerialized'].flatten
+                 [_value, options[:name], 'EasySerialized'].flatten
                end
     end
 
@@ -48,13 +49,32 @@ module EasySerializer
       end || {}
     end
 
-    def execute
-      to_execute = if options[:serializer]
-        proc { serializer.send_to_serializer(options[:serializer], value) }
-      elsif !options[:serializer]
+    def _block_to_execute(_value = nil)
+      _value ||= value
+      if options[:serializer]
+        proc { serializer.send_to_serializer(options[:serializer], _value) }
+      else
         proc { serializer.instance_exec object, &block }
       end
-      EasySerializer.cache.fetch(key, options_for_cache, &to_execute)
+    end
+
+    def fetch(_key = nil, _value = nil)
+      _key ||= key
+      _value ||= value
+      EasySerializer.cache.fetch(_key, options_for_cache, &_block_to_execute(_value))
+    end
+
+    def wrap(elem)
+      CacheOutput.new(elem)
+    end
+
+    def execute
+      elem = if options[:collection]
+        Array.wrap(value).map{ |o| fetch(key(o), o) }
+      else
+        fetch
+      end
+      wrap(elem)
     end
   end
 end

data/lib/easy_serializer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_serializer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Artur Pañach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - bin/setup
 - easy_serializer.gemspec
 - lib/easy_serializer.rb
+- lib/easy_serializer/attribute.rb
 - lib/easy_serializer/base.rb
 - lib/easy_serializer/cacher.rb
 - lib/easy_serializer/helpers.rb