selfies 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47550e2d9e6da031803c5ba23ef7d4336f0e3076
-  data.tar.gz: c05c0beae48f5d515d65d41c1fab06752cbcf5fe
+  metadata.gz: d2779a51d2de784eefdf3f45ceea218f7d6fb7cc
+  data.tar.gz: 036c1e49e616d5417bcb13ede00d67ee2881f111
 SHA512:
-  metadata.gz: 26ecd3374676bb10adc4e4c0e2f01dcd5cb1201fcd2212b0f7fa8dc3b48ab9ea753a3371642eb88c5961996a9fab593a82cc64daa1838f94143887e95e0def4b
-  data.tar.gz: c1516a43e5384a7809a99e13d4ced86091034afbd01f52fd5bb2b36bb2faf851e3d8e71c290402db569f1f774130a291340849ced93818686638394b7584f81f
+  metadata.gz: 7ab254cd4b2e08f68f78507a566d3a54bd67ba27f7ffc280881166dd5589310b69ca93fc44d8fbd53c6e4d80f746adde3071ec0b33800eec160468d4fdba5a84
+  data.tar.gz: 01bce53ae70ed2faa87191dc6c58a57331d5131463d3e35efbbba8e51385ea833307d232b16acf0d19252bb9fcb7087130ffb965322aaac312ef6af81c957b6d

data/README.md

@@ -82,6 +82,34 @@ class Search
 end
 ```
 
+It is possible to specify a default for the last argument only:
+
+This code:
+```ruby
+class Search
+  attr_accessor_init :term, :page, limit: 5
+end
+```
+
+Is equivalent to:
+```ruby
+class Search
+  attr_accessor :term, :page, :limit
+
+  def initialize(term, page, limit = 5)
+    @term = term
+    @page = page
+    @limit = limit
+  end
+end
+```
+
+```ruby
+>> search = Search.new('foo', 1)
+>> search.limit
+=> 5
+```
+
 ***selfie***: can be used to automatically create a class method that reference to the instance method of the same class
 
 This code:
@@ -131,7 +159,6 @@ end
 ```
 
 If preferred, more methods can be 'selfied' in one liner:
-
 ```ruby
 class Search
   ...
@@ -176,7 +203,7 @@ You get this:
 ## Next Steps
 
 ***attr_reader_init*** and ***attr_accessor_init:***
-- Implement the possibility to pass defaults;
+- Implement the possibility to pass indefinite number of arguments;
 
 ***selfie:***
 - Find a suitable syntax that would allow to 'selfie' an instance method that has arguments;

data/lib/selfies/self_init.rb

@@ -1,9 +1,10 @@
 module Selfies
   class SelfInit
-    def self.generate(class_name, accessor, *variable_names)
-      return false unless variable_names.any?
+    def self.generate(class_name, accessor, *variables)
+      return false unless variables.any?
 
       class_name.class_eval do
+        variable_names = SelfInit.variable_names(variables)
         if accessor
           attr_accessor *variable_names
         else
@@ -11,19 +12,41 @@ module Selfies
         end
 
         define_method(:initialize) do |*args|
-          SelfInit.argument_check(variable_names.count, args.count)
+          unless correct_argument_count?(variables, variable_names.count, args.count)
+            raise ArgumentError, "wrong number of arguments (given #{args.count}, expected #{variable_names.count})"
+          end
+
+          variables.each_with_index do |variable, index|
+            variable_name, default = decouple(variable)
+            instance_variable_set("@#{variable_name}", args[index] || default)
+          end
+        end
+
+        private_class_method
 
-          variable_names.each_with_index do |variable, index|
-            instance_variable_set("@#{variable}", args[index])
+        define_method(:correct_argument_count?) do |variables, expected, given|
+          correct_argument_count = given == expected
+          if variables.last.is_a? Hash
+            correct_argument_count ||= given == expected - 1
           end
+
+          correct_argument_count
+        end
+
+        define_method(:decouple) do |variable|
+          return [variable, nil] if !variable.is_a? Hash
+
+          variable.keys + variable.values
         end
       end
     end
 
     private_class_method
 
-    def self.argument_check(expected, given)
-      raise ArgumentError, "wrong number of arguments (given #{given}, expected #{expected})" unless given == expected
+    def self.variable_names(variables)
+      variables.collect do |variable|
+        variable.is_a?(Hash) ? variable.keys.first : variable
+      end
     end
   end
 end

data/lib/selfies/version.rb

@@ -1,3 +1,3 @@
 module Selfies
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selfies
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mario D’Arco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler