structure 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3fb544bc3e97d170691465e39a8d28ea680632c7
-  data.tar.gz: 34683dd3f6c1693e6c8e7c379d0433153a4ed326
+SHA256:
+  metadata.gz: 82ce9608139683b5c96c2b9168b1784d75d22bb4b0ddbb40b2d223858edbb436
+  data.tar.gz: 8efee424104293918c1ba7489278a870ec445cfa88b3e1bd740267950d6580f7
 SHA512:
-  metadata.gz: 2df2844425af4ac85b2b7a011d570fedba08fa5aa60abcfa5e3f07b82c4f7f90a3ee1977838619e9c6b8ec667e69f38ac021fe774b79ecb01f59e591fcf5ce48
-  data.tar.gz: 05aee48f02e8c9a0c6c63324ea81f1b8a6247b9eb8cde7b88ec847420c4e2cee60dbc183133fd0168066a2bfbaa3f1e5cbb81a6fba336114e313bb3a5ee64afc
+  metadata.gz: f89bdd35530daa965b36fd56a92d96e1beff21508080efbb4e3306738a0d77a4141e734a3e55fcf18fb26c34bef5893370f08d2fe33bc913002c7061a972ce8a
+  data.tar.gz: 97490884a508a5920ca3bda6583ace8c47da12178b56ff038afe34bac0e16b10abb5337ad1475cf9847d7d4218b9d56528341ce67fa1eb8162415601add2e25b

data/lib/structure.rb

@@ -1,32 +1,17 @@
-# Structure
-module Structure
-  class << self
-    private
+# frozen_string_literal: true
 
-    def included(base)
-      base.extend(ClassMethods).instance_variable_set(:@attribute_names, [])
-    end
+require 'structure/class_methods'
+require 'structure/utils'
+
+module Structure
+  def self.included(base)
+    base.extend ClassMethods
+    base.__overwrite_initialize__
   end
 
   def attributes
-    attribute_names.reduce({}) do |hash, key|
-      value = send(key)
-      hash.update(
-        key =>
-          if value.respond_to?(:attributes)
-            value.attributes
-          elsif value.is_a?(Array)
-            value.map do |element|
-              if element.respond_to?(:attributes)
-                element.attributes
-              else
-                element
-              end
-            end
-          else
-            value
-          end
-      )
+    attribute_names.each_with_object({}) do |key, hash|
+      hash[key] = Utils.serialize(send(key))
     end
   end
 
@@ -36,24 +21,25 @@ module Structure
 
   def ==(other)
     return false unless other.respond_to?(:attributes)
+
     attributes == other.attributes
   end
 
   def inspect
-    name = self.class.name || self.class.to_s.gsub(/[^\w:]/, "")
+    name = self.class.name || self.class.to_s.gsub(/[^\w:]/, '')
     values =
       attribute_names
       .map do |key|
         value = send(key)
-        if value.is_a?(Array)
-          description = value.take(3).map(&:inspect).join(", ")
-          description += "..." if value.size > 3
+        if value.is_a?(::Array)
+          description = value.take(3).map(&:inspect).join(', ')
+          description += '...' if value.size > 3
           "#{key}=[#{description}]"
         else
           "#{key}=#{value.inspect}"
         end
       end
-      .join(", ")
+      .join(', ')
 
     "#<#{name} #{values}>"
   end
@@ -61,44 +47,4 @@ module Structure
   alias to_h attributes
   alias eql? ==
   alias to_s inspect
-
-  # ClassMethods
-  module ClassMethods
-    attr_reader :attribute_names
-
-    def attribute(name)
-      name = name.to_s
-
-      if name.chomp!("?")
-        module_eval(<<-EOS, __FILE__, __LINE__)
-          def #{name}?
-            #{name}
-          end
-        EOS
-      end
-
-      module_eval(<<-EOS, __FILE__, __LINE__)
-        def #{name}
-          return @#{name} if defined?(@#{name})
-          @#{name} = _#{name}
-          @#{name}.freeze unless @#{name}.is_a?(Structure)
-
-          @#{name}
-        end
-      EOS
-
-      define_method("_#{name}", Proc.new)
-      private "_#{name}"
-
-      @attribute_names << name
-
-      name.to_sym
-    end
-
-    private
-
-    def inherited(subclass)
-      subclass.instance_variable_set(:@attribute_names, @attribute_names.dup)
-    end
-  end
 end

data/lib/structure/class_methods.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Structure
+  module ClassMethods
+    attr_reader :attribute_names
+
+    def self.extended(base)
+      base.instance_variable_set :@attribute_names, []
+    end
+
+    def attribute(name, &block)
+      name = name.to_s
+
+      if name.chomp!('?')
+        module_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}?
+            #{name}
+          end
+        CODE
+      end
+
+      module_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          @__mutex__.synchronize {
+            return @#{name} if defined?(@#{name})
+
+            @#{name} = __#{name}__
+            @#{name}.freeze unless @#{name}.is_a?(Structure)
+
+            @#{name}
+          }
+        end
+      CODE
+
+      define_method "__#{name}__", block
+      private "__#{name}__"
+
+      @attribute_names << name
+
+      name.to_sym
+    end
+
+    def __overwrite_initialize__
+      class_eval do
+        unless method_defined?(:__custom_initialize__)
+          define_method :__custom_initialize__ do |*args|
+            @__mutex__ = ::Thread::Mutex.new
+            __original_initialize__(*args)
+          end
+        end
+
+        return if instance_method(:initialize) ==
+                  instance_method(:__custom_initialize__)
+
+        alias_method :__original_initialize__, :initialize
+        alias_method :initialize, :__custom_initialize__
+      end
+    end
+
+    private
+
+    def method_added(name)
+      return if name != :initialize
+
+      __overwrite_initialize__
+    end
+
+    def inherited(subclass)
+      subclass.instance_variable_set :@attribute_names, @attribute_names.dup
+    end
+  end
+end

data/lib/structure/double.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Structure
-  # ClassMethods
   module ClassMethods
     def double
       klass = Class.new(self)
@@ -9,27 +10,29 @@ module Structure
         protected_instance_methods(false) -
         [:initialize]
       ).each do |name|
-        klass.send(:undef_method, name)
+        klass.send :undef_method, name
       end
 
       klass.module_eval do
         def initialize(data = {})
           data.each do |key, value|
             unless value.is_a?(Structure) ||
-                   (
-                      defined?(RSpec::Mocks::Double) &&
-                      value.is_a?(RSpec::Mocks::Double)
-                    )
+                   (defined?(::RSpec::Mocks::Double) &&
+                    value.is_a?(::RSpec::Mocks::Double))
               value.freeze
             end
 
-            instance_variable_set(:"@#{key}", value)
+            instance_variable_set :"@#{key}", value
           end
         end
 
         attribute_names.each do |name|
-          module_eval "def _#{name}; @#{name}; end"
-          private "_#{name}"
+          module_eval <<-CODE, __FILE__, __LINE__ + 1
+            def __#{name}__
+              @#{name}
+            end
+          CODE
+          private "__#{name}__"
         end
 
         module_eval(&Proc.new) if block_given?

data/lib/structure/utils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Structure
+  module Utils
+    def self.serialize(value)
+      if value.respond_to?(:attributes)
+        value.attributes
+      elsif value.is_a?(::Array)
+        value.map { |subvalue| serialize(subvalue) }
+      else
+        value
+      end
+    end
+  end
+end

data/lib/structure/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Structure
+  VERSION = '1.1.0'
+end

metadata

@@ -1,65 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2019-05-24 00:00:00.000000000 Z
+dependencies: []
 description: 
-email: me@hakanensari.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/structure.rb
+- lib/structure/class_methods.rb
 - lib/structure/double.rb
+- lib/structure/utils.rb
+- lib/structure/version.rb
 homepage: 
 licenses:
 - MIT
@@ -79,8 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse data into value objects