fabrique 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8683ae625b53e11ecf2abd341320e42a060906fc
-  data.tar.gz: 34b2ae0dc2fb5aa5b8436ab1b275e19f388a9484
+  metadata.gz: fcf209a41cd39284e0ecbc2c78e3785bc0f677e4
+  data.tar.gz: 67117224f5f81c5deb5b0708334633f69f23bba2
 SHA512:
-  metadata.gz: ebaa94d196dde76335b23b3d5b78212d9d71d41cced7c950479561c8ea5a0ea85c59c069dfa1478dbe34a3a17bf1b61ade882d2c357b2d183c05ad03836d30c4
-  data.tar.gz: 326909d817f1a2ba15e8363fe21e74e5c5419ce199306b5bda2609eb3a34bc485120661c2895b99100abd37c43271ddc03fd9773dad12a68f55378ca604a356a
+  metadata.gz: a542c2ee2ebf3086ef5287b436bb7c91794b8c7eb85cb27e3e9ffbd4d0dfd08cf58f10e6a597677bd5fd27e2e80b3a675175f45dec1b830b011cebb1be86872f
+  data.tar.gz: 202da5c74f8b0021c9c19722cf5cfc3bb53acc0f0ea86c13a6db16bd93dac4511fba2e5b061eedd18660ec0dce4bb2c3455a3424df9fc81baa504d59db99609c

data/features/bean_factory.feature

@@ -208,6 +208,28 @@ Feature: Bean Factory
     Then the "disco_cube" bean has "mesh" set to the "cube_mesh" bean
     And the "disco_cube" bean has "scale" that is the Integer 10
 
+  Scenario: Inner bean
+
+    Given I have a YAML application context definition:
+      """
+      ---
+      beans:
+      - id: outer
+        class: Fabrique::Test::Fixtures::Constructors::ClassWithPositionalArgumentConstructor
+        constructor_args:
+          - large
+          - red
+          - !bean
+            class: Fabrique::Test::Fixtures::Constructors::ClassWithPositionalArgumentConstructor
+            constructor_args:
+              - infinite
+              - invisible
+              - elephant
+      """
+    When I request a bean factory for the application context
+    And I request the "outer" bean from the bean factory
+    Then the bean's "shape" is an object with "shape" set to "elephant"
+
   Scenario: Singleton bean (default)
 
     Given I have a YAML application context definition:

data/features/step_definitions/bean_factory_steps.rb

@@ -1,4 +1,4 @@
-require "yaml"
+require "tempfile"
 
 After do
   if defined?(@tmpfile) and File.exists?(@tmpfile)
@@ -25,6 +25,10 @@ Then(/^the bean has "(.*?)" set to "(.*?)"$/) do |attr, value|
   expect(@bean.send(attr)).to eql value
 end
 
+Then(/^the bean's "(.*?)" is an object with "(.*?)" set to "(.*?)"$/) do |attr, child_attr, value|
+  expect(@bean.send(attr).send(child_attr)).to eql value
+end
+
 Then(/^the bean has "(.*?)" that is the Integer "(.*?)"$/) do |attr, int_value|
   expect(@bean.send(attr)).to eql int_value.to_i
 end

data/lib/fabrique/bean_factory.rb

@@ -23,21 +23,25 @@ module Fabrique
       def get_bean_unsynchronized(bean_name)
         defn = @registry.get_definition(bean_name)
 
+        if defn.singleton? and singleton = @singletons[bean_name]
+          return singleton
+        end
+
+        get_bean_by_definition(defn).tap do |bean|
+          if defn.singleton?
+            @singletons[bean_name] = bean
+          end
+        end
+      end
+
+      def get_bean_by_definition(defn)
         if defn.factory_method == "itself"
           # Support RUBY_VERSION < 2.2.0 (missing Kernel#itself)
           return defn.type
         end
 
-        if defn.singleton? and singleton = @singletons[bean_name]
-          return singleton
-        end
-
         bean = constructor_injection(defn)
         property_injection(bean, defn)
-        if defn.singleton?
-          @singletons[bean_name] = bean
-        end
-        bean
       end
 
       def constructor_injection(defn)
@@ -67,6 +71,8 @@ module Fabrique
           data.inject([]) do |acc, v|
             acc << resolve_bean_references(v)
           end
+        elsif data.is_a?(BeanDefinition)
+          get_bean_by_definition(data)
         elsif data.is_a?(BeanReference)
           get_bean_unsynchronized(data.bean)
         else

data/lib/fabrique/version.rb

@@ -1,3 +1,3 @@
 module Fabrique
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrique
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Sheldon Hearn
@@ -14,70 +14,70 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Factory support library for adapting existing modules for injection as
@@ -88,11 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -152,12 +152,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []