dry-component 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f20f827f417aba585962b49de78f790635adad
-  data.tar.gz: e97bf0d7268da63ddb52de913a4367c3c6e246cc
+  metadata.gz: 7f3c7bc83200152d244ec311a77affb840f5340f
+  data.tar.gz: e437ce4b730ce49d617fbc86a4bc46f089a1df1e
 SHA512:
-  metadata.gz: 51a1c8419c4d3d6675b24aa2b0b4065a65bbd14cd25a803a2ffcf3fb21781ecd7b4b41505a552ce1fdc99134f97cfbd3d5bfb5e09610667f06761993ffc3cf53
-  data.tar.gz: 1ec1d0d17d1dbbcd26680aee3dd03e0c14263b12c9fde320455a9efed5716a382bd4b1b07db42ae74f0e788547a5162ebcbb6b997282418fbd559dafcf015e30
+  metadata.gz: 3ce61aa0a4bc7e95f486adfe712b4f73a585631d5dba1e2e441ecbef99aef9da82a49039c605ec6651bad6db3d285320ec4fd97f74db3dd5bb66630fc402a468
+  data.tar.gz: c095e172c4af2ffeff3056eddaea8bd0281244cea470379738dc73e943978d18223a4c12b82beafa904692e7758c5661f379370617b069b4cb6669d89b7939ab

data/CHANGELOG.md

@@ -1,7 +1,18 @@
+# 0.3.0 - 2016-06-18
+
+## Changed
+
+Removed two pieces that are moving to dry-web:
+
+- Removed `env` setting from `Container` (timriley)
+- Removed `Dry::Component::Config` and `options` setting from `Container` (timriley)
+- Changed `Component#configure` behavior so it can be run multiple times for configuration to be applied in multiple passes (timriley)
+
 # 0.2.0 - 2016-06-13
 
 ## Changed
 
+- Component core directory is now `component/` by default (timriley)
 - Injector default stragegy is now whatever dry-auto_inject's default is (rather than hard-coding a particular default strategy for dry-component) (timriley)
 
 ## Fixed

data/lib/dry/component/container.rb

@@ -1,23 +1,22 @@
 require 'pathname'
 require 'inflecto'
 
+require 'dry-configurable'
 require 'dry-container'
 
 require 'dry/component/injector'
 require 'dry/component/loader'
-require 'dry/component/config'
 
 module Dry
   module Component
     class Container
+      extend Dry::Configurable
       extend Dry::Container::Mixin
 
-      setting :env
       setting :name
       setting :root, Pathname.pwd.freeze
       setting :core_dir, 'component'.freeze
       setting :auto_register
-      setting :options
       setting :loader, Dry::Component::Loader
 
       def self.inherited(subclass)
@@ -25,18 +24,11 @@ module Dry
         subclass.const_set :Inject, subclass.injector
       end
 
-      def self.configure(env = config.env, &block)
-        return self if configured?
-
-        super() do |config|
-          yield(config) if block
-          config.options = Config.load(root, config.name, env)
-        end
+      def self.configure(&block)
+        super(&block)
 
         load_paths!(config.core_dir)
 
-        @configured = true
-
         self
       end
 
@@ -51,18 +43,10 @@ module Dry
         end
       end
 
-      def self.options
-        config.options
-      end
-
       def self.finalize(name, &block)
         finalizers[name] = proc { block.(self) }
       end
 
-      def self.configured?
-        @configured
-      end
-
       def self.finalize!(&_block)
         yield(self) if block_given?
 
@@ -171,9 +155,13 @@ module Dry
       def self.load_paths!(*dirs)
         dirs.map(&:to_s).each do |dir|
           path = root.join(dir)
+
+          next if load_paths.include?(path)
+
           load_paths << path
           $LOAD_PATH.unshift(path.to_s)
         end
+
         self
       end
 

data/lib/dry/component/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Component
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -16,10 +16,6 @@ Dir[SPEC_ROOT.join('shared/*.rb').to_s].each { |f| require f }
 
 require 'dry/component/container'
 
-class Dry::Component::Container
-  setting :env, 'test'
-end
-
 module TestNamespace
   def remove_constants
     constants.each do |name|

data/spec/unit/container/auto_register_spec.rb

@@ -40,11 +40,10 @@ RSpec.describe Dry::Component::Container, '.auto_register!' do
         auto_register!('components')
       end
     end
-    
+
     it { expect(Test::Container['foo']).to be_an_instance_of(Foo) }
     it { expect(Test::Container['bar']).to eq(Bar) }
     it { expect(Test::Container['bar'].call).to eq("Welcome to my Moe's Tavern!") }
     it { expect(Test::Container['bar-baz']).to be_an_instance_of(Bar::Baz) }
   end
-
 end

data/spec/unit/container_spec.rb

@@ -120,10 +120,10 @@ RSpec.describe Dry::Component::Container do
 
     it 'passes container to the finalizer block' do
       class Test::Container < Dry::Component::Container
-        configure { |c| c.env = :awesome }
+        configure { |c| c.name = :awesome }
 
         finalize(:foo) do |container|
-          register(:w00t, container.config.env)
+          register(:w00t, container.config.name)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-component
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -134,7 +134,6 @@ files:
 - dry-component.gemspec
 - lib/dry-component.rb
 - lib/dry/component.rb
-- lib/dry/component/config.rb
 - lib/dry/component/container.rb
 - lib/dry/component/injector.rb
 - lib/dry/component/loader.rb
@@ -168,7 +167,6 @@ files:
 - spec/fixtures/test/lib/test/models/book.rb
 - spec/fixtures/test/lib/test/models/user.rb
 - spec/spec_helper.rb
-- spec/unit/config_spec.rb
 - spec/unit/container/auto_register_spec.rb
 - spec/unit/container/import_spec.rb
 - spec/unit/container_spec.rb
@@ -228,7 +226,6 @@ test_files:
 - spec/fixtures/test/lib/test/models/book.rb
 - spec/fixtures/test/lib/test/models/user.rb
 - spec/spec_helper.rb
-- spec/unit/config_spec.rb
 - spec/unit/container/auto_register_spec.rb
 - spec/unit/container/import_spec.rb
 - spec/unit/container_spec.rb

data/lib/dry/component/config.rb

@@ -1,23 +0,0 @@
-require 'yaml'
-
-module Dry
-  module Component
-    class Config
-      def self.load(root, name, env)
-        path = root.join('config').join("#{name}.yml")
-
-        return {} unless File.exist?(path)
-
-        yaml = YAML.load_file(path)
-
-        Class.new do
-          extend Dry::Configurable
-
-          yaml.fetch(env.to_s).each do |key, value|
-            setting key.downcase.to_sym, ENV.fetch(key, value)
-          end
-        end.config
-      end
-    end
-  end
-end

data/spec/unit/config_spec.rb

@@ -1,27 +0,0 @@
-require 'dry/component/container'
-
-RSpec.describe Dry::Component::Config do
-  before do
-    class Test::App < Dry::Component::Container
-      configure do |config|
-        config.name = :application
-        config.root = SPEC_ROOT.join('fixtures/test').realpath
-      end
-    end
-
-    class Test::SubApp < Dry::Component::Container
-      configure do |config|
-        config.name = :subapp
-        config.root = SPEC_ROOT.join('fixtures/test').realpath
-      end
-    end
-  end
-
-  it 'loads config under component name' do
-    expect(Test::App.options.foo).to eql('bar')
-  end
-
-  it 'allows different components to have different configurations' do
-    expect(Test::SubApp.options.bar).to eql('baz')
-  end
-end