flexserializer 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461eb05eb77be4a74e81b0e144939a080c301f24
-  data.tar.gz: 4fa3445af89e1bfaa78d56c81ace55a037ca0df8
+  metadata.gz: 3749f7978bc0bc289332da7da45d64ad75727c1b
+  data.tar.gz: 40fba01616492f5037fd2adcc64169f284ef357e
 SHA512:
-  metadata.gz: 20b66a1775ec2964337433ba8afc98b4e60eafc6fa53a7cb9e96842337dbf5da39b9386a79ddb3b9793cc992bce70e5557a384861c37c71d67e90fcec0182f50
-  data.tar.gz: 18385c5677004d2ecc3520e748c50117886d92b432ec9711e1f9ffe121b655715d5708c007fe33309faf0ec8618dbcd9cef55e3ea0a192ebef20e46dba19a7f9
+  metadata.gz: 8eebebd61086ccb38f862547533e5588ec9aeaa847d37970e23b219c7d3e7eae071813458d1a552d7b3a9c39ae807644d2f0f1d2ad15880dd208f7f3e666ea44
+  data.tar.gz: 752a6ac3c958b0015c069fae81c272c2c2464ea324a97ad40df47b45407e670b3cf67d16babc6e3bd119af8103b9803e1029085157d6fbe25d6c544a7e229e5f

data/lib/flexserializer/base.rb

@@ -3,12 +3,15 @@ module Flexserializer
     class << self
       attr_accessor :groups, :data_default_attributes
 
+      def inherited(base)
+        base.groups = {}
+      end
+
       def default_attributes(&block)
         self.data_default_attributes = block
       end
 
       def group(*group_names, &block)
-        self.groups ||= {}
         group_names.each do |name_group|
           self.groups[name_group] ||= []
           self.groups[name_group] << block
@@ -16,32 +19,53 @@ module Flexserializer
       end
     end
 
-    attr_reader :group_name
-    
+    attr_reader :group_name, :_attributes_data, :define_options
+
     def initialize(object, options = {})
-      @group_name = options[:group]
-      define_attributes
       super(object, options)
+      @_attributes_data = {}
+      @group_name       = options[:group]
+      @define_options   = options.clone
+      make_all_attributes
     end
 
-    def define_attributes
-      clear_data
-      define_default_attrs
-      define_group_attrs
+    def define_attributes(*attrs)
+      attrs = attrs.first if attrs.first.class == Array
+      attrs.each do |attr|
+        define_attribute(attr)
+      end
     end
 
-    def clear_data
-      self.class._attributes_data = {}
+    def define_attribute(attr, options = {}, &block)
+      key = options.fetch(:key, attr)
+      _attributes_data[key] = Attribute.new(attr, options, block)
+    end
+
+    def make_all_attributes
+      define_default_attrs
+      define_group_attrs
     end
 
     def define_default_attrs
       return unless self.class.data_default_attributes
-      self.class.data_default_attributes.call
+      self.instance_eval &self.class.data_default_attributes
     end
 
     def define_group_attrs
-      return if !self.class.groups or !self.class.groups.keys.include?(group_name)
-      self.class.groups[group_name].each { |block| block.call }
+      self.class.groups.send(:[], group_name)&.each do |block| 
+        self.instance_eval(&block)
+      end
+    end
+
+    #override serializer methods
+
+    def attributes(requested_attrs = nil, reload = false)
+      @attributes = nil if reload
+      @attributes ||= _attributes_data.each_with_object({}) do |(key, attr), hash|
+        next if attr.excluded?(self)
+        next unless requested_attrs.nil? || requested_attrs.include?(key)
+        hash[key] = attr.value(self)
+      end
     end
   end
 end

data/lib/flexserializer/version.rb

@@ -1,3 +1,3 @@
 module Flexserializer
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexserializer
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers