micon 0.1.26 → 0.1.27

data/Rakefile

@@ -1,10 +1,9 @@
 require 'rake_ext'
 
-project(
+project \
   name: "micon",
   gem: true,
   summary: "Silent killer of dependencies and configs",
 
   author: "Alexey Petrushin",
-  homepage: "http://alexeypetrushin.github.com/micon"
-)
+  homepage: "http://alexeypetrushin.github.com/micon"

data/lib/micon/config.rb

@@ -7,7 +7,7 @@ class Micon::Config
   def load
     files = []
     files.push *config_paths.collect{|path| find_file(path, $LOAD_PATH)}
-    files.push *runtime_config_paths.collect{|path| find_file(path, [micon.runtime_path])} if micon.runtime_path?
+    files.push *runtime_config_paths.collect{|path| find_file(path, [micon.runtime_path])}
 
     config = {}
     files.compact.each do |f|
@@ -41,7 +41,7 @@ class Micon::Config
 
     def find_file path, directories
       files = directories.collect{|dir| "#{dir}#{path}"}.select{|f| File.exist? f}
-      raise "multiple configs for :#{name} component" if files.size > 1
+      raise %(multiple configs for :#{name} component ('#{files.join("', '")}')) if files.size > 1
       files.first
     end
 end

data/lib/micon/core.rb

@@ -5,7 +5,7 @@ class Micon::Core
 
   attr_accessor :custom_scopes
 
-  def activate sname, container, &block
+  def activate sname, container = {}, &block
     raise_without_self "Only custom scopes can be activated!" if sname == :application or sname == :instance
     raise "container should have type of Hash but has #{container.class.name}" unless container.is_a? Hash
 
@@ -237,7 +237,7 @@ class Micon::Core
   end
 
   # `runtime_path` is used to search for component configurations, it may be `app/runtime` for example..
-  def runtime_path; @runtime_path || raise(":runtime_path not defined!") end
+  def runtime_path; @runtime_path ||= File.expand_path('.') end
   def runtime_path= runtime_path
     runtime_path, force = runtime_path
     raise "some components has been already initialized before You set :runtime_path!" unless empty? or force
@@ -248,7 +248,7 @@ class Micon::Core
   # `mode` used to search for component configuration, examples:
   # - `app/runtime/logger.production.yml`
   # - `app/runtime/production/logger.yml`
-  def mode; @mode || raise(":mode not defined!") end
+  def mode; @mode ||= :development end
   def mode= mode
     mode, force = mode
     raise "some components has been already initialized before You set :mode!" unless empty? or force
@@ -256,6 +256,18 @@ class Micon::Core
   end
   def mode?; !!@mode end
 
+  def development?; mode == :development end
+  def production?; mode == :production end
+  def test?; mode == :test end
+
+  def development █ block.call if development? end
+  def production █ block.call if production? end
+  def test █ block.call if test? end
+
+  def raise_without_self message
+    raise RuntimeError, message, caller.select{|path| path !~ /\/lib\/micon\//}
+  end
+
   protected
     def autoload_component_definition key, bang = true
       begin
@@ -359,10 +371,6 @@ class Micon::Core
       end
     end
 
-    def raise_without_self message
-      raise RuntimeError, message, caller.select{|path| path !~ /\/lib\/micon\//}
-    end
-
     # Generates helper methods, so you can use `micon.logger` instead of `micon[:logger]`
     def method_missing m, *args, &block
       super if args.size > 1 or block

data/lib/micon/support.rb

@@ -8,15 +8,19 @@ class Class
 end
 
 Module.class_eval do
-  # Usage: `inject logger: :logger`.
-  def inject attributes
-    ::MICON.raise_without_self "Invalid argument!" unless attributes.is_a? Hash
-    attributes.each do |name, specificator|
-      ::MICON.raise_without_self "Attribute name should be a Symbol!" unless name.is_a? Symbol
+  # Usage: `inject :logger` or `inject logger: :logger`.
+  def inject *attributes
+    options = attributes.last.is_a?(Hash) ? attributes.pop : {}
+    attributes.each{|name| options[name] = name}
 
-      define_method(name){::MICON[specificator]}
-      define_method("#{name}="){|value| ::MICON[specificator] = value}
-      define_method("#{name}?"){::MICON.include? specificator}
+    options.each do |attr_name, component_name|
+      unless attr_name.is_a? Symbol
+        ::MICON.raise_without_self "attribute name #{attr_name} should be a Symbol!"
+      end
+
+      define_method(attr_name){::MICON[component_name]}
+      define_method("#{attr_name}="){|component| ::MICON[component_name] = component}
+      define_method("#{attr_name}?"){::MICON.include? component_name}
     end
   end
 end

data/readme.md

@@ -47,7 +47,7 @@ micon.register(:logger){Logger.new STDOUT}
 
 class Application
   # Whiring the `:logger` component and application together.
-  inject logger: :logger
+  inject :logger
 
   # Now You can use `:logger` as if it's an usual class member.
   def run

data/spec/helpers_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Helpers" do
+  before{self.micon = Micon::Core.new}
+  after{remove_constants :Tmp}
+
+  it "register_as" do
+    class Tmp
+      micon.should_receive :register do |name, &initializer|
+        name.should == :an_object
+        initializer.call.class.should == Tmp
+      end
+
+      register_as :an_object
+    end
+  end
+
+  it "inject" do
+    class Tmp
+      inject :an_object
+    end
+    tmp = Tmp.new
+
+    micon.should_receive(:[]).with :an_object
+    tmp.an_object
+
+    micon.should_receive(:[]=).with :an_object, 'An Object'
+    tmp.an_object = 'An Object'
+
+    micon.should_receive(:include?).with :an_object
+    tmp.an_object?
+
+    # Another form.
+    class Tmp
+      inject other: :other_object
+    end
+    micon.should_receive(:[]).with :other_object
+    tmp.other
+  end
+end

data/spec/miscellaneous_spec.rb

@@ -54,19 +54,19 @@ describe "Miscellaneous" do
     end
 
     it "should allow circullar dependencies in :after callback" do
-      micon.register :environment do
+      micon.register :an_environment do
         'environment'
       end
 
-      micon.register :router, depends_on: :environment do
+      micon.register :a_router, depends_on: :an_environment do
         'router'
       end
 
-      micon.after :environment do
-        micon[:router]
+      micon.after :an_environment do
+        micon[:a_router]
       end
 
-      micon[:router]
+      micon[:a_router]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micon
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -36,8 +36,8 @@ files:
 - spec/constants_spec/get_constant_component/lib/components/TheController.rb
 - spec/constants_spec.rb
 - spec/custom_scope_spec.rb
+- spec/helpers_spec.rb
 - spec/initialization_spec.rb
-- spec/managed_spec.rb
 - spec/miscellaneous_spec/autoload/lib/components/some_value.rb
 - spec/miscellaneous_spec/autoload/lib/components/TheRad/TheView.rb
 - spec/miscellaneous_spec/autoload/lib/components/TheRouter.rb

data/spec/managed_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe "Managed" do
-  before :all do
-    self.micon = Micon::Core.new
-
-    class ManagedObject
-      register_as :managed_object
-      inject object: :object_key
-
-      class << self
-        inject object: :object_key
-      end
-    end
-  end
-
-  before do
-    micon.clear
-  end
-
-  it "scope" do
-    scope = micon.metadata[:managed_object]
-    initializer, dependencies = micon.metadata.initializers[:managed_object]
-    scope.should == :application
-    initializer.call.should be_a(ManagedObject)
-  end
-
-  it "injection" do
-    the_object = "The Object"
-    micon.register(:object_key){the_object}
-
-    ManagedObject.object.should == the_object
-    o = ManagedObject.new
-    o.object.should == the_object
-  end
-
-  it "outjection" do
-    the_object = "The Object"
-    micon.register(:object_key)
-
-    -> {ManagedObject.object}.should raise_error(/no initializer/)
-    ManagedObject.object = the_object
-    ManagedObject.object.should == the_object
-  end
-
-  it "empty?" do
-    micon.should be_empty
-    micon[:managed_object]
-    micon.should_not be_empty
-  end
-end