ixtlan-core 0.6.1 → 0.7.0

data/lib/ixtlan/core/configuration_manager.rb

@@ -1,46 +1,74 @@
+require 'slf4r'
 module Ixtlan
   module Core
-    module ConfigurationManager
-      
-      def self.included(model)
-        model.send :include, Slf4r::Logger
-        model.after_save :fire_on_change
-        raise "configuration class must have instance method" unless model.respond_to? :instance
-        model.class_eval do
-          class << self
-            alias :instance_old :instance
-            def instance
-              Thread.current[:ixtlan_configuration] ||= instance_old
+    module Configuration
+      module Module
+        def self.included(model)
+          raise "configuration class must have instance method" unless model.respond_to? :instance
+          model.class_eval do
+            class << self
+              alias :instance_old :instance
+              def instance
+                Thread.current[:ixtlan_configuration] ||= instance_old
+              end
+              def clear_instance
+                Thread.current[:ixtlan_configuration] = nil
+              end
             end
-            def clear_instance
-              Thread.current[:ixtlan_configuration] = nil
+          end
+        end
+      end
+      
+      class Manager
+
+        include Slf4r::Logger
+
+        private
+
+        def self.registry
+          @registry ||= {}
+        end
+        
+        def registry
+          self.class.registry
+        end
+
+        def model
+          unless @model
+            if @model_name
+              @model = @model_name.constantize
+            else
+              @model = ::Configuration
             end
+            @model.send :include, Module unless @model.respond_to? :clear_instance
           end
+          @model
+        end
 
-          private
-          def self.registry
-            @registry ||= {}
+        public
+
+        def setup(model)
+          if model
+            @model_name = model.to_s.classify
           end
         end
-      end
-      
-      def register(name, &block)
-        raise "need block" unless block
-        logger.info{"register config for: #{name}"}
-        registry[name.to_sym] = block
-      end
-      
-      def fire_on_change
-        registry.each do |name, callback|
-          logger.debug{ "configure #{name}" }
-          callback.call(self)
+
+        def register(name, &block)
+          raise "need block" unless block
+          logger.info{"register config for: #{name}"}
+          registry[name.to_sym] = block
+        end
+        
+        def cleanup
+          model.clear_instance
+        end
+
+        def configure
+          registry.each do |name, callback|
+            logger.debug{ "configure #{name}" }
+            callback.call(model.instance)
+          end
         end
-      end              
-      
-      private
-      
-      def registry
-        self.class.registry
       end
     end
   end

data/lib/ixtlan/core/configuration_rack.rb

@@ -1,16 +1,16 @@
 module Ixtlan
   module Core
     class ConfigurationRack
-      def initialize(app)
+      def initialize(app, config_manager)
         @app = app
+        @manager = config_manager
       end
       
       def call(env)
-        model = Rails.application.config.configuration_model
         # configure all registered components with current config
-        model.instance.fire_on_change if model
+        @manager.configure
         result = @app.call(env)
-        model.clear_instance if model
+        @manager.cleanup
         result
       end
       

data/lib/ixtlan/core/railtie.rb

@@ -22,7 +22,7 @@ module Ixtlan
             alias :available_views_old :available_views
             def available_views
               if options[:singleton]
-                %w(new create edit show destroy _form)
+                %w(edit show _form)
               else
                 available_views_old
               end
@@ -47,22 +47,20 @@ module Ixtlan
       end
 
       config.before_initialize do |app|
-        app.config.class.class_eval do
-          attr_accessor :configuration_model
-          def configuration_model=(clazz)
-            clazz.send(:include, Ixtlan::Core::ConfigurationManager) #unless clazz.kind_of?(Ixtlan::Core::ConfigurationManager)
-            @configuration_model = clazz
-          end
-        end
+        app.config.configuration_manager = Configuration::Manager.new
+
         ::ActionController::Base.send(:include, Ixtlan::Core::ExtraHeaders)
         ::ActionController::Base.send(:include, Ixtlan::Core::XFrameHeaders)
         ::ActionController::Base.send(:include, Ixtlan::Core::XContentTypeHeaders)
         ::ActionController::Base.send(:include, Ixtlan::Core::XXssProtectionHeaders)
         ::ActionController::Base.send(:include, Ixtlan::Core::CacheHeaders)
 
-        app.config.middleware.use Ixtlan::Core::ConfigurationRack
+        app.config.middleware.use(Ixtlan::Core::ConfigurationRack, app.config.configuration_manager)
       end
+
       config.after_initialize do |app|
+        app.config.configuration_manager.setup(app.config.configuration_model) if app.config.respond_to? :configuration_model
+        
         if defined? ::DataMapper
 
           ::DataMapper::Resource.send(:include, 

data/spec/configuration_manager_spec.rb

@@ -1,5 +1,6 @@
 require 'ixtlan/core/configuration_manager'
 require 'slf4r/ruby_logger'
+require 'active_support/core_ext/string'
 
 class ConfigModel
 
@@ -25,19 +26,23 @@ class ConfigModel
   end
 end
 
-describe Ixtlan::Core::ConfigurationManager do
+describe Ixtlan::Core::Configuration::Manager do
 
   before :all do
-    ConfigModel.send :include, Ixtlan::Core::ConfigurationManager
+    ConfigModel.send :include, Ixtlan::Core::Configuration::Module
   end
 
   it "should register listeners and fire change events" do
     count = 0
-    ConfigModel.instance.register("counter") do
+    clazz = nil
+    subject.register("counter") do |c|
       count += 1
+      clazz = c.class
     end
-    ConfigModel.instance.save
+    subject.setup(:config_model)
+    subject.configure
     count.should == 1
+    clazz.should == ConfigModel
   end
   
   it "should use instance method only once per thread" do

metadata

@@ -2,7 +2,7 @@
 name: ixtlan-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-15 00:00:00 +05:30
+date: 2011-11-04 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency