dry-initializer 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5d5685f90f815d5bc7b45fcc0e342bb5d4545a
-  data.tar.gz: d6d8c4c59b72d4f7a9933dfb10e9b15350c16ecc
+  metadata.gz: 6c217f0fe5f51a14d0577ab5b43f9b4b976cd7c9
+  data.tar.gz: a1b2e181c5868340ec17aedce3804687b7b42e23
 SHA512:
-  metadata.gz: 0e40ba0777d78ec4fcb44ced947679cf4b0e5db97e28d774b6c4e1d9edf27c971dee92387f35a2e4501ce5eaf516b4e4e8586268fc8bdcf2dca8cb7132a052ea
-  data.tar.gz: 1dfdc453fbff8f8050c18bd5f13ecf4ec5c3586386ece9198067d793629e08bb0c433e3aaaa1a4f7a080e9edc19f9e14b9034bc8bf9128dd3556eace65329e87
+  metadata.gz: 729f4ba632a30bc9c4b9451e0c9cf1e985aff199ba4e1ddba95d07ee1beb467bb55bc5c374e0a3c0aecb21d9f9eae82e7c39f75a3c1d7aa7db82bef212e68ea6
+  data.tar.gz: 847c31acf6c91f7f28de176396803e2372df7d45482fc4d0df9928f7420af42ce101778f72fac55f17eeb6af518fd9aa0c6b09a2ec2da78a4468054ec0bd5282

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v0.9.0 2016-11-06
+
+### Added
+
+* The method `#initialize` is defined when a class extended the module (@nepalez)
+
+  In previous versions the method was defined only by `param` and `option` calls.
+
+### Breaking Changes
+
+* The initializer accepts any option (but skips unknown) from the very beginning (@nepalez)
+
+### Deleted
+
+* Deprecated methods `tolerant_to_unknown_options` and `intolerant_to_unknown_options` (@nepalez)
+
+### Internal
+
+* Refactor scope (`using`) to support methods renaming and aliasing (@nepalez)
+
+[Compare 0.8.1...v0.9.0](https://github.com/dry-rb/dry-initializer/compare/0.8.1...v0.9.0)
+
 ## v0.8.1 2016-11-05
 
 ### Added
@@ -6,7 +28,7 @@
 
     option :name, Dry::Types['strict.string']
 
-[Compare v0.8.0...v0.8.1](https://github.com/dry-rb/dry-initializer/compare/v0.8.0..v0.8.1)
+[Compare v0.8.0...0.8.1](https://github.com/dry-rb/dry-initializer/compare/v0.8.0..0.8.1)
 
 ## v0.8.0 2016-11-05
 

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "0.8.1"
+  gem.version  = "0.9.0"
   gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   gem.email    = ["hashtable@yandex.ru", "andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/dryrb/dry-initializer"

data/lib/dry/initializer/builder.rb

@@ -76,13 +76,9 @@ module Dry::Initializer
     end
 
     def reload_initializer(mixin)
-      strings   = @parts.select { |part| String === part }
-      signature = [@signature.call, @tolerant].map(&:to_s)
-                                              .reject(&:empty?)
-                                              .join(", ")
       mixin.class_eval <<-RUBY
-        def initialize(#{signature})
-          #{strings.join("\n")}
+        def initialize(#{@signature.call})
+          #{@parts.select { |part| String === part }.join("\n")}
           __after_initialize__
         end
       RUBY

data/lib/dry/initializer/mixin.rb

@@ -14,9 +14,9 @@ module Dry::Initializer
     # @return [self] itself
     #
     def param(name, type = nil, **options)
-      options[:type] = type if type
-      @initializer_builder = \
-        initializer_builder.define(name, option: false, **options)
+      options[:type]   = type if type
+      options[:option] = false
+      @initializer_builder = initializer_builder.define(name, **options)
       initializer_builder.call(self)
     end
 
@@ -27,9 +27,9 @@ module Dry::Initializer
     # @return (see #param)
     #
     def option(name, type = nil, **options)
-      options[:type] = type if type
-      @initializer_builder = \
-        initializer_builder.define(name, option: true, **options)
+      options[:type]   = type if type
+      options[:option] = true
+      @initializer_builder = initializer_builder.define(name, **options)
       initializer_builder.call(self)
     end
 
@@ -54,34 +54,6 @@ module Dry::Initializer
       initializer_builder.call(self)
     end
 
-    # Makes initializer tolerant to unknown options
-    #
-    # @return [self] itself
-    #
-    def tolerant_to_unknown_options
-      warn <<-MESSAGE.gsub(/ +\|/, "")
-        |[DEPRECATION] Helper method `tolerant_to_unknown_options` was deprecated,
-        |and will be removed in v0.9.0.
-        |If any `option` was defined, the initializer becomes tolerant to all the others.
-        |This is necessary to support "special" names in options like `option :end`.
-        |It forbids options only when no one was declared explicitly.
-      MESSAGE
-    end
-
-    # Makes initializer intolerant to unknown options
-    #
-    # @return [self] itself
-    #
-    def intolerant_to_unknown_options
-      warn <<-MESSAGE.gsub(/ +\|/, "")
-        |[DEPRECATION] Helper method `intolerant_to_unknown_options` was deprecated.
-        |and will be removed in v0.9.0.
-        |If any `option` was defined, the initializer becomes tolerant to all the others.
-        |This is necessary to support "special" names in options like `option :end`.
-        |It forbids options only when no one was declared explicitly.
-      MESSAGE
-    end
-
     private
 
     def initializer_builder
@@ -91,5 +63,9 @@ module Dry::Initializer
     def inherited(klass)
       klass.instance_variable_set :@initializer_builder, initializer_builder.dup
     end
+
+    def self.extended(klass)
+      klass.send(:initializer_builder).call(klass)
+    end
   end
 end

data/lib/dry/initializer/plugins/signature.rb

@@ -9,7 +9,7 @@ module Dry::Initializer::Plugins
   #   # => "user = Dry::Initializer::UNDEFINED"
   #
   #   Signature.call(:user, option: true)
-  #   # => "**__options__"
+  #   # => nil
   #
   class Signature < Base
     def param?
@@ -21,9 +21,8 @@ module Dry::Initializer::Plugins
     end
 
     def call
-      return "**__options__" unless param?
-      return name.to_s if required?
-      "#{name} = Dry::Initializer::UNDEFINED"
+      return unless param?
+      required? ? name.to_s : "#{name} = Dry::Initializer::UNDEFINED"
     end
   end
 end

data/lib/dry/initializer/scope.rb

@@ -1,31 +1,20 @@
 module Dry::Initializer
   # Shared scope for several params and options
   class Scope
-    # Defines param with shared settings
-    #
-    # @param  (see Dry::Initializer::Mixin#param)
-    # @option (see Dry::Initializer::Mixin#param)
-    # @return (see Dry::Initializer::Mixin#param)
-    #
-    def param(name, **options)
-      @klass.param name, @options.merge(options)
-    end
-
-    # Defines option with shared settings
-    #
-    # @param  (see Dry::Initializer::Mixin#option)
-    # @option (see Dry::Initializer::Mixin#option)
-    # @return (see Dry::Initializer::Mixin#option)
-    #
-    def option(name, **options)
-      @klass.option name, @options.merge(options)
-    end
-
     private
 
     def initialize(klass, **options)
       @klass   = klass
       @options = options
     end
+
+    def method_missing(name, *args, **options)
+      return super unless respond_to? name
+      @klass.send(name, *args, **@options.merge(options))
+    end
+
+    def respond_to_missing?(name, *)
+      @klass.respond_to? name
+    end
   end
 end

data/lib/dry/initializer/signature.rb

@@ -5,8 +5,8 @@ module Dry::Initializer
     include Enumerable
     include Errors
 
-    def initialize
-      @list = []
+    def initialize(*list)
+      @list = list
     end
 
     def add(*args)
@@ -15,27 +15,19 @@ module Dry::Initializer
       validates_uniqueness_of signature
       validates_order_of signature
 
-      copy { @list += [signature] }
+      self.class.new(*@list, signature)
     end
 
     def each
-      (@list.select(&:param?) + @list.reject(&:param?)).each do |item|
-        yield item
-      end
+      @list.each { |item| yield item }
     end
 
     def call
-      map(&:call).compact.uniq.join(", ")
+      (select(&:param?).map(&:call) + %w(**__options__)).compact.join(", ")
     end
 
     private
 
-    def copy(&block)
-      dup.tap do |instance|
-        instance.instance_eval(&block)
-      end
-    end
-
     def validates_uniqueness_of(signature)
       return unless include? signature
 
@@ -43,8 +35,8 @@ module Dry::Initializer
     end
 
     def validates_order_of(signature)
-      return unless signature.param? && signature.required?
-      return unless any? { |item| item.param? && !item.required? }
+      return unless signature.required? && signature.param?
+      return unless reject(&:required?).any?(&:param?)
 
       fail OrderError.new(signature.name)
     end

data/spec/options_tolerance_spec.rb

@@ -2,19 +2,10 @@ describe "options tolerance" do
   before do
     class Test::Foo
       extend Dry::Initializer::Mixin
-      option :foo
     end
-
-    class Test::Bar
-      extend Dry::Initializer::Mixin
-    end
-  end
-
-  it "allows unknown options when someone defined" do
-    expect { Test::Foo.new foo: :bar, bar: :baz }.not_to raise_error
   end
 
-  it "forbids options when no one defined" do
-    expect { Test::Bar.new bar: :baz }.to raise_error(ArgumentError)
+  it "allows options before any definition" do
+    expect { Test::Foo.new bar: :baz }.not_to raise_error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec