micon 0.1.24 → 0.1.25

data/lib/micon.rb

@@ -1,22 +1,13 @@
-require 'yaml'
+require 'micon/support'
 
 module Micon
+  autoload :Metadata, 'micon/metadata'
+  autoload :Config,   'micon/config'
+  autoload :Core,     'micon/core'
+  autoload :Metadata, 'micon/metadata'
 end
 
-%w{
-  support
-
-  metadata
-  config
-  core
-  helper
-
-  module
-  class
-}.each{|f| require "micon/#{f}"}
-
 # Initializing Micon.
-Micon::Core.send :include, Micon::Helper
 micon = Micon::Core.new
 micon.initialize!
 

data/lib/micon/class.rb

@@ -1,8 +0,0 @@
-class Class
-  # Usage:
-  #     register_as :session, scope: :request
-  #     register_as :loggger
-  def register_as *args
-    ::MICON.register(*args){self.new}
-  end
-end

data/lib/micon/config.rb

@@ -11,6 +11,7 @@ class Micon::Config
 
     config = {}
     files.compact.each do |f|
+      require 'yaml'
       c = YAML.load_file(f)
       next unless c
       raise "component config must be a Hash (#{f})!" unless c.is_a? Hash

data/lib/micon/core.rb

@@ -153,7 +153,6 @@ class Micon::Core
 
   def register key, options = {}, &initializer
     raise "key should not be nil or false value!" unless key
-    options = options.symbolize_keys
 
     sname = options.delete(:scope) || :application
     dependencies = Array(options.delete(:require) || options.delete(:depends_on))
@@ -359,4 +358,30 @@ 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
+
+      key = m.to_s.sub(/[?=]$/, '').to_sym
+      self.class.class_eval do
+        define_method key do
+          self[key]
+        end
+
+        define_method "#{key}=" do |value|
+          self[key] = value
+        end
+
+        define_method "#{key}?" do
+          include? key
+        end
+      end
+
+      send m, *args
+    end
 end

data/lib/micon/support.rb

@@ -1,16 +1,22 @@
-class Micon::Core
-  protected
-    def raise_without_self message
-      raise RuntimeError, message, caller.select{|path| path !~ /\/lib\/micon\//}
-    end
+class Class
+  # Usage:
+  #     register_as :session, scope: :request
+  #     register_as :loggger
+  def register_as *args
+    ::MICON.register(*args){self.new}
+  end
 end
 
-class Hash
-  unless method_defined? :symbolize_keys
-    def symbolize_keys
-      r = {}
-      each{|k, v| r[k.to_sym] = v}
-      r
+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
+
+      define_method(name){::MICON[specificator]}
+      define_method("#{name}="){|value| ::MICON[specificator] = value}
+      define_method("#{name}?"){::MICON.include? specificator}
     end
   end
 end

data/spec/config_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 describe "Configuration" do
   before{self.micon = Micon::Core.new}

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-require 'rspec_ext'
-require 'ostruct'
-
 require "micon"
 
-Micon::Core.send :include, Micon::Helper
+require 'rspec_ext'
 
 def micon; $micon end
 def micon= value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micon
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -22,9 +22,7 @@ files:
 - lib/micon/class.rb
 - lib/micon/config.rb
 - lib/micon/core.rb
-- lib/micon/helper.rb
 - lib/micon/metadata.rb
-- lib/micon/module.rb
 - lib/micon/spec.rb
 - lib/micon/support.rb
 - lib/micon.rb

data/lib/micon/helper.rb

@@ -1,23 +0,0 @@
-# Generates helper methods for Micon, so you can use micon.logger instead of micon[:logger]
-module Micon::Helper
-  def method_missing m, *args, &block
-    super if args.size > 1 or block
-
-    key = m.to_s.sub(/[?=]$/, '').to_sym
-    self.class.class_eval do
-      define_method key do
-        self[key]
-      end
-
-      define_method "#{key}=" do |value|
-        self[key] = value
-      end
-
-      define_method "#{key}?" do
-        include? key
-      end
-    end
-
-    send m, *args
-  end
-end

data/lib/micon/module.rb

@@ -1,13 +0,0 @@
-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
-
-      define_method(name){::MICON[specificator]}
-      define_method("#{name}="){|value| ::MICON[specificator] = value}
-      define_method("#{name}?"){::MICON.include? specificator}
-    end
-  end
-end