structure 1.2.1 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b0dd37534ddbab651d055ac20449409d4d2a26f943b5ece647eafe56d0be1a
-  data.tar.gz: 9b41302fd50f1d031a55f46fb656e1c2985f3a6ca39b48997992de2a9355ad44
+  metadata.gz: deb97f3f6e161a8adad686e3245878eddfada43c12be7cce3b567c8a53e5616a
+  data.tar.gz: 7eaac7c7ff94778b2df81ebff8473a52cc17582d885713c031fe04ecf8cf3053
 SHA512:
-  metadata.gz: 1a85161835d1cc3e87ae05dcb5d2ada4647a360a4df5260f6adc5679db9e1d1b397924e6c6e2933aed87a27dc154d5049178abbbb8e0de1393b6965fa8b8ed02
-  data.tar.gz: 20e3a9416b98321020959cc8f3522d6c07843a78df69428a87291d1f60eb1d2aab2ac9d8bf51ecd0878b1ba69d1aea72465f6cec0126644b3779633a10d2b5d3
+  metadata.gz: a859a498b3c11a6687b190de2985a176a1aaf9a803ce45dca5e016a11731f315dfacac1054521671409cf44206228d81582214316b1135e17c819c8ed36f5af1
+  data.tar.gz: d13ea6ab654295856d7086eaccfbf109b2bd6734761484eb8b2f3049cb17b4a1697e8afddc25eb2ef317118581c746b4203c05c74d947b405f4d53e4d68c6c1f

data/lib/structure.rb

@@ -1,70 +1,137 @@
 # frozen_string_literal: true
 
-require 'structure/class_methods'
-
+# A tiny library for lazy parsing data with memoized attributes
 module Structure
-  def self.inspect(value)
-    if value.is_a?(::Array)
-      inspection = value.take(3)
-                        .map { |subvalue| inspect(subvalue) }
-                        .join(', ')
-      inspection += '...' if value.size > 3
-
-      "[#{inspection}]"
-    else
-      value.inspect
+  class << self
+    def serialize(value)
+      if value.respond_to?(:attributes)
+        value.attributes
+      elsif value.is_a?(::Array)
+        value.map { |element| serialize(element) }
+      else
+        value
+      end
     end
-  end
 
-  def self.serialize(value)
-    if value.respond_to?(:attributes)
-      value.attributes
-    elsif value.is_a?(::Array)
-      value.map { |subvalue| serialize(subvalue) }
-    else
-      value
+    private
+
+    def included(base)
+      base.extend ClassMethods
     end
   end
 
-  def self.included(base)
-    base.extend ClassMethods
+  def attribute_names
+    self.class.attribute_names
   end
 
-  # Returns a hash of all the attributes with their names as keys and the
-  # values of the attributes as values
   def attributes
     attribute_names.each_with_object({}) do |key, hash|
-      hash[key] = Structure.serialize(send(key))
+      hash[key] = ::Structure.serialize(send(key))
     end
   end
 
-  # Returns an array of attribute names as strings
-  def attribute_names
-    self.class.attribute_names
+  def to_h
+    attributes
   end
 
-  def ==(other)
-    return false unless other.respond_to?(:attributes)
+  def to_s
+    data = attribute_names.map { |key| "#{key}=#{send(key)}" }.join(', ')
+    "#<#{[self.class.name, data].compact.join(' ')}>"
+  end
 
+  def inspect
+    to_s
+  end
+
+  def ==(other)
     attributes == other.attributes
   end
 
-  def inspect
-    name = self.class.name || self.class.to_s.gsub(/[^\w:]/, '')
-    values = attribute_names
-             .map { |key| "#{key}=#{Structure.inspect(send(key))}" }
-             .join(', ')
+  def eql?(other)
+    return false if other.class != self.class
 
-    "#<#{name} #{values}>"
+    self == other
   end
 
-  alias to_h attributes
-  alias eql? ==
-  alias to_s inspect
+  def freeze
+    attribute_names.each { |key| send(key) }
+    super
+  end
 
   private
 
-  def __exclusive(&block)
-    @__mutex.owned? ? block.call : @__mutex.synchronize { block.call }
+  def with_mutex(&block)
+    @mutex.owned? ? block.call : @mutex.synchronize { block.call }
+  end
+
+  # The class interface
+  module ClassMethods
+    attr_reader :attribute_names
+
+    class << self
+      def extended(base)
+        base.instance_variable_set :@attribute_names, []
+        base.send :override_initialize
+      end
+
+      private :extended
+    end
+
+    def attribute(name, &block)
+      name = name.to_s
+
+      if name.end_with?('?')
+        name = name.chop
+        module_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}?
+            #{name}
+          end
+        CODE
+      end
+
+      module_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          with_mutex do
+            break if defined?(@#{name})
+
+            @#{name} = unmemoized_#{name}
+          end
+
+          @#{name}
+        end
+      CODE
+      private define_method "unmemoized_#{name}", block
+      @attribute_names << name
+
+      name.to_sym
+    end
+
+    private
+
+    def override_initialize
+      class_eval do
+        unless method_defined?(:overriding_initialize)
+          define_method :overriding_initialize do |*arguments, &block|
+            @mutex = ::Thread::Mutex.new
+            original_initialize(*arguments, &block)
+          end
+        end
+
+        return if instance_method(:initialize) ==
+                  instance_method(:overriding_initialize)
+
+        alias_method :original_initialize, :initialize
+        alias_method :initialize, :overriding_initialize
+        private :overriding_initialize, :original_initialize
+      end
+    end
+
+    def method_added(name)
+      override_initialize if name == :initialize
+    end
+
+    def inherited(subclass)
+      subclass.instance_variable_set :@attribute_names, attribute_names.dup
+    end
   end
 end

data/lib/structure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Structure
-  VERSION = '1.2.1'
+  VERSION = '2.0.0.beta'
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
-dependencies: []
+date: 2019-08-28 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'
 description: 
 email: 
 executables: []
@@ -17,8 +59,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/structure.rb
-- lib/structure/class_methods.rb
-- lib/structure/double.rb
 - lib/structure/version.rb
 homepage: 
 licenses:
@@ -32,15 +72,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Parse data into value objects
+summary: Lazy parse data into memoized attributes
 test_files: []

data/lib/structure/class_methods.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Structure
-  module ClassMethods
-    # Returns an array of attribute names as strings
-    attr_reader :attribute_names
-
-    def self.extended(base)
-      base.instance_variable_set :@attribute_names, []
-      base.send :__overwrite_initialize
-    end
-
-    def attribute(name, &block)
-      name = name.to_s
-
-      if name.end_with?('?')
-        name = name.chop
-        module_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{name}?
-            #{name}
-          end
-        CODE
-      end
-
-      module_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{name}
-          __exclusive {
-            break if @__table.key?("#{name}")
-
-            @__table["#{name}"] = __get_#{name}
-            @__table["#{name}"].freeze
-          }
-
-          @__table["#{name}"]
-        end
-      CODE
-
-      private define_method "__get_#{name}", block
-
-      @attribute_names << name
-
-      name.to_sym
-    end
-
-    private
-
-    def __overwrite_initialize
-      class_eval do
-        unless method_defined?(:__custom_initialize)
-          define_method :__custom_initialize do |*arguments, &block|
-            @__mutex = ::Thread::Mutex.new
-            @__table = {}
-            __original_initialize(*arguments, &block)
-            freeze
-          end
-        end
-
-        return if instance_method(:initialize) ==
-                  instance_method(:__custom_initialize)
-
-        alias_method :__original_initialize, :initialize
-        alias_method :initialize, :__custom_initialize
-        private :__custom_initialize, :__original_initialize
-      end
-    end
-
-    def method_added(name)
-      __overwrite_initialize if name == :initialize
-    end
-
-    def inherited(subclass)
-      subclass.instance_variable_set :@attribute_names, @attribute_names.dup
-    end
-  end
-end

data/lib/structure/double.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Structure
-  module ClassMethods
-    # Creates a double that mocks a value object built with Structure during a
-    # test
-    #
-    # The double has an alternative constructor that takes a hash to set values.
-    # Otherwise, it shares the public API of the mocked value object.
-    def double
-      klass = Class.new(self)
-
-      (private_instance_methods(false) + protected_instance_methods(false) -
-        [:initialize]).each do |name|
-        klass.send :undef_method, name
-      end
-
-      klass.module_eval do
-        def initialize(values = {})
-          values.each do |key, value|
-            instance_variable_set :"@#{key}", value
-          end
-        end
-
-        attribute_names.each do |name|
-          module_eval <<-CODE, __FILE__, __LINE__ + 1
-            private def __get_#{name}
-              @#{name}
-            end
-          CODE
-        end
-
-        module_eval(&Proc.new) if block_given?
-      end
-
-      class << klass
-        undef_method :double
-      end
-
-      klass
-    end
-  end
-end