koine-attributes 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc29763169638e976dbce7e8a8fd34e64fa1661
-  data.tar.gz: 8c92de7bb50fc754426854fdafca7e74a8820105
+  metadata.gz: deb27fe7217e17e870a86be97914caa6b8d06694
+  data.tar.gz: 6b64a5897f5e12eb03d5e62551697733711df8b8
 SHA512:
-  metadata.gz: 9142060ec750bffb182c31d71cde2983bf4507f4867f6dfd72491c165b15ac78d3ef15e7f1b9abb581717d3542a9ca422a378009d3ff224b3952f5da0a16506f
-  data.tar.gz: e37af654cd64875ab1b39b2197de56aff89870da607403df12e7676291b43a5ef1c4cafb53d8fb643bc9d7075f92cacb1bd6167e5c4b48e1084cc8e7283c15a2
+  metadata.gz: 38fec92fd56ebd54e19cccfc2ed7c640b20f4d453f23ef25fed90c8ed63b168ba43548fe98e7edf3d26dd6e6f262f8c1ba0bfda07a6b538631f7460d0397ed51
+  data.tar.gz: f0f593389f582857f67bec046cb7338a593282e9f2dee18e489c31cf63b5db9193af87d678252771c6f57a6c70a7759d009e4f2ae2eda432bd9ae3b53d467bd7

data/.travis.yml

@@ -4,7 +4,10 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.1
+  - 2.3.5
   - 2.4.0
+  - 2.4.1
+  - 2.4.2
 script:
   - bundle exec rake test:coveralls
 before_install: gem install bundler -v 1.14.6

data/Rakefile

@@ -1,19 +1,18 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 namespace :test do
-
-  desc "run tests and generate invoke coveralls"
+  desc 'run tests and generate invoke coveralls'
   task :coveralls do
     ENV['COVERALLS'] = 'true'
     Rake::Task['test:coverage'].invoke
   end
 
-  desc "run tests and generate code coverage"
+  desc 'run tests and generate code coverage'
   task :coverage do
     ENV['COVERAGE'] = 'true'
     Rake::Task[:spec].invoke

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "koine/attributes"
+require 'bundler/setup'
+require 'koine/attributes'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "koine/attributes"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/koine-attributes.gemspec

@@ -36,4 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'reek'
 end

data/lib/koine/attributes.rb

@@ -1,5 +1,5 @@
+require 'forwardable'
 require 'koine/attributes/version'
-require 'koine/attributes/builder'
 require 'koine/attributes/adapter/base'
 
 # provides the following API
@@ -101,6 +101,7 @@ require 'koine/attributes/adapter/base'
 module Koine
   module Attributes
     autoload :Attributes, 'koine/attributes/attributes'
+    autoload :AttributesFactory, 'koine/attributes/attributes_factory'
 
     module Adapter
       autoload :Boolean, 'koine/attributes/adapter/boolean'
@@ -114,42 +115,44 @@ module Koine
     Error = Class.new(StandardError)
 
     def self.included(base)
+      base.extend(Forwardable)
       base.extend(ClassMethods)
     end
 
     module ClassMethods
       def attributes(options = {}, &block)
-        @builder = Builder::ClassBuilder.new(target: self)
+        @builder = true
+        @_attributes_factory ||= AttributesFactory.new(options)
         class_eval(&block)
 
-        if options[:initializer]
-          initializer_options = options[:initializer]
+        instance_eval do
+          define_method :attributes do
+            @_attributes ||= self.class.instance_variable_get(:@_attributes_factory).create(self)
+          end
 
-          initializer_options = {} unless initializer_options.is_a?(Hash)
-
-          @builder.build_constructor(initializer_options)
-        else
-          @builder.build_lazy_attributes
+          define_method(:initialize) { |*args| attributes.initialize_values(*args) }
         end
 
+        @_attributes_factory.freeze
+
         @builder = nil
       end
 
-      def attribute(name, adapter, lambda_constructor = nil, &block)
+      def attribute(name, adapter, lambda_arg = nil, &block)
         unless @builder
           raise Error, 'You must call .attribute inside the .attributes block'
         end
 
-        adapter = coerce_adapter(adapter, lambda_constructor, &block)
-        @builder.build(name, adapter)
-      end
+        block = lambda_arg || block
+        instance_variable_get(:@_attributes_factory).add_attribute(name, adapter, &block)
 
-      private def coerce_adapter(adapter, lambda_constructor, &block)
-        return adapter unless adapter.instance_of?(::Symbol)
-        adapter = const_get("Koine::Attributes::Adapter::#{adapter.to_s.capitalize}").new
-        lambda_constructor.call(adapter) if lambda_constructor
-        yield(adapter) if block
-        adapter
+        instance_eval do
+          def_delegators :attributes, name, "#{name}=", "with_#{name}"
+
+          define_method :== do |other|
+            attributes == other.attributes
+          end
+        end
       end
     end
   end

data/lib/koine/attributes/adapter/float.rb

@@ -9,4 +9,3 @@ module Koine
     end
   end
 end
-

data/lib/koine/attributes/attributes.rb

@@ -1,17 +1,120 @@
 module Koine
   module Attributes
     class Attributes
-      def initialize(object, attributes:)
+      def initialize(object, adapters:, options: {})
         @object = object
-        @attributes = attributes
+        @adapters = adapters
+        @values = {}
+        @initializer = { strict: true, freeze: false, initialize: !options[:initializer].nil? }
+
+        if options[:initializer].is_a?(Hash)
+          @initializer = @initializer.merge(options[:initializer])
+        end
+      end
+
+      def initialize_values(values = {})
+        if !@initializer[:initialize] && !values.empty?
+          raise ArgumentError, "wrong number of arguments (given #{values.length}, expected 0)"
+        end
+
+        return unless @initializer[:initialize]
+        set_values(values) && @initializer[:freeze] && freeze
+      end
+
+      def set_values(values)
+        invalid_attributes = []
+
+        if @initializer[:strict]
+          attributes = values.keys.map(&:to_sym)
+          invalid_attributes = attributes - valid_attributes
+        end
+
+        unless invalid_attributes.empty?
+          raise ArgumentError, "Invalid attributes (#{invalid_attributes.join(', ')})"
+        end
+
+        values.each do |attribute, value|
+          set(attribute, value) if has_attribute?(attribute)
+        end
+      end
+
+      def set(attribute, value)
+        @values[attribute.to_sym] = adapter_for(attribute).coerce(value)
+      end
+
+      def with_attribute(attribute, value)
+        new_attributes = to_h.merge(attribute => value)
+        @object.class.new(new_attributes)
+      end
+
+      def get(attribute)
+        @values[attribute.to_sym] || adapter_for(attribute).default_value
+      end
+
+      def ==(other)
+        other.to_h == to_h
       end
 
       def to_h
-        {}.tap do |hash|
-          @attributes.each do |name|
-            hash[name.to_sym] = @object.send(name)
-          end
+        valid_attributes.map do |name|
+          [name.to_sym, @object.send(name)]
+        end.to_h
+      end
+
+      def respond_to?(method, _include_private = nil)
+        method = method.to_s
+
+        # getter
+        return true if has_attribute?(method)
+
+        # {attribute_name}=value
+        matches = method.match(/^(.*)=$/)
+        return has_attribute?(matches[1]) if matches
+
+        # with_{attribute}(value)
+        matches = method.match(/^with_(.*)$/)
+        return has_attribute?(matches[1]) if matches
+
+        false
+      end
+
+      def method_missing(method_name, *args)
+        unless respond_to?(method_name)
+          raise NoMethodError, "Undefined method #{method_name} for attributed object #{@object}"
+        end
+
+        method_name = method_name.to_s
+
+        if method_name.to_s =~ /=$/
+          attribute = method_name.to_s.delete('=')
+          return set(attribute, *args)
         end
+
+        matches = method_name.match(/^with_(.*)$/)
+        return with_attribute(matches[1], *args) if matches
+
+        get(method_name)
+      end
+
+      private
+
+      def valid_attributes
+        @adapters.keys
+      end
+
+      def has_attribute?(attribute)
+        @adapters.key?(attribute.to_sym)
+      end
+
+      def adapter_for(attribute)
+        @adapters.fetch(attribute.to_sym)
+      end
+
+      def freeze
+        @object.freeze
+        @adapters.freeze
+        @values.freeze
+        super
       end
     end
   end

data/lib/koine/attributes/attributes_factory.rb

@@ -0,0 +1,31 @@
+module Koine
+  module Attributes
+    class AttributesFactory
+      def initialize(options = {})
+        @adapters = {}
+        @options = options
+      end
+
+      def create(target_object)
+        Attributes.new(target_object, adapters: @adapters, options: @options)
+      end
+
+      def add_attribute(name, adapter, &block)
+        adapter = coerce_adapter(adapter)
+        yield(adapter) if block
+        @adapters[name.to_sym] = adapter.freeze
+      end
+
+      def coerce_adapter(adapter)
+        return adapter unless adapter.instance_of?(::Symbol)
+        Object.const_get("Koine::Attributes::Adapter::#{adapter.to_s.capitalize}").new
+      end
+
+      def freeze
+        super
+        @adapters.freeze
+        @options.freeze
+      end
+    end
+  end
+end

data/lib/koine/attributes/version.rb

@@ -1,5 +1,5 @@
 module Koine
   module Attributes
-    VERSION = "0.1.4"
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koine-attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !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'
+- !ruby/object:Gem::Dependency
+  name: reek
+  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: Stronger getter and setters for your ruby classes
 email:
 - marcelo.jacobus@xing.com
@@ -107,7 +135,7 @@ files:
 - lib/koine/attributes/adapter/string.rb
 - lib/koine/attributes/adapter/time.rb
 - lib/koine/attributes/attributes.rb
-- lib/koine/attributes/builder.rb
+- lib/koine/attributes/attributes_factory.rb
 - lib/koine/attributes/hash_helper.rb
 - lib/koine/attributes/version.rb
 homepage: https://github.com/mjacobus/koine-attributes
@@ -131,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Stronger setters and getters

data/lib/koine/attributes/builder.rb

@@ -1,167 +0,0 @@
-require 'koine/attributes/hash_helper'
-
-module Koine
-  module Attributes
-    module Builder
-      class ClassBuilder
-        attr_reader :attributes
-        attr_reader :target
-
-        def initialize(target:)
-          @target = target
-          @attributes = []
-          @getter = GetterBuilder.new(attributes: attributes, target: target)
-          @setter = SetterBuilder.new(attributes: attributes, target: target)
-          @constructor = ConstructorBuilder.new(attributes: attributes, target: target)
-          @lazy_attributes = LazyAttributesBuilder.new(attributes: attributes, target: target)
-        end
-
-        def build(name, driver)
-          attributes.push(name.to_sym)
-          @getter.build(name, driver)
-          @setter.build(name, driver)
-        end
-
-        def build_constructor(strict: true, freeze: false)
-          @constructor.build(strict: strict, freeze: freeze)
-        end
-
-        def build_lazy_attributes
-          @lazy_attributes.build
-        end
-      end
-
-      class BaseBuilder
-        attr_reader :attributes, :target
-
-        def initialize(attributes:, target:)
-          @attributes = attributes
-          @target = target
-        end
-      end
-
-      class GetterBuilder < BaseBuilder
-        def build(name, driver)
-          target.class_eval do
-            define_method(name) do
-              instance_variable_get("@#{name}") || driver.default_value
-            end
-          end
-        end
-      end
-
-      class SetterBuilder < BaseBuilder
-        def build(name, driver)
-          setter = "#{name}="
-
-          target.class_eval do
-            define_method(setter) do |*args|
-              instance_variable_set("@#{name}", driver.coerce(*args))
-            end
-          end
-        end
-      end
-
-      class LazyAttributesBuilder < BaseBuilder
-        def build
-          valid_attributes = attributes
-
-          target.class_eval do
-            define_method :attributes do
-              @_koine_attributes ||= Koine::Attributes::Attributes.new(self, attributes: valid_attributes)
-            end
-          end
-        end
-      end
-
-      class ConstructorBuilder < BaseBuilder
-        def build(strict: true, freeze: false)
-          valid_attributes = attributes
-
-          target.class_eval do
-            define_method :initialize do |args = {}|
-              @_koine_attributes ||= Koine::Attributes::Attributes.new(self, attributes: valid_attributes)
-              initialize_attributes(args)
-            end
-
-            def attributes
-              @_koine_attributes
-            end
-
-            protected
-
-            define_method(:initialize_attributes) do |constructor_args|
-              invalid_attributes = []
-              constructor_args = HashHelper.new.symbolize_keys(constructor_args)
-
-              constructor_args.each do |name, value|
-                if valid_attributes.include?(name)
-                  setter = "#{name}=".to_sym
-                  send(setter, value)
-                  next
-                end
-
-                next unless strict
-                invalid_attributes << name
-              end
-
-              unless invalid_attributes.empty?
-                attributes = invalid_attributes.join(', ')
-                raise ArgumentError, "Invalid attributes (#{attributes})"
-              end
-
-              self.freeze if freeze
-            end
-          end
-
-          if strict
-            make_setters_private
-            create_with_methods
-            create_comparator
-          end
-        end
-
-        protected
-
-        def make_setters_private
-          attrs = attributes
-
-          target.instance_eval do
-            attrs.each do |attr|
-              private "#{attr}="
-            end
-          end
-        end
-
-        def create_with_methods
-          attributes.each do |attr|
-            create_with_method(attr)
-          end
-        end
-
-        def create_with_method(attr)
-          target.class_eval do
-            define_method "with_#{attr}" do |*args|
-              dup.tap do |new_object|
-                new_object.send("#{attr}=", *args)
-                new_object.freeze
-              end
-            end
-          end
-        end
-
-        def create_comparator
-          attrs = attributes
-
-          target.class_eval do
-            define_method :== do |that|
-              a = attrs.map { |attr| send(attr) }
-              b = attrs.map { |attr| that.send(attr) }
-              a == b
-            end
-          end
-        end
-      end
-    end
-  end
-end