selfies 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 345c53269ed74a93dc3168e643a651c3992e4746
-  data.tar.gz: 3ebc68af81e38e1f6120f63177c36915203cf62e
+  metadata.gz: 542d2ed712992bff31b812fe7f1fce625e603cca
+  data.tar.gz: 731f48a656f0d3817792c5751581555f5cf6d4b4
 SHA512:
-  metadata.gz: 81dafb7921d9ef47ea6d401d79be5245a704c5c124254757127d05b14ead0ba752f5cd3f6bd3f24b702c8e21afb72aab3d7dc55bb3bc38546142e5e87e781a4c
-  data.tar.gz: 38640018338ce5a7bec49fba1cc28f1db500ef186a1f82cbad36416fe68ccd10da668952e89337901af4f15cc35f47efae0d4116f72ce5285b2d72d73bc8b342
+  metadata.gz: de4fc0461686a7f5ea01b802288193c29a1fd5f5ba5eee929661ff062ae6db2456b02a726d5ea1cab9cd6726baa68c7465deea6c530f81c706d86aeae074919e
+  data.tar.gz: 5124a761f0f2760eaca91e593cf764e0a2ec36800aa1218adb0e705b398c1ccb98d90588f1fc16cbd487c7b087e58ae222b63b76270c5adb1711a10df9e62bac

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/selfies.svg)](https://badge.fury.io/rb/selfies) [![Dependency Status](https://gemnasium.com/badges/github.com/mariodarco/selfies.svg)](https://gemnasium.com/github.com/mariodarco/selfies) [![CircleCI](https://circleci.com/gh/mariodarco/selfies/tree/master.svg?style=shield)](https://circleci.com/gh/mariodarco/selfies/tree/master)
+[![Gem Version](https://badge.fury.io/rb/selfies.svg)](https://badge.fury.io/rb/selfies) [![Dependency Status](https://gemnasium.com/badges/github.com/mariodarco/selfies.svg)](https://gemnasium.com/github.com/mariodarco/selfies) [![CircleCI](https://circleci.com/gh/mariodarco/selfies/tree/master.svg?style=shield)](https://circleci.com/gh/mariodarco/selfies/tree/master) [![Maintainability](https://api.codeclimate.com/v1/badges/fe208e3abde2e2937ac7/maintainability)](https://codeclimate.com/github/mariodarco/selfies/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/fe208e3abde2e2937ac7/test_coverage)](https://codeclimate.com/github/mariodarco/selfies/test_coverage)
 
 # Selfies
 **A collection of macros for quicker development**
@@ -250,7 +250,7 @@ end
 - Find a suitable syntax that would allow to 'selfie' an instance method that has arguments;
 
 ***command line:***
-- Write a command that can initialize a whole class, from creating the file to stub the initial setup (idea by Luke Hill)
+- Write a command that can initialize a whole class, from creating the file to stub the initial setup;
 
 ***more?:***
 - If you also often write repetitive bolierplate, and would like some code to get smaller, drop me a line and we might be able to add more macros.

data/lib/selfies/self_init.rb

@@ -9,50 +9,52 @@ module Selfies
         SelfInit.access_variables(class_name, accessor, variable_names)
 
         define_method(:initialize) do |*args|
-          argument_count(variables, variable_names.count, args.count)
+          SelfInit.argument_guard(variables, variable_names.count, args.count)
 
           variables.each_with_index do |variable, index|
-            variable_name, default = decouple(variable)
+            variable_name, default = SelfInit.decouple(variable)
             value = variable_name == :args ? args[index..-1] : args[index]
             instance_variable_set("@#{variable_name}", value || default)
           end
         end
-
-        define_method(:argument_count) do |all_variables, expected, given|
-          unless correct_argument_count?(all_variables, expected, given)
-            raise ArgumentError,
-                  "wrong number of arguments (given #{given}, expected #{expected})"
-          end
-        end
-
-        define_method(:correct_argument_count?) do |all_variables, expected, given|
-          final_variable = all_variables.last
-          correct_argument_count = given == expected
-          if final_variable.is_a? Hash
-            correct_argument_count ||= given == expected - 1
-          elsif final_variable == :args
-            at_least = all_variables[0..all_variables.index(:args)].count
-            correct_argument_count ||= given >= at_least
-          end
-
-          correct_argument_count
-        end
-
-        define_method(:decouple) do |variable|
-          return [variable, nil] unless variable.is_a? Hash
-
-          variable.keys + variable.values
-        end
       end
     end
 
     def self.access_variables(class_name, accessor, variable_names)
       class_name.send(
         (accessor ? :attr_accessor : :attr_reader),
-        *(variable_names)
+        *variable_names
       )
     end
 
+    def self.argument_guard(all_variables, expected, given)
+      unless correct_argument_count?(all_variables, expected, given)
+        raise(
+          ArgumentError,
+          "wrong number of arguments (given #{given}, expected #{expected})"
+        )
+      end
+    end
+
+    def self.correct_argument_count?(all_variables, expected, given)
+      final_variable = all_variables.last
+      correct_argument_count = given == expected
+      if final_variable.is_a? Hash
+        correct_argument_count ||= given == expected - 1
+      elsif final_variable == :args
+        at_least = all_variables[0..all_variables.index(:args)].count
+        correct_argument_count ||= given >= at_least
+      end
+
+      correct_argument_count
+    end
+
+    def self.decouple(variable)
+      return [variable, nil] unless variable.is_a? Hash
+
+      variable.keys + variable.values
+    end
+
     def self.variable_names(variables)
       variables.collect do |variable|
         variable.is_a?(Hash) ? variable.keys.first : variable

data/lib/selfies/version.rb

@@ -1,3 +1,3 @@
 module Selfies
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selfies
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Mario D’Arco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler