attire 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e1fc1f22a2213695656d10b09d2de54e340910
-  data.tar.gz: 0e10d06cf3402de661391eb894c5127f6a9f56fe
+  metadata.gz: a422961944b405505f20ccd99b7cf098378f18bf
+  data.tar.gz: 84b4261dca389bb26a7b52ad9f0981c2425dfafd
 SHA512:
-  metadata.gz: 8878fced254c26d7f4520bb99547d88c96b5355b79200b8e3ace0c47e03c3c1e26c64b4ecfc435184c209138ffecb1f11c38876f249f33417a03abce178f7def
-  data.tar.gz: 76646d629df750287941eaad2e57a3884f236be29a0c77bc66eb7bd0bcc08730def009c0dbccefb66b9c0e32350cab641c07d176ee7b7e294b276f93dd427421
+  metadata.gz: 22c26d505363455eafd750f6c385201d1eab0133f9b178f3b98c79fe31d504f8b2aa23d5aff4ceb512c8e3f8ba3596670dc6a3f2f4b6f4aa658a9a21cd0e5edc
+  data.tar.gz: 10ab969e34aff9b34188334d70d1dd8976fcb25ed5ea7e21aa0a437f139b0a70826dcdb14333b99046314c2afd60c456a0a16b0f16ba01abc8eb555ff9fff9e8

data/lib/attire.rb

@@ -10,7 +10,7 @@ module Attire
   end
 
   def attr_init(*args, &block)
-    AttrInit.apply(self, args, block)
+    include AttrInit.new(args, block)
   end
 
   def attr_method(verb, *args, &block)

data/lib/attire/attr_init.rb

@@ -1,37 +1,23 @@
+require 'attire/attr_init/arguments_checker'
 require 'attire/attr_init/arguments'
-require 'attire/attr_init/initializer'
+require 'attire/attr_init/values_matcher'
+require 'attire/attr_init/instance_methods'
 
 module Attire
   module AttrInit
-    class << self
-      def apply(klass, args, after_initialize)
-        arguments = Arguments.new(args)
-        initializer = Initializer.new(arguments, after_initialize)
-        define_initializer(klass, initializer)
-        define_getters(klass, arguments)
-      end
-
-      private
-
-      def define_initializer(klass, initializer)
-        klass.send(:define_method, :initialize) do |*values, &value_block|
-          initializer.instance_initialize(self, values, value_block)
-        end
-      end
-
-      def define_getters(klass, arguments)
-        names = arguments.getter_names
-        names.each { |n| define_getter(klass, n, arguments.defaults[n]) }
-        klass.send(:private, *names)
-      end
+    def self.new(args, after_block)
+      ArgumentsChecker.check(args)
+      arguments = Arguments.new(args)
+      values_matcher = ValuesMatcher.new(arguments)
+      getters, defaults = arguments.getters, arguments.defaults
 
-      def define_getter(klass, name, default)
-        klass.send(:define_method, name) do
-          value = instance_variable_get("@#{name}")
-          return value unless value.nil? && !default.nil?
-          default = default.duplicable? ? default.dup : default
-          instance_variable_set("@#{name}", default)
-        end
+      Module.new do
+        include InstanceMethods
+        define_method(:_arguments) { arguments }
+        define_method(:_after_block) { after_block }
+        define_method(:_values_matcher) { values_matcher }
+        getters.each { |n| define_method(n) { _get_attribute(n, defaults[n]) } }
+        private(*getters)
       end
     end
   end

data/lib/attire/attr_init/arguments.rb

@@ -1,20 +1,18 @@
 require 'attire/core_ext/duplicable'
-require_relative 'arguments_checker'
 
 module Attire
   module AttrInit
     class Arguments
       def initialize(arguments)
-        ArgumentsChecker.check(arguments)
         @block = last_argument_with_prefix(arguments, '&')
         @splat = last_argument_with_prefix(arguments, '*')
         @names, @defaults = [], {}
         arguments.each { |arg| extract_argument(arg) }
         @arity_range = (min_arity..max_arity)
-        @getter_names = (names.flatten + [splat, block]).compact
+        @getters = (names.flatten + [splat, block]).compact
       end
 
-      attr_reader :names, :splat, :block, :defaults, :arity_range, :getter_names
+      attr_reader :names, :splat, :block, :defaults, :arity_range, :getters
 
       private
 

data/lib/attire/attr_init/arguments_checker.rb

@@ -35,8 +35,8 @@ module Attire
       def splat_check
         return unless splat?
         return if i == (@has_block ? 1 : 0)
-        fail ArgumentError, \
-          'Splat arguments must come after required and optional arguments'
+        msg = 'Splat arguments must come after required and optional arguments'
+        fail ArgumentError, msg
       end
 
       def required_after_optional_check

data/lib/attire/attr_init/instance_methods.rb

@@ -0,0 +1,37 @@
+module Attire
+  module AttrInit
+    module InstanceMethods
+      def initialize(*values, &value_block)
+        _arity_check(values)
+        _match(values, value_block).each { |k, v| instance_variable_set("@#{k}", v) }
+        instance_exec(&_after_block) if _after_block
+      end
+
+      private
+
+      def _arity_check(values)
+        return if _arity_range.include?(values.length)
+        msg = "wrong number of arguments (#{values.length} for #{_arity_range})"
+        fail ArgumentError, msg
+      end
+
+      def _get_attribute(name, default)
+        value = instance_variable_get("@#{name}")
+        return value unless value.nil? && !default.nil?
+        instance_variable_set("@#{name}", _duped_default(default))
+      end
+
+      def _duped_default(default)
+        default.duplicable? ? default.dup : default
+      end
+
+      def _match(*args)
+        _values_matcher.match(*args)
+      end
+
+      def _arity_range
+        _arguments.arity_range
+      end
+    end
+  end
+end

data/lib/attire/core_ext/duplicable.rb

@@ -1,32 +1,48 @@
 class Object
-  def duplicable?; true end
+  def duplicable?
+    true
+  end
 end
 
 class NilClass
-  def duplicable?; false end
+  def duplicable?
+    false
+  end
 end
 
 class FalseClass
-  def duplicable?; false end
+  def duplicable?
+    false
+  end
 end
 
 class TrueClass
-  def duplicable?; false end
+  def duplicable?
+    false
+  end
 end
 
 class Symbol
-  def duplicable?; false end
+  def duplicable?
+    false
+  end
 end
 
 class Numeric
-  def duplicable?; false end
+  def duplicable?
+    false
+  end
 end
 
 require 'bigdecimal'
 class BigDecimal
-  def duplicable?; true end
+  def duplicable?
+    true
+  end
 end
 
 class Method
-  def duplicable?; false end
-end
+  def duplicable?
+    false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attire
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Max White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,7 +42,7 @@ files:
 - lib/attire/attr_init.rb
 - lib/attire/attr_init/arguments.rb
 - lib/attire/attr_init/arguments_checker.rb
-- lib/attire/attr_init/initializer.rb
+- lib/attire/attr_init/instance_methods.rb
 - lib/attire/attr_init/values_matcher.rb
 - lib/attire/core_ext/duplicable.rb
 homepage: https://github.com/mushishi78/attire

data/lib/attire/attr_init/initializer.rb

@@ -1,30 +0,0 @@
-require_relative 'values_matcher'
-
-module Attire
-  module AttrInit
-    class Initializer
-      def initialize(arguments, after_initialize, opts = {})
-        @values_matcher = opts[:values_matcher] || ValuesMatcher.new(arguments)
-        @arity_range = arguments.arity_range
-        @after_initialize = after_initialize
-      end
-
-      def instance_initialize(instance, values, value_block)
-        arity_check(values)
-        values_matcher.match(values, value_block).each do |k, v|
-          instance.instance_variable_set("@#{k}", v)
-        end
-        instance.instance_exec(&after_initialize) if after_initialize
-      end
-
-      private
-
-      attr_reader :values_matcher, :arity_range, :after_initialize
-
-      def arity_check(values)
-        return if arity_range.include?(values.length)
-        fail ArgumentError, "wrong number of arguments (#{values.length} for #{arity_range})"
-      end
-    end
-  end
-end