attire 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c396ea5af36aa2c91ef57a595a1bd5932960e3
-  data.tar.gz: e344b21c4a14beca79f37b226d6c55dcb97dcd9e
+  metadata.gz: 6534d8adf28c8358c5da8bec3a8b98191335a640
+  data.tar.gz: 6a82d12b2d96b8644de663e072741dc6d41832f6
 SHA512:
-  metadata.gz: b0be6c4e1eeaf27283c92a7b73f8ce949ae5c6ee1134c2cc7ae50e52a52830d75a01a96206ea5ccad19b4dce93e716a82c96f50b91c28d776abf25bec9ae22f9
-  data.tar.gz: b84369c42d537c55b79d2585461e57007ae736dff4fd71926a0ee64db0b7543f05bbc82c26889af9437fe4633dd74919bd64b1c95a7a9e8dc9c94758307efac1
+  metadata.gz: 1c49f34f6c80ab98424ecb603222d5dd0e97e7762e0fc7be6a50ba590eeef4dbf3d1a27f42de6d89152957e873bc0e00aef19e07c37cbd3fd0afed086f26dd03
+  data.tar.gz: 41cb44dddd2db57edda7e5a7fbc720beb65f9175bab7362b22024169a9024669e602c30b0bd3b85837c2ae59eb5f69e9253e0f43d2691e70d5166df8cc6be949

data/README.md

@@ -1,5 +1,6 @@
 # Attire
 
+[![Build Status](https://travis-ci.org/mushishi78/attire.svg?branch=master)](https://travis-ci.org/mushishi78/attire)
 [![Gem Version](https://badge.fury.io/rb/attire.svg)](http://badge.fury.io/rb/attire)
 
 Convenience methods to remove some boiler plate in defining classes. Inspired by [attr_extras](https://github.com/barsoom/attr_extras).
@@ -23,10 +24,10 @@ private
 attr_reader :foo, :bar, :fizz, :pop
 ```
 
-Splat arguments and blocks can also be defined:
+Optional, splat and blocks arguments can also be defined:
 
 ``` ruby
-attr_init :'*args', :'&block'
+attr_init :'opts = {}', :'*args', :'&block'
 ```
 
 If a block is provided, it will be evaluated after initialization:

data/lib/attire/attr_init.rb

@@ -13,6 +13,7 @@ module Attire
     def apply
       type_check
       extract_splat_and_block_names
+      optional_arguments_check
       instance_initialize = initializer.method(:instance_initialize)
 
       klass.send(:define_method, :initialize) do |*values, &value_block|
@@ -27,8 +28,8 @@ module Attire
     attr_reader :klass, :names, :splat_name, :block_name, :after_initialize
 
     def type_check
-      return if names.all? { |n| [Symbol, Hash].include?(n.class) }
-      fail ArgumentError, 'Must be Symbol or Hash.'
+      return if names.all? { |n| [Symbol, String, Hash].include?(n.class) }
+      fail ArgumentError, 'Must be Symbol, String or Hash.'
     end
 
     def extract_splat_and_block_names
@@ -49,7 +50,11 @@ module Attire
     end
 
     def getter_names
-      getter_names = names.map { |arg| arg.respond_to?(:keys) ? arg.keys : arg }
+      getter_names = names.map do |arg|
+        next arg.keys if arg.respond_to?(:keys)
+        next optional_name(arg) if optional?(arg)
+        arg
+      end
       getter_names += [splat_name, block_name]
       getter_names.flatten.compact
     end
@@ -70,5 +75,20 @@ module Attire
       return if names.none? { |n| n.to_s.start_with?('&', '*') }
       fail ArgumentError, 'Splat and Block arguments must be last'
     end
+
+    def optional_arguments_check
+      start = names.find_index { |n| optional?(n) }
+      return unless start
+      return if names[start..-1].all? { |n| n.is_a?(Hash) || optional?(n) }
+      fail ArgumentError, 'Required arguments must come before optional'
+    end
+
+    def optional?(name)
+      name.to_s.include?('=')
+    end
+
+    def optional_name(name)
+      name.to_s.split('=')[0].strip
+    end
   end
 end

data/lib/attire/initializer.rb

@@ -21,7 +21,9 @@ module Attire
 
     def set_ivars
       names.zip(values).each do |name, value|
-        name.is_a?(Symbol) ? set_ivar(name, value) : set_hash(name, value)
+        next set_hash(name, value) if name.is_a?(Hash)
+        next set_optional(name, value) if optional?(name)
+        set_ivar(name, value)
       end
       set_splat
       set_block
@@ -35,6 +37,12 @@ module Attire
       end
     end
 
+    def set_optional(name, value)
+      name, default = name.to_s.split('=').map(&:strip)
+      value = eval(default) if value.nil?
+      set_ivar(name, value)
+    end
+
     def set_splat
       return unless splat_name
       value_splat = values[names.length..values.length] || []
@@ -60,7 +68,10 @@ module Attire
     end
 
     def min_arity
-      names.last.is_a?(Hash) ? names.length - 1 : names.length
+      last_required = names.reverse_each.find_index do |n|
+        !(optional?(n) || n.is_a?(Hash))
+      end
+      last_required ? names.length - last_required : 0
     end
 
     def max_arity
@@ -70,5 +81,9 @@ module Attire
     def arity_range
       @arity_range ||= (min_arity..max_arity)
     end
+
+    def optional?(name)
+      name.to_s.include?('=')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attire
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Max White
@@ -14,20 +14,20 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: 
@@ -51,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Convenience methods to remove some boiler plate in defining classes.