dry-auto_inject 0.7.0 → 0.9.0

data/lib/dry/auto_inject/strategies/hash.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/auto_inject/method_parameters'
+require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject/method_parameters"
 
 module Dry
   module AutoInject
@@ -24,13 +24,23 @@ module Dry
 
         def define_initialize(klass)
           super_params = MethodParameters.of(klass, :initialize).first
-          super_pass = super_params.empty? ? '' : 'options'
+          super_pass = super_params.empty? ? "" : "options"
+          assignments = dependency_map.names.map do |name|
+            <<~RUBY
+              unless !options.key?(:#{name}) && instance_variable_defined?(:'@#{name}')
+                @#{name} = options[:#{name}]
+              end
+            RUBY
+          end
+          body = assignments.join("\n")
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(options)
-              #{dependency_map.names.map { |name| "@#{name} = options[:#{name}] unless !options.key?(#{name}) && instance_variable_defined?(:'@#{name}')" }.join("\n")}
-              super(#{super_pass})
-            end
+            def initialize(options) # def initialize(options)
+                                    #   unless !options.key?(:dep) && instance_variable_defined?(:@dep)
+              #{body}               #     @dep = options[:dep]
+                                    #   end
+              super(#{super_pass})  #   super(options)
+            end                     # end
           RUBY
         end
       end

data/lib/dry/auto_inject/strategies/kwargs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/auto_inject/method_parameters'
+require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject/method_parameters"
 
 module Dry
   module AutoInject
@@ -14,19 +14,20 @@ module Dry
           class_mod.class_exec(container, dependency_map) do |container, dependency_map|
             map = dependency_map.to_h
 
-            define_method :new do |*args, **kwargs|
+            define_method :new do |*args, **kwargs, &block|
               map.each do |name, identifier|
                 kwargs[name] = container[identifier] unless kwargs.key?(name)
               end
 
-              super(*args, **kwargs)
+              super(*args, **kwargs, &block)
             end
           end
         end
 
         def define_initialize(klass)
           super_parameters = MethodParameters.of(klass, :initialize).each do |ps|
-            # Look upwards past `def foo(*)` methods until we get an explicit list of parameters
+            # Look upwards past `def foo(*)` and `def foo(...)` methods
+            # until we get an explicit list of parameters
             break ps unless ps.pass_through?
           end
 
@@ -44,15 +45,15 @@ module Dry
           slice_kwargs = method(:slice_kwargs)
 
           instance_mod.class_exec do
-            define_method :initialize do |**kwargs|
+            define_method :initialize do |**kwargs, &block|
               assign_dependencies.(kwargs, self)
 
               super_kwargs = slice_kwargs.(kwargs, super_parameters)
 
               if super_kwargs.any?
-                super(**super_kwargs)
+                super(**super_kwargs, &block)
               else
-                super()
+                super(&block)
               end
             end
           end
@@ -63,18 +64,18 @@ module Dry
           slice_kwargs = method(:slice_kwargs)
 
           instance_mod.class_exec do
-            define_method :initialize do |*args, **kwargs|
+            define_method :initialize do |*args, **kwargs, &block|
               assign_dependencies.(kwargs, self)
 
               if super_parameters.splat?
-                super(*args, **kwargs)
+                super(*args, **kwargs, &block)
               else
                 super_kwargs = slice_kwargs.(kwargs, super_parameters)
 
                 if super_kwargs.any?
-                  super(*args, **super_kwargs)
+                  super(*args, **super_kwargs, &block)
                 else
-                  super(*args)
+                  super(*args, &block)
                 end
               end
             end

data/lib/dry/auto_inject/strategies.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry-container'
+require "dry-container"
 
 module Dry
   module AutoInject
@@ -16,6 +16,6 @@ module Dry
   end
 end
 
-require 'dry/auto_inject/strategies/args'
-require 'dry/auto_inject/strategies/hash'
-require 'dry/auto_inject/strategies/kwargs'
+require "dry/auto_inject/strategies/args"
+require "dry/auto_inject/strategies/hash"
+require "dry/auto_inject/strategies/kwargs"

data/lib/dry/auto_inject/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module AutoInject
-    VERSION = '0.7.0'
+    VERSION = "0.9.0"
   end
 end

data/lib/dry/auto_inject.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/builder'
+require "dry/auto_inject/builder"
 
 module Dry
   # Configure an auto-injection module

data/lib/dry-auto_inject.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject'
+require "dry/auto_inject"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -56,47 +56,26 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-description: 
+        version: '0'
+description: Container-agnostic automatic constructor injection
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
-- ".github/ISSUE_TEMPLATE/---bug-report.md"
-- ".github/ISSUE_TEMPLATE/---feature-request.md"
-- ".github/workflows/ci.yml"
-- ".github/workflows/docsite.yml"
-- ".github/workflows/sync_configs.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- docsite/source/basic-usage.html.md
-- docsite/source/how-does-it-work.html.md
-- docsite/source/index.html.md
-- docsite/source/injection-strategies.html.md
 - dry-auto_inject.gemspec
 - lib/dry-auto_inject.rb
 - lib/dry/auto_inject.rb
@@ -110,11 +89,14 @@ files:
 - lib/dry/auto_inject/strategies/hash.rb
 - lib/dry/auto_inject/strategies/kwargs.rb
 - lib/dry/auto_inject/version.rb
-- rakelib/rubocop.rake
-homepage: https://github.com/dry-rb/dry-auto_inject
+homepage: https://dry-rb.org/gems/dry-auto_inject
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-auto_inject/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-auto_inject
+  bug_tracker_uri: https://github.com/dry-rb/dry-auto_inject/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -123,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Container-agnostic automatic constructor injection

data/.codeclimate.yml

@@ -1,12 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-version: "2"
-
-exclude_patterns:
-  - "benchmarks/"
-  - "examples/"
-  - "spec/"
-
-plugins:
-  rubocop:
-    enabled: true

data/.github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md

@@ -1,10 +0,0 @@
----
-name: "⚠️  Please don't ask for support via issues"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

data/.github/ISSUE_TEMPLATE/---bug-report.md

@@ -1,30 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Before you submit this: WE ONLY ACCEPT BUG REPORTS AND FEATURE REQUESTS**
-
-For more information see `CONTRIBUTING.md`.
-
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-Provide detailed steps to reproduce, an executable script would be best.
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**Your environment**
-
-- Affects my production application: **YES/NO**
-- Ruby version: ...
-- OS: ...

data/.github/ISSUE_TEMPLATE/---feature-request.md

@@ -1,18 +0,0 @@
----
-name: "\U0001F6E0 Feature request"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: feature
-assignees: ''
-
----
-
-Summary of what the feature is supposed to do.
-
-## Examples
-
-Code examples showing how the feature could be used.
-
-## Resources
-
-Additional information, like a link to the discussion forum thread where the feature was discussed etc.

data/.github/workflows/ci.yml

@@ -1,76 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: ci
-
-on:
-  push:
-    paths:
-      - .github/workflows/ci.yml
-      - lib/**
-      - spec/**
-      - Gemfile
-      - "*.gemspec"
-
-jobs:
-  tests-mri:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.6.x", "2.5.x", "2.4.x"]
-        include:
-          - ruby: "2.6.x"
-            coverage: "true"
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-      - name: Download test reporter
-        if: "matrix.coverage == 'true'"
-        run: |
-          mkdir -p tmp/
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
-          chmod +x ./tmp/cc-test-reporter
-          ./tmp/cc-test-reporter before-build
-      - name: Bundle install
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without tools docs benchmarks
-      - name: Run all tests
-        env:
-          COVERAGE: ${{matrix.coverage}}
-        run: bundle exec rake
-      - name: Send coverage results
-        if: "matrix.coverage == 'true'"
-        env:
-          CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
-          GIT_COMMIT_SHA: ${{github.sha}}
-          GIT_BRANCH: ${{github.ref}}
-          GIT_COMMITTED_AT: ${{github.event.head_commit.timestamp}}
-        run: |
-          GIT_BRANCH=`ruby -e "puts ENV['GITHUB_REF'].split('/', 3).last"` \
-          GIT_COMMITTED_AT=`ruby -r time -e "puts Time.iso8601(ENV['GIT_COMMITTED_AT']).to_i"` \
-          ./tmp/cc-test-reporter after-build
-
-  tests-others:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ["jruby:9.2.9", "ruby:2.7"]
-    container:
-      image: ${{matrix.image}}
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install git
-        run: |
-          apt-get update
-          apt-get install -y --no-install-recommends git
-      - name: Bundle install
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without tools docs benchmarks
-      - name: Run all tests
-        run: bundle exec rake

data/.github/workflows/docsite.yml

@@ -1,34 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: docsite
-
-on:
-  push:
-    paths:
-      - docsite/**
-      - .github/workflows/docsite.yml
-    branches:
-      - master
-      - release-**
-    tags:
-
-jobs:
-  update-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.6.x"
-      - name: Install dependencies
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without benchmarks sql
-      - name: Symlink ossy
-        run: mkdir -p bin && ln -sf "$(bundle show ossy)/bin/ossy" bin/ossy
-      - name: Trigger dry-rb.org deploy
-        env:
-          GITHUB_LOGIN: dry-bot
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        run: bin/ossy github workflow dry-rb/dry-rb.org ci

data/.github/workflows/sync_configs.yml

@@ -1,34 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: sync_configs
-
-on:
-  repository_dispatch:
-
-jobs:
-  sync-configs:
-    runs-on: ubuntu-latest
-    if: github.event.action == 'sync_configs'
-    steps:
-      - uses: actions/checkout@v1
-      - name: Update configuration files from devtools
-        env:
-          GITHUB_LOGIN: dry-bot
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        run: |
-          git clone https://github.com/dry-rb/devtools.git tmp/devtools
-
-          if [ -f ".github/workflows/custom_ci.yml" ]; then
-            rsync -av --exclude '.github/workflows/ci.yml' tmp/devtools/shared/ . ;
-          else
-            rsync -av tmp/devtools/shared/ . ;
-          fi
-
-          git config --local user.email "dry-bot@dry-rb.org"
-          git config --local user.name "dry-bot"
-          git add -A
-          git commit -m "[devtools] config sync" || echo "nothing changed"
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GH_PAT }}

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/vendor/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.rspec

@@ -1,4 +0,0 @@
---color
---require spec_helper
---order random
---warnings

data/.rubocop.yml

@@ -1,95 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-AllCops:
-  TargetRubyVersion: 2.4
-
-Style/EachWithObject:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: single_quotes
-
-Style/Alias:
-  Enabled: false
-
-Style/LambdaCall:
-  Enabled: false
-
-Style/StabbyLambdaParentheses:
-  Enabled: false
-
-Style/FormatString:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Layout/SpaceInLambdaLiteral:
-  Enabled: false
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Metrics/LineLength:
-  Max: 100
-
-Metrics/MethodLength:
-  Max: 22
-
-Metrics/ClassLength:
-  Max: 150
-
-Metrics/AbcSize:
-  Max: 20
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: true
-  Max: 10
-
-Lint/BooleanSymbol:
-  Enabled: false
-
-Style/AccessModifierDeclarations:
-  Enabled: false
-
-Style/BlockDelimiters:
-  Enabled: false
-
-Layout/IndentFirstArrayElement:
-  EnforcedStyle: consistent
-
-Style/ClassAndModuleChildren:
-  Exclude:
-    - "spec/**/*_spec.rb"
-
-Lint/HandleExceptions:
-  Exclude:
-    - "spec/spec_helper.rb"
-
-Naming/FileName:
-  Exclude:
-    - "lib/dry-*.rb"
-
-Style/SymbolArray:
-  Exclude:
-    - "spec/**/*_spec.rb"
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Naming/MethodName:
-  Enabled: false
-
-Style/AsciiComments:
-  Enabled: false
-
-Style/DateTime:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-08-19 22:11:28 +0100 using RuboCop version 0.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.4.0, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct)

data/CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# Issue Guidelines
-
-## Reporting bugs
-
-If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
-
-## Reporting feature requests
-
-Report a feature request **only after discussing it first on [discourse.dry-rb.org](https://discourse.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
-
-## Reporting questions, support requests, ideas, concerns etc.
-
-**PLEASE DON'T** - use [discourse.dry-rb.org](http://discourse.dry-rb.org) instead.
-
-# Pull Request Guidelines
-
-A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
-
-Other requirements:
-
-1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
-2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
-3) Add API documentation if it's a new feature
-4) Update API documentation if it changes an existing feature
-5) Bonus points for sending a PR to [github.com/dry-rb/dry-rb.org](github.com/dry-rb/dry-rb.org) which updates user documentation and guides
-
-# Asking for help
-
-If these guidelines aren't helpful, and you're stuck, please post a message on [discourse.dry-rb.org](https://discourse.dry-rb.org) or join [our chat](https://dry-rb.zulipchat.com).

data/Gemfile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in dry-auto_inject.gemspec
-gemspec
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", require: nil
-end
-
-group :tools do
-  gem 'byebug', platforms: :mri
-  gem 'pry'
-  gem "ossy", git: "https://github.com/solnic/ossy.git", branch: "master"
-end