dry-initializer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a155e17b7e2f0fb9274bf3b6511c64380784ae90
-  data.tar.gz: 967ba81a147fa585ba889b3e97378a3340db312a
+  metadata.gz: 6a766e40753a382067be26c74413c5559153aa5c
+  data.tar.gz: c42a2c954be3312dd1c319afa9cbd8c27f3651b3
 SHA512:
-  metadata.gz: af677c57dc5ca40e7c2d3540cb566e145643daecf2eb564c752f95b3123f74bfed8320edecf9764cb933cd007ee7421728e1965941f122187dcdbd7ff0b830bd
-  data.tar.gz: 7d8d21a38ff8a0cb08a41ee8e3c37665a020a1314bb59851f3c85d3eff58b96196a105c8a32c8f9b46bb8961f5c2681122c578fe6a01d481d270d02a2a956944
+  metadata.gz: c8825deefcd6da06a075b83a17fbcbafcbd0f5d4887330567b71df464979970aae455b7c9c9f4bb40a34abddfa4ffde89553712f1a2b81de249ea24009511e0a
+  data.tar.gz: 31c7ec0f9c6b582967438cf0feb8bb270e5ac6c9028d4e587f4c68a6b5980ba6ccfde630555f9295af90477003cb49988048e2f23a7644a383bf83efcff5be11

data/.travis.yml

@@ -8,9 +8,9 @@ rvm:
   - '2.3.0'
   - rbx-2
   - ruby-head
-  # - jruby-9
-  # - jruby-head
+  - jruby-9
+  - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-    # - rvm: jruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## v0.2.0 2016-04-28
+## v0.2.1 2016-05-19
+
+### Bugs Fixed
+
+* Fix polluting superclass with declarations from subclass (@nepalez)
+
+### Internals
+
+* Make all instances (Builder and Signature) immutable (@nepalez)
+* Decouple mixin from a builder to prevent pollution (@nepalez)
+* Ensure default value block can use private variables (@jeremyf)
+
+[Compare v0.2.0...v0.2.1](https://github.com/dry-rb/dry-initializer/compare/v0.2.0...v0.2.1)
+
+## v0.2.0 2016-05-16
 
 The gem internals has been rewritten heavily to make the gem pluggable and fix
 bugs in "container style". Type constraints were extracted to a plugin

data/Gemfile

@@ -3,8 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in dry-initializer.gemspec
 gemspec
 
-gem "dry-types", git: "https://github.com/dryrb/dry-types", branch: "master"
-
 group :benchmarks do
   gem "benchmark-ips", "~> 2.5"
 

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "0.2.0"
+  gem.version  = "0.2.1"
   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"
@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rake", "~> 10.0"
-  gem.add_development_dependency "dry-types", "~> 0.5.1"
+  gem.add_development_dependency "dry-types", "~> 0.5", "> 0.5.1"
 end

data/lib/dry/initializer/builder.rb

@@ -18,51 +18,46 @@ module Dry::Initializer
     # @param [Dry::Initializer::Plugin]
     #
     def register(plugin)
-      @plugins << plugin
+      plugins = @plugins + [plugin]
+      copy { @plugins = plugins }
     end
 
-    # Defines new agrument and rebuilds the initializer
+    # Defines new agrument and reloads mixin definitions
     #
+    # @param [Module] mixin
     # @param [#to_sym] name
     # @param [Hash<Symbol, Object>] settings
     #
     # @return [self] itself
     #
-    def define(name, settings)
-      update_signature(name, settings)
-      update_parts(name, settings)
+    def reload(mixin, name, settings)
+      signature = @signature.add(name, settings)
+      parts     = @parts + @plugins.map { |p| p.call(name, settings) }.compact
 
-      define_reader(name, settings)
-      reload_initializer
-      reload_callback
+      copy do
+        @signature = signature
+        @parts     = parts
 
-      self
-    end
-
-    # The module with two methods: `#initialize` and `##__after_initialize__`
-    # to be mixed into the target class
-    #
-    # @return [Module]
-    #
-    def mixin
-      @mixin ||= Module.new
+        define_readers(mixin)
+        reload_initializer(mixin)
+        reload_callback(mixin)
+      end
     end
 
     private
 
-    def update_signature(name, settings)
-      @signature.add(name, settings)
+    def copy(&block)
+      dup.tap { |instance| instance.instance_eval(&block) }
     end
 
-    def update_parts(name, settings)
-      @parts += @plugins.map { |klass| klass.call(name, settings) }.compact
-    end
+    def define_readers(mixin)
+      readers = @signature.select { |item| item.settings[:reader] != false }
+                          .map(&:name)
 
-    def define_reader(name, settings)
-      mixin.send :attr_reader, name unless settings[:reader] == false
+      mixin.send :attr_reader, *readers if readers.any?
     end
 
-    def reload_initializer
+    def reload_initializer(mixin)
       strings = @parts.select { |part| String === part }
 
       mixin.class_eval <<-RUBY
@@ -73,7 +68,7 @@ module Dry::Initializer
       RUBY
     end
 
-    def reload_callback
+    def reload_callback(mixin)
       blocks = @parts.select { |part| Proc === part }
 
       mixin.send :define_method, :__after_initialize__ do

data/lib/dry/initializer/mixin.rb

@@ -12,7 +12,8 @@ module Dry::Initializer
     # @return [self] itself
     #
     def param(name, **options)
-      initializer_builder.define(name, option: false, **options)
+      @initializer_builder = initializer_builder
+                             .reload(self, name, option: false, **options)
       self
     end
 
@@ -23,22 +24,19 @@ module Dry::Initializer
     # @return (see #param)
     #
     def option(name, **options)
-      initializer_builder.define(name, option: true, **options)
+      @initializer_builder = initializer_builder
+                             .reload(self, name, option: true, **options)
       self
     end
 
     # @private
     def initializer_builder
-      @initializer_builder ||= begin
-        builder = Builder.new
-        include builder.mixin
-        builder
-      end
+      @initializer_builder ||= Builder.new
     end
 
     # @private
     def inherited(klass)
-      klass.instance_variable_set(:@initializer_builder, initializer_builder)
+      klass.instance_variable_set :@initializer_builder, initializer_builder.dup
     end
   end
 end

data/lib/dry/initializer/signature.rb

@@ -1,12 +1,12 @@
 module Dry::Initializer
-  # Mutable container for chunks of code describing argument signatures.
+  # Immutable container for chunks of code describing argument signatures.
   # Responcible for building the resulting signature for the initializer args.
   class Signature
     include Enumerable
     include Errors
 
     def initialize
-      @list ||= []
+      @list = []
     end
 
     def add(*args)
@@ -15,8 +15,13 @@ module Dry::Initializer
       validates_uniqueness_of signature
       validates_order_of signature
 
-      @list << signature
-      self
+      copy { @list += [signature] }
+    end
+
+    def each
+      (@list.select(&:param?) + @list.reject(&:param?)).each do |item|
+        yield item
+      end
     end
 
     def call
@@ -25,9 +30,9 @@ module Dry::Initializer
 
     private
 
-    def each
-      (@list.select(&:param?) + @list.reject(&:param?)).each do |item|
-        yield item
+    def copy(&block)
+      dup.tap do |instance|
+        instance.instance_eval(&block)
       end
     end
 

data/spec/dry/default_values_spec.rb

@@ -7,6 +7,13 @@ describe "default values" do
       param  :bar, default: proc { :BAR }
       option :baz, default: proc { :BAZ }
       option :qux, default: proc { foo }
+      option :mox, default: proc { default_mox }
+
+      private
+
+      def default_mox
+        :MOX
+      end
     end
   end
 
@@ -36,4 +43,9 @@ describe "default values" do
     expect(subject.baz).to eql 3
     expect(subject.qux).to eql 1
   end
+
+  it "applies default values from private methods" do
+    subject = Test::Foo.new
+    expect(subject.mox).to eql :MOX
+  end
 end

data/spec/dry/object_type_constraint_spec.rb

@@ -8,7 +8,7 @@ describe "object type constraint" do
   end
 
   context "in case of mismatch" do
-    subject { Test::Foo.new 'baz' }
+    subject { Test::Foo.new "baz" }
 
     it "raises TypeError" do
       expect { subject }.to raise_error TypeError
@@ -16,7 +16,7 @@ describe "object type constraint" do
   end
 
   context "in case of match" do
-    subject { Test::Foo.new 'barbar' }
+    subject { Test::Foo.new "barbar" }
 
     it "completes the initialization" do
       expect { subject }.not_to raise_error

data/spec/dry/subclassing_spec.rb

@@ -1,5 +1,5 @@
 describe "subclassing" do
-  subject do
+  before do
     class Test::Foo
       extend Dry::Initializer::Mixin
 
@@ -11,14 +11,25 @@ describe "subclassing" do
       param  :baz
       option :qux
     end
+  end
+
+  let(:instance_of_superclass) do
+    Test::Foo.new 1, bar: 3
+  end
 
+  let(:instance_of_subclass) do
     Test::Bar.new 1, 2, bar: 3, qux: 4
   end
 
   it "preserves definitions made in the superclass" do
-    expect(subject.foo).to eql 1
-    expect(subject.baz).to eql 2
-    expect(subject.bar).to eql 3
-    expect(subject.qux).to eql 4
+    expect(instance_of_subclass.foo).to eql 1
+    expect(instance_of_subclass.baz).to eql 2
+    expect(instance_of_subclass.bar).to eql 3
+    expect(instance_of_subclass.qux).to eql 4
+  end
+
+  it "does not pollute superclass with definitions from subclass" do
+    expect(instance_of_superclass).not_to respond_to :baz
+    expect(instance_of_superclass).not_to respond_to :qux
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,50 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.5.1
-  name: dry-types
-  prerelease: false
 description: 
 email:
 - hashtable@yandex.ru
@@ -154,3 +160,4 @@ test_files:
 - spec/dry/subclassing_spec.rb
 - spec/dry/value_coercion_via_dry_types_spec.rb
 - spec/spec_helper.rb
+has_rdoc: