smart_init 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6056d4cf08e55061d4b7cb406fa3d61107d7703e
-  data.tar.gz: ff3853b9c773b1115503641aabd4bd93d46f3382
+SHA256:
+  metadata.gz: 8dee28a188d21cf07e256ca0fd7ef9be6200e7397226b4b4e26b7f995b94acf5
+  data.tar.gz: fef3f5bad20e6cf3df03dd27a69df4aa429d304098b1acc60426a00c0a8eafd0
 SHA512:
-  metadata.gz: fda5e0d95ed0b7282a4ba94ebbcc32ecf61c09e72949424372cd4a355ea92b32da05a27fb5d2a17c272bd9e63240c793e5f5031f97a23e872728fe043c974c73
-  data.tar.gz: ce961616f650be88b47a8e4b0fcc074e91e17c469e8a3722ae265fae8929642e30096e9af21d0cecccd0d0f94a1c710fd6333b9ed0fba369aa5a7b070e660b36
+  metadata.gz: d47fbddd944636439c176a32d5d62871669d5c9ffb505f7b6180e28bc52ac7f91bb9e7699c14378e89b811671ef3626f888ea84916e17ccde3daff96538e1255
+  data.tar.gz: 32751fb0cda8bc3713f57da5368ae8dde9dbf90ab7b95a1671b61eec17ed69de249d58fa116e4127260291bdeb34c62e962a690a9ee2970929bf1a7733376332

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
-  - 2.2.5
-  - 2.3.0
-  - 2.3.1
-  - 2.4.0
+  - 2.4.4
+  - 2.5.3
+  - 2.6.0
 notifications:
   email: false
 

data/README.md

@@ -21,7 +21,7 @@ In your Gemfile
 gem 'smart_init'
 ```
 
-## Keyword arguments API
+## API
 
 You can use it either by extending a module:
 
@@ -29,7 +29,7 @@ You can use it either by extending a module:
 class ApiClient
   extend SmartInit
 
-  initialize_with :network_provider, api_token: "default_token"
+  initialize_with :network_provider, :api_token
 end
 
 ```
@@ -38,7 +38,7 @@ or subclassing:
 
 ```ruby
 class ApiClient < SmartInit::Base
-  initialize_with :network_provider, api_token: "default_token"
+  initialize_with :network_provider, :api_token
 end
 
 ```
@@ -52,7 +52,6 @@ object = ApiClient.new(network_provider: Faraday.new, api_token: 'secret_token')
 
 You can also use `is_callable` method:
 
-
 ```ruby
 class Calculator < SmartInit::Base
   initialize_with :data
@@ -69,10 +68,10 @@ Calculator.call(data: data) => result
 
 ### Default arguments
 
-You can use keyword based, default argument values:
+You can use hash based, default argument values:
 
 ```ruby
-class Added < SmartInit::Base
+class Adder < SmartInit::Base
   initialize_with :num_a, num_b: 2
   is_callable
 
@@ -88,11 +87,11 @@ Adder.call(num_a: 2, num_b: 3) => 5
 
 ## Legacy API
 
-Alternatively you can use standard API without keyword arguments:
+Alternatively you can a legacy API without hash arguments and default values:
 
 ```ruby
 class Calculator < SmartInit::Base
-  initialize_with :data
+  initialize_with_v1 :data
   is_callable
 
   def call
@@ -103,6 +102,3 @@ end
 
 Calculator.call(data) => result
 ```
-
-It does not support default argument values though.
-

data/lib/smart_init/main.rb

@@ -6,61 +6,47 @@ module SmartInit
   end
 
   def initialize_with *attributes
+    required_attrs = attributes.select { |attr| attr.is_a?(Symbol) }
+    default_value_attrs = attributes.select { |attr| attr.is_a?(Hash) }.first || {}
+
     define_method :initialize do |*parameters|
-      if attributes.count != parameters.count
-        raise ArgumentError, "wrong number of arguments (given #{parameters.count}, expected #{attributes.count})"
+      if required_attrs.count > parameters.first.count
+        raise ArgumentError, "wrong number of arguments (given #{parameters.count}, expected at least #{required_attrs.count})"
       end
 
-      attributes.zip(parameters).each do |pair|
-        name = pair[0]
-        value = pair[1]
-        instance_variable_set("@#{name}", value)
+      (required_attrs + default_value_attrs.keys).each do |attribute|
+        value = parameters.first[attribute] || default_value_attrs[attribute]
+        instance_variable_set("@#{attribute}", value)
       end
     end
 
     instance_eval do
       private
 
-      attr_reader *attributes
+      attr_reader *(required_attrs + default_value_attrs.keys)
     end
   end
 
-  def initialize_with_keywords *attributes
-    class_variable_set(:@@_attributes, attributes)
-    @@_attributes = attributes
-
-    required_attrs = attributes.select { |attr| attr.is_a?(Symbol) }
-    default_value_attrs = attributes.select { |attr| attr.is_a?(Hash) }.first || {}
-
-    class_variable_set(:@@_required_attrs, required_attrs)
-    class_variable_set(:@@_default_value_attrs, default_value_attrs)
-    @@_required_attrs = required_attrs
-    @@_default_value_attrs = default_value_attrs
-
-    class_eval <<-METHOD
-      def initialize(#{(@@_required_attrs + @@_default_value_attrs.keys).compact.map { |a| @@_default_value_attrs[a] ? "#{a.to_s}: '#{@@_default_value_attrs.fetch(a)}'" : "#{a}:" }.join(', ')})
-        @@_required_attrs.each do |attribute|
-          instance_variable_set(
-            "@"+ attribute.to_s,
-            eval(attribute.to_s)
-          )
-        end
+  def initialize_with_v1 *attributes
+    define_method :initialize do |*parameters|
+      if attributes.count != parameters.count
+        raise ArgumentError, "wrong number of arguments (given #{parameters.count}, expected #{attributes.count})"
+      end
 
-        @@_default_value_attrs.keys.each do |attribute|
-          instance_variable_set(
-            "@"+ attribute.to_s,
-            eval(attribute.to_s)
-          )
-        end
+      attributes.zip(parameters).each do |pair|
+        name = pair[0]
+        value = pair[1]
+        instance_variable_set("@#{name}", value)
       end
-    METHOD
+    end
 
     instance_eval do
       private
 
-      attr_reader *(required_attrs + default_value_attrs.keys)
+      attr_reader *attributes
     end
   end
+
 end
 
 class SmartInit::Base

data/lib/smart_init/version.rb

@@ -1,3 +1,3 @@
 module SmartInit
-  VERSION = "2.0.3"
+  VERSION = "3.0.0"
 end

data/test/test_keywords_api.rb

@@ -3,7 +3,7 @@ require_relative '../lib/smart_init/main'
 
 class TestKeywords
   extend SmartInit
-  initialize_with_keywords :attribute_1, :attribute_2
+  initialize_with :attribute_1, :attribute_2
   is_callable
 
   def call
@@ -13,7 +13,7 @@ end
 
 class TestKeywordsDefaults
   extend SmartInit
-  initialize_with_keywords :attribute_1, attribute_2: "default_value_2", attribute_3: "default_value_3"
+  initialize_with :attribute_1, attribute_2: "default_value_2", attribute_3: "default_value_3"
   is_callable
 
   def call
@@ -21,6 +21,16 @@ class TestKeywordsDefaults
   end
 end
 
+class TestKeywordsIntegerDefaults
+  extend SmartInit
+  initialize_with :attribute_1, attribute_2: 2
+  is_callable
+
+  def call
+    [attribute_1, attribute_2]
+  end
+end
+
 class KeywordsApiTest < Test::Unit::TestCase
   def test_keywords
     assert_equal TestKeywords.call(attribute_1: "a", attribute_2: "b"), ["a", "b"]
@@ -37,6 +47,10 @@ class KeywordsApiTest < Test::Unit::TestCase
     assert_equal TestKeywordsDefaults.call(attribute_1: "a", attribute_2: "b"), ["a", "b", "default_value_3"]
   end
 
+  def test_integer_defaults
+    assert_equal TestKeywordsIntegerDefaults.call(attribute_1: 1), [1, 2]
+  end
+
   private
 
   def test_object

data/test/{test_standard_api.rb → test_v1_api.rb}

@@ -3,7 +3,7 @@ require_relative '../lib/smart_init/main'
 
 class TestClass
   extend SmartInit
-  initialize_with :attribute_1, :attribute_2
+  initialize_with_v1 :attribute_1, :attribute_2
   is_callable
 
   def call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_init
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,7 +56,7 @@ files:
 - lib/smart_init/version.rb
 - smart_init.gemspec
 - test/test_keywords_api.rb
-- test/test_standard_api.rb
+- test/test_v1_api.rb
 homepage: http://github.com/pawurb/smart_init
 licenses:
 - MIT
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: Remove Ruby initializer boilerplate code