valued 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8e5286c9765c79c047c59ba71ce0f0b1c44b4538753a1fecba2b828346c26a
-  data.tar.gz: '08c55bdf4bbec029597cd977e446118fe2835b3cb18b5ddf8060090c31467673'
+  metadata.gz: f51821642a08c2513844a7c47456c28b6b7a547796574178b8da0c109ab82712
+  data.tar.gz: f54ccf4641b836351d2ee0d48b98f91284718786cd070596cb75768f43b552e2
 SHA512:
-  metadata.gz: a35b66426e61b88001ffdee21a955504defaf75d782cc6d88de6c6ba80dbfa5cb58c41455dd43d44a90154342df81824487b3e85eea67f032527b60b287943a1
-  data.tar.gz: 15accace9109e4ececde5aa644fa1b02e26c8b47d9c4485df3a34e3e0c6258219ae9712556dafc64c3b6d61164574a144a0e83cc9c6bb6bac4f4fd1b6aa8d12b
+  metadata.gz: 40d747b3afeaf897065822bf5346657405eaffe250147a8f2ae7ef24cbf1ad8fa172fcecc34b1d5af9d84fb8b8db27003aff43b43f37325bb0df35be42f226c0
+  data.tar.gz: 9d33834008135bfb88116bfa7d090613993a8f8645b715487a124bd61a13df974a82017616566e481df3727227e89b7d4c7f0d812f5dfbe49c81d314800447ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    valued (0.1.3)
+    valued (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/valued.rb

@@ -2,8 +2,14 @@ require 'valued/version'
 
 module Valued
   module ClassMethods
-    def attributes(*attributes)
-      attributes.each do |attr|
+    def self.normalized_attributes(attributes)
+      attributes.each_with_object(attributes) do |attr, result|
+        result << attr.to_s.chomp('?').to_sym if attr.to_s.end_with?('?')
+      end
+    end
+
+    def self.define_method(attr, klass)
+      klass.class_eval do
         if attr.to_s.end_with?('?')
           define_method(attr) do
             instance_variable_get("@#{attr.to_s.chomp('?')}")
@@ -12,7 +18,14 @@ module Valued
           attr_reader attr
         end
       end
-      define_method('_attributes') { attributes }
+    end
+
+    def attributes(*attributes)
+      attributes.each { |attr| Valued::ClassMethods.define_method(attr, self) }
+      define_method('_attributes') do
+        Valued::ClassMethods.normalized_attributes(attributes)
+      end
+      private :_attributes
     end
   end
 

data/lib/valued/mutable.rb

@@ -0,0 +1,92 @@
+module Valued
+  module Mutable
+    module ClassMethods
+      def self.normalized_attributes(attributes)
+        attributes.each_with_object(attributes) do |attr, result|
+          result << attr.to_s.chomp('?').to_sym if attr.to_s.end_with?('?')
+        end
+      end
+
+      def self.define_method(attr, klass)
+        klass.class_eval do
+          if attr.to_s.end_with?('?')
+            define_method(attr) do
+              instance_variable_get("@#{attr.to_s.chomp('?')}")
+            end
+            attr_writer "#{attr.to_s.chomp('?')}".to_sym
+          else
+            attr_accessor attr
+          end
+        end
+      end
+
+      def attributes(*attributes)
+        attributes.each do |attr|
+          Valued::Mutable::ClassMethods.define_method(attr, self)
+        end
+        define_method('_attributes') do
+          Valued::Mutable::ClassMethods.normalized_attributes(attributes)
+        end
+        private :_attributes
+      end
+    end
+
+    def self.define(*attrs, &block)
+      klass =
+        Class.new do
+          include Valued::Mutable
+
+          attributes(*attrs)
+        end
+      klass.class_eval(&block) if block_given?
+      klass
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def initialize(attributes = {})
+      _attributes.each do |attribute|
+        if attributes.key?(attribute)
+          instance_variable_set(
+            "@#{attribute.to_s.chomp('?')}",
+            attributes.fetch(attribute)
+          )
+        end
+      end
+    end
+
+    def ==(other)
+      _attributes.all? do |attribute|
+        other.respond_to?(attribute) && send(attribute) == other.send(attribute)
+      end
+    end
+
+    def eql?(other)
+      self.class == other.class && self == other
+    end
+
+    def hash
+      (_attributes.map { |attribute| send(attribute) } + [self.class]).hash
+    end
+
+    def to_h
+      _attributes.each_with_object({}) do |attribute, hash|
+        hash[attribute] = send(attribute)
+      end
+    end
+
+    def to_s
+      inspect
+    end
+
+    def inspect
+      inspected_attributes =
+        _attributes.map do |attribute|
+          "#{attribute}=#{send(attribute).inspect}"
+        end.join(' ')
+      "#<#{self.class} #{inspected_attributes}>"
+    end
+  end
+end

data/lib/valued/version.rb

@@ -1,3 +1,3 @@
 module Valued
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valued
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Mario Mainz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - lib/valued.rb
+- lib/valued/mutable.rb
 - lib/valued/version.rb
 - valued.gemspec
 homepage: https://github.com/mmainz/valued