add block to convert attrbute (#1)

* add block to convert attrbute

* Update .gitignore

Author: andrii-novikov

.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 vendor/bundle
+.idea/

README.md

@@ -47,6 +47,7 @@ class Network < ApiStruct::Entity
   client_service NetworkClient
 
   attr_entity :name, :id
+  attr_entity :state, &:to_sym
 
   has_entity :super_admin, as: User
 end

api_struct.gemspec

@@ -5,8 +5,8 @@ require 'api_struct/version'
 Gem::Specification.new do |spec|
   spec.name          = 'api_struct'
   spec.version       = ApiStruct::VERSION
-  spec.authors       = ['bezrukavyi']
-  spec.email         = ['[email protected]']
+  spec.authors       = ['bezrukavyi', 'andy1341']
+  spec.email         = ['[email protected]', '[email protected]']
 
   spec.summary       = 'Api entities'
   spec.description   = 'Api entities'

lib/api_struct/entity.rb

@@ -4,13 +4,15 @@ class Entity < SimpleDelegator
     extend Extensions::ApiClient
 
     class << self
-      attr_accessor :entity_attributes
+      def entity_attributes
+        @entity_attributes ||= []
+      end
 
-      def attr_entity(*attrs)
-        @entity_attributes = attrs
+      def attr_entity(*attrs, &block)
+        entity_attributes.concat attrs
 
-        entity_attributes.each do |attr|
-          define_entity_attribute_getter(attr)
+        attrs.each do |attr|
+          define_entity_attribute_getter(attr, &block)
           define_entity_attribute_setter(attr)
         end
       end
@@ -43,7 +45,7 @@ def convert_to_entity(item, entity_type = self)
 
       def define_entity_attribute_getter(attr)
         define_method attr.to_s do
-          entity[attr]
+          block_given? ? yield(entity[attr]) : entity[attr]
         end
       end
 
@@ -56,7 +58,7 @@ def define_entity_attribute_setter(attr)
 
     attr_reader :entity, :entity_status
 
-    def initialize(entity, status = true)
+    def initialize(entity, entity_status = true)
       raise EntityError, "#{entity} must be Hash" unless entity.is_a?(Hash)
       @entity = Hashie::Mash.new(extract_attributes(entity))
       @entity_status = entity_status
@@ -73,8 +75,8 @@ def failure?
 
     private
 
-    def extract_attributes(entity_attributes)
-      entity_attributes.select { |key, value| self.class.entity_attributes.include?(key.to_sym) }
+    def extract_attributes(attributes)
+      attributes.select { |key, _value| self.class.entity_attributes.include?(key.to_sym) }
     end
   end