roda-container 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5365074c2dcadd60d7bd776e6a7875b6139e5ea4
-  data.tar.gz: fc953960aaafd78ac65dae44fe7f46315bb8540d
+  metadata.gz: 15f3136a230d1b934b51c0ca18f2c772378deb5f
+  data.tar.gz: 2ff4e2383eb0e47f4000b97912cc0a7d195b82b6
 SHA512:
-  metadata.gz: 3e5cf15a1e0c8f773f910041f0689f255c99ed142bfd926e29a8f5d71dc46dfea6424769d5b3e12e16182cb9b1cbf20bc62200dfba6fe8b5a1949f53dcadeff4
-  data.tar.gz: a0aeb38b04c25be7f612b7f76f774ccc421df0d43cc671118347dcc09f831b0e0827c41e779ed487c1272538df28891a04600e9d452a01e2126590a0fd5d1047
+  metadata.gz: 88241b79de3a8dcf2f8a801562923e26b9aa9b509156642776eccf280aab2fe2880f5c6c29fca44100149cc1ed425721d9e9ab6cc37cc0b4d4caf3717ebfb61e
+  data.tar.gz: 52f0ace71d379a143625d95bc2d22f9055f4e3b7eceee7eaecf0668750a540460e1d6dad38272f09ce2d0750ab827567d90e541c2bb689c0da27653e857a6ab1

data/README.md

@@ -5,7 +5,7 @@ A plugin for Roda which turns your application into a (IoC) container
 ## Installation
 
 ```ruby
-gem 'roda-container', '0.0.1'
+gem 'roda-container', '0.0.3'
 ```
 
 ## Usage
@@ -36,6 +36,20 @@ MyApplication.resolve(:person_repository).first
   # => {:name=>"Gill"}
 ```
 
+If you want to register a proc, or anything that responds to call, without calling when resolving it, you can pass the `call: false` option:
+
+```ruby
+class MyApplication < Roda
+  plugin :container
+end
+
+MyApplication.route do |r|
+  # Roda responds to the instance method #call, with the call: false
+  # option, calling MyApplication.resolve(:app) will not attempt to call
+  # it, without the option, the application would error
+  MyApplication.register(:app, self, call: false)
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/AMHOL/roda-container )

data/lib/roda/plugins/container.rb

@@ -31,10 +31,25 @@ class Roda
     #   MyApplication.register(:person_repository, -> { PersonRepository.new })
     #   MyApplication.resolve(:person_repository).first
     module Container
+      class Content
+        attr_reader :item, :options
+
+        def initialize(item, options = {})
+          @item, @options = item, {
+            call: item.is_a?(::Proc)
+          }.merge(options)
+        end
+
+        def call
+          if options[:call] == true
+            item.call
+          else
+            item
+          end
+        end
+      end
+
       module ClassMethods
-        # Whether middleware from the current class should be inherited by subclasses.
-        # True by default, should be set to false when using a design where the parent
-        # class accepts requests and uses run to dispatch the request to a subclass.
         attr_reader :container
         private :container
 
@@ -48,25 +63,27 @@ class Roda
           super
         end
 
-        def register(key, contents = nil, &block)
-          container[key] = block_given? ? block : contents
+        def register(key, contents = nil, options = {}, &block)
+          if block_given?
+            item = block
+            options = contents if contents.is_a?(::Hash)
+          else
+            item = contents
+          end
+          container[key] = Roda::RodaPlugins::Container::Content.new(item, options)
         end
 
         def resolve(key)
-          instance = container.fetch(key) do
+          content = container.fetch(key) do
             fail ::Roda::ContainerError, "Nothing registered with the name #{key}"
           end
-          instance.respond_to?(:call) ? instance.call : instance
+
+          content.call
         end
 
         def detach_container
           @container = container.dup
         end
-
-        def freeze
-          container.freeze
-          super
-        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-container
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler