fabrique 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf209a41cd39284e0ecbc2c78e3785bc0f677e4
-  data.tar.gz: 67117224f5f81c5deb5b0708334633f69f23bba2
+  metadata.gz: 494331a7b6792524ef6015df1561d1491e2f8c42
+  data.tar.gz: cb74ab2e30ffa97f9e6b4e7a13c189efcc3437a1
 SHA512:
-  metadata.gz: a542c2ee2ebf3086ef5287b436bb7c91794b8c7eb85cb27e3e9ffbd4d0dfd08cf58f10e6a597677bd5fd27e2e80b3a675175f45dec1b830b011cebb1be86872f
-  data.tar.gz: 202da5c74f8b0021c9c19722cf5cfc3bb53acc0f0ea86c13a6db16bd93dac4511fba2e5b061eedd18660ec0dce4bb2c3455a3424df9fc81baa504d59db99609c
+  metadata.gz: dd994b6430c7d1635b489928a0684caba53fcc64ceca9c6de2b8762e98c65655916e0ea41b8879bfda97cdfa973ab2b3c7d44d40959c023cf6f8c0763b6dd954
+  data.tar.gz: b66bd347ef6fded060d9a48a99d117b945b8a1a46fe0667319acf709a140a1554108db5cd35b452182d3fb4e1f49221b83968713b81f11fc1ce5cd238562c3fe

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :devtools do
-  gem "guard-cucumber", "~> 1.5"
-  gem "byebug", "~> 3.5"
+  gem "guard-cucumber", "~> 1.6"
+  gem "byebug", "~> 6.0"
 end

data/fabrique.gemspec

@@ -19,10 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "liquid", "~> 3.0"
-
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "cucumber", "~> 1.3"
+  spec.add_development_dependency "cucumber", "~> 2.0"
 end

data/features/bean_factory.feature

@@ -230,6 +230,31 @@ Feature: Bean Factory
     And I request the "outer" bean from the bean factory
     Then the bean's "shape" is an object with "shape" set to "elephant"
 
+  Scenario: Bean property reference
+
+    Given I have a YAML application context definition:
+      """
+      ---
+      beans:
+      - id: left
+        class: Fabrique::Test::Fixtures::Constructors::ClassWithPositionalArgumentConstructor
+        constructor_args:
+          - !bean/property_ref right.size
+          - !bean/property_ref right.color
+          - !bean/property_ref right.shape
+      - id: right
+        class: Fabrique::Test::Fixtures::Constructors::ClassWithPositionalArgumentConstructor
+        constructor_args:
+          - tiny
+          - purple
+          - elephant
+      """
+    When I request a bean factory for the application context
+    And I request the "left" bean from the bean factory
+    Then the bean has "size" set to "tiny"
+    And the bean has "color" set to "purple"
+    And the bean has "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,20 +1,19 @@
 require "tempfile"
 
 After do
-  if defined?(@tmpfile) and File.exists?(@tmpfile)
-    File.unlink(@tmpfile)
+  if defined?(@tmpfile) and File.exists?(@tmpfile.path)
+    @tmpfile.unlink
   end
 end
 
 Given(/^I have a YAML application context definition:$/) do |string|
-  Tempfile.open('fabrique') do |f|
-    @tmpfile = f.path
-    f.write(string)
-  end
+  @tmpfile = Tempfile.open('fabrique')
+  @tmpfile.write string
+  @tmpfile.close
 end
 
 When(/^I request a bean factory for the application context$/) do
-  @bean_factory = Fabrique::YamlBeanFactory.new(@tmpfile)
+  @bean_factory = Fabrique::YamlBeanFactory.new(@tmpfile.path)
 end
 
 When(/^I request the "(.*?)" bean from the bean factory$/) do |bean_name|
@@ -60,7 +59,7 @@ Then(/^I get a different object when I request the "(.*?)" bean again$/) do |bea
 end
 
 Then(/^I get a cyclic bean dependency error when I request a bean factory for the application context$/) do
-  expect { Fabrique::YamlBeanFactory.new(@tmpfile) }.to raise_error(Fabrique::CyclicBeanDependencyError, /cyclic bean dependency error/)
+  expect { Fabrique::YamlBeanFactory.new(@tmpfile.path) }.to raise_error(Fabrique::CyclicBeanDependencyError, /cyclic bean dependency error/)
 end
 
 Then(/^the "(.*?)" and "(.*?)" beans share the same "(.*?)"$/) do |bean1_name, bean2_name, shared_property|

data/features/step_definitions/plugin_registry_steps.rb

@@ -120,7 +120,7 @@ end
 require "fabrique"
 
 Before do |scenario|
-  if scenario.source_tags.any? { |tag| tag.name == "@plugin_registry" }
+  if scenario.tags.any? { |tag| tag.name == "@plugin_registry" }
     @test = PluginRegistryTestRunner.new( -> {Fabrique::PluginRegistry.new("Test plugin registry")})
   end
 end

data/lib/fabrique/bean_definition.rb

@@ -35,7 +35,7 @@ module Fabrique
           data.each do |o|
             dependencies_of(o, acc)
           end
-        elsif data.is_a?(BeanReference)
+        elsif data.is_a?(BeanReference) or data.is_a?(BeanPropertyReference)
           acc << data
         end
         acc

data/lib/fabrique/bean_factory.rb

@@ -75,6 +75,8 @@ module Fabrique
           get_bean_by_definition(data)
         elsif data.is_a?(BeanReference)
           get_bean_unsynchronized(data.bean)
+        elsif data.is_a?(BeanPropertyReference)
+          get_bean_unsynchronized(data.bean).send(data.property)
         else
           data
         end

data/lib/fabrique/bean_property_reference.rb

@@ -0,0 +1,11 @@
+module Fabrique
+
+  class BeanPropertyReference
+    attr :bean, :property
+
+    def initialize(bean_property)
+      @bean, @property = bean_property.split('.')
+    end
+  end
+
+end

data/lib/fabrique/version.rb

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

data/lib/fabrique/yaml_bean_factory.rb

@@ -3,6 +3,7 @@ require_relative "bean_definition_registry"
 require_relative "bean_definition"
 require_relative "bean_factory"
 require_relative "bean_reference"
+require_relative "bean_property_reference"
 
 module Fabrique
 
@@ -18,20 +19,39 @@ module Fabrique
     BeanReference.new(value)
   end
 
+  YAML.add_domain_type("starjuice.net,2015-03-13", "bean/property_ref") do |type, value|
+    BeanPropertyReference.new(value)
+  end
+
   class YamlBeanFactory < BeanFactory
 
-    def initialize(pathname)
-      data = YAML.load_file(pathname)
-      if data.respond_to?(:keys) and data["beans"]
-        beans = data["beans"]
+    def initialize(path_or_string)
+      super bean_definition_registry beans_node load_yaml path_or_string
+    end
+
+    private
+
+    def load_yaml(path_or_string)
+      if path_or_string.is_a?(String) and path_or_string =~ /\A---\r?\n/
+        YAML.load(path_or_string)
+      else
+        YAML.load_file(path_or_string)
+      end
+    end
+
+    def beans_node(parsed_yaml)
+      if parsed_yaml.respond_to?(:keys) and parsed_yaml["beans"]
+        parsed_yaml["beans"]
       else
         raise "YAML contains no top-level beans node"
       end
+    end
 
+    def bean_definition_registry(beans)
       if beans.is_a?(BeanDefinitionRegistry)
-        super(beans)
+        beans
       elsif beans.is_a?(Array)
-        super(BeanDefinitionRegistry.new(beans))
+        BeanDefinitionRegistry.new(beans)
       else
         raise "YAML top-level beans node must be an Array or a #{BeanDefinitionRegistry}"
       end

data/spec/fabrique/yaml_bean_factory_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+require "tempfile"
+
+describe Fabrique::YamlBeanFactory do
+
+  let(:yaml_context_string) {
+    "---\n" \
+    "beans: !beans\n" \
+    "- !bean\n" \
+    "  id: simple_object\n" \
+    "  class: Fabrique::Test::Fixtures::Constructors::ClassWithDefaultConstructor\n"
+  }
+
+  after(:each) do
+    @tmpfile.unlink if @tmpfile
+  end
+
+  it "constructs from a YAML application context definition file" do
+    @tmpfile = Tempfile.open('fabrique')
+    @tmpfile.write yaml_context_string
+    @tmpfile.close
+
+    bean_factory = Fabrique::YamlBeanFactory.new(@tmpfile.path)
+    expect(bean_factory.get_bean('simple_object')).to be_a(Fabrique::Test::Fixtures::Constructors::ClassWithDefaultConstructor)
+  end
+
+  it "constructs from a YAML application context definition string" do
+    bean_factory = Fabrique::YamlBeanFactory.new(yaml_context_string)
+    expect(bean_factory.get_bean('simple_object')).to be_a(Fabrique::Test::Fixtures::Constructors::ClassWithDefaultConstructor)
+  end
+
+end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: fabrique
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  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'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 description: Factory support library for adapting existing modules for injection as
   dependencies
 email:
@@ -88,11 +74,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
@@ -114,6 +100,7 @@ files:
 - lib/fabrique/bean_definition.rb
 - lib/fabrique/bean_definition_registry.rb
 - lib/fabrique/bean_factory.rb
+- lib/fabrique/bean_property_reference.rb
 - lib/fabrique/bean_reference.rb
 - lib/fabrique/construction/as_is.rb
 - lib/fabrique/construction/builder_method.rb
@@ -140,6 +127,7 @@ files:
 - spec/fabrique/construction/properties_hash_spec.rb
 - spec/fabrique/constructor/identity_spec.rb
 - spec/fabrique/plugin_registry_spec.rb
+- spec/fabrique/yaml_bean_factory_spec.rb
 - spec/fabrique_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/starjuice/fabrique
@@ -152,17 +140,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Factory support library
@@ -181,5 +169,6 @@ test_files:
 - spec/fabrique/construction/properties_hash_spec.rb
 - spec/fabrique/constructor/identity_spec.rb
 - spec/fabrique/plugin_registry_spec.rb
+- spec/fabrique/yaml_bean_factory_spec.rb
 - spec/fabrique_spec.rb
 - spec/spec_helper.rb