active_event 0.5.2 → 0.5.3

data/lib/active_event/support/attr_setter.rb

@@ -1,29 +1,31 @@
-module ActiveEvent::Support
-  # Allows to initialize and set attributes with a hash
-  #
-  # example:
-  #   class RgbColor
-  #     include ActiveEvent::AttrSetter
-  #     attributes :r, :g, :b
-  #   end
-  #   green = RgbColor.new r: 250, g: 20, b: 20
-  #   green.r = 255
-  module AttrSetter
-    extend ActiveSupport::Concern
-    include ActiveEvent::Support::AttrInitializer
-
-    # override to skip the freezing!
-    def init_attributes(attributes)
-      self.attributes = attributes.symbolize_keys
-    end
-
-    module ClassMethods
-      def attributes(*args)
-        super
-        args.each do |attr|
-          define_method "#{attr}=", lambda { |value| attributes[attr] = value }
-        end
-      end
-    end
-  end
-end
+module ActiveEvent
+  module Support
+    # Allows to initialize and set attributes with a hash
+    #
+    # example:
+    #   class RgbColor
+    #     include ActiveEvent::AttrSetter
+    #     attributes :r, :g, :b
+    #   end
+    #   green = RgbColor.new r: 250, g: 20, b: 20
+    #   green.r = 255
+    module AttrSetter
+      extend ActiveSupport::Concern
+      include ActiveEvent::Support::AttrInitializer
+
+      # override to skip the freezing!
+      def init_attributes(attributes)
+        self.attributes = attributes.symbolize_keys
+      end
+
+      module ClassMethods
+        def attributes(*args)
+          super
+          args.each do |attr|
+            define_method "#{attr}=", ->(value) { attributes[attr] = value }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_event/support/autoload.rb

@@ -1,44 +1,46 @@
-module ActiveEvent::Support
-  module Autoload
-    extend ActiveSupport::Concern
-    module ClassMethods
-      def app_path=(path)
-        set_dirs path
-        Autoloader.load_from dirs
-      end
-
-      def reload_module(module_name)
-        path = [parent.name, module_name.to_s].join('::').underscore
-        Autoloader.reload module_name, path
-      end
-
-      def reload
-        Autoloader.reload_from dirs
-      end
-
-      def watchable_dirs
-        watchable_dirs = {}
-        dir_names.each do |dir_name|
-          watchable_dirs[dir_name] = [:rb]
-        end
-        watchable_dirs
-      end
-
-      private
-
-      def dir_names
-        []
-      end
-
-      def set_dirs(path)
-        @dirs = dir_names.map do |dir_name|
-          "#{path}/#{dir_name}/**/*.rb"
-        end
-      end
-
-      def dirs
-        @dirs ||= ''
-      end
-    end
-  end
-end
+module ActiveEvent
+  module Support
+    module Autoload
+      extend ActiveSupport::Concern
+      module ClassMethods
+        def app_path=(path)
+          self.dir_path = path
+          Autoloader.load_from dirs
+        end
+
+        def reload_module(module_name)
+          path = [parent.name, module_name.to_s].join('::').underscore
+          Autoloader.reload module_name, path
+        end
+
+        def reload
+          Autoloader.reload_from dirs
+        end
+
+        def watchable_dirs
+          watchable_dirs = {}
+          dir_names.each do |dir_name|
+            watchable_dirs[dir_name] = [:rb]
+          end
+          watchable_dirs
+        end
+
+        private
+
+        def dir_names
+          []
+        end
+
+        def dir_path=(path)
+          @dirs = dir_names.map do |dir_name|
+            "#{path}/#{dir_name}/**/*.rb"
+          end
+        end
+
+        def dirs
+          @dirs ||= ''
+        end
+      end
+    end
+  end
+end

data/lib/active_event/support/autoloader.rb

@@ -1,38 +1,41 @@
-module ActiveEvent::Support
-  module Autoloader
-    def self.load_from(dirs)
-      Dir[*dirs].each do |file|
-        require file
-      end
-    end
-
-    def self.reload_from(dirs)
-      Dir[*dirs].each do |path|
-        reload get_module_name(path), path
-      end
-    end
-
-    def self.reload(name, path)
-      const_name, namespace_name = name.to_s.split('::').reverse
-      if namespace_name.nil?
-        Object.send(:remove_const, const_name) if Object.const_defined?(const_name)
-      else
-        namespace = const_get(namespace_name)
-        namespace.send(:remove_const, const_name) if namespace.const_defined?(const_name)
-      end
-      $".delete_if { |s| s.include?(path) }
-      require path
-    end
-
-    private
-    def self.get_module_name(path)
-      segments = path.split('/')
-      seg = if 1 == (segments.length - 2) - (segments.index('app') || segments.index('domain')) #no namespace
-              segments.last.split('.').first
-            else
-              [segments[-2], segments.last.split('.').first].join('/')
-            end
-      seg.camelcase.to_sym
-    end
-  end
-end
+module ActiveEvent
+  module Support
+    module Autoloader
+      def self.load_from(dirs)
+        Dir[*dirs].each do |file|
+          require file
+        end
+      end
+
+      def self.reload_from(dirs)
+        Dir[*dirs].each do |path|
+          reload get_module_name(path), path
+        end
+      end
+
+      def self.reload(name, path)
+        const_name, namespace_name = name.to_s.split('::').reverse
+        if namespace_name.nil?
+          Object.send(:remove_const, const_name) if Object.const_defined?(const_name)
+        else
+          namespace = const_get(namespace_name)
+          namespace.send(:remove_const, const_name) if namespace.const_defined?(const_name)
+        end
+        $LOADED_FEATURES.delete_if { |s| s.include?(path) }
+        require path
+      end
+
+      private
+
+      def self.get_module_name(path)
+        segments = path.split('/')
+        seg = if 1 == (segments.length - 2) - (segments.index('app') || segments.index('domain')) # no namespace
+                segments.last.split('.').first
+              else
+                [segments[-2], segments.last.split('.').first].join('/')
+              end
+        seg.camelcase.to_sym
+      end
+    end
+  end
+end

data/lib/active_event/support/multi_logger.rb

@@ -1,28 +1,31 @@
-require 'logger'
-module ActiveEvent::Support
-  class MultiLogger
-    [:info, :debug, :error, :fatal, :warn, :unknown, ].each do |action|
-      define_method action do |msg|
-        @loggers.each do |logger|
-          logger.send(action, msg)
-        end
-      end
-    end
-
-    def initialize(progname = nil, formatter = nil)
-      @loggers = []
-      @loggers << Logger.new(STDOUT)
-      @loggers << Logger.new("log/disco.log")
-      @loggers.each do |logger|
-        logger.progname = progname if progname.present?
-        logger.formatter = if formatter.present?
-                             formatter
-                           else
-                             proc do |severity, datetime, progname, msg|
-                               "#{datetime}: [#{progname}][#{severity}]: #{msg}\n"
-                             end
-                           end
-      end
-    end
-  end
-end
+require 'logger'
+
+module ActiveEvent
+  module Support
+    class MultiLogger
+      [:info, :debug, :error, :fatal, :warn, :unknown].each do |action|
+        define_method action do |msg|
+          @loggers.each do |logger|
+            logger.send(action, msg)
+          end
+        end
+      end
+
+      def initialize(progname = nil, formatter = nil)
+        @loggers = []
+        @loggers << Logger.new(STDOUT)
+        @loggers << Logger.new('log/disco.log')
+        @loggers.each do |logger|
+          logger.progname = progname if progname.present?
+          logger.formatter = if formatter.present?
+                               formatter
+                             else
+                               proc do |severity, datetime, pprogname, msg|
+                                 "#{datetime}: [#{pprogname}][#{severity}]: #{msg}\n"
+                               end
+                             end
+        end
+      end
+    end
+  end
+end

data/lib/active_event/validations.rb

@@ -1,68 +1,68 @@
-module ActiveEvent
-  module Validations
-    extend ActiveSupport::Concern
-    include ActiveModel::Validations
-
-    def self.included(base)
-      super
-      base.extend const_get('RegisterMethods')
-    end
-
-    module RegisterMethods
-      def skip_validate(*args)
-        options = args.extract_options!
-        if options.key?(:on)
-          options = options.dup
-          options[:if] = Array(options[:if])
-          options[:if].unshift("validation_context == :#{options[:on]}")
-        end
-        args << options
-        skip_callback(:validate, *args)
-      end
-
-      def skip_validates(*attributes)
-        defaults = attributes.extract_options!.dup
-        validations = defaults.slice!(*_validates_default_keys)
-
-        return if attributes.empty?
-        return if validations.empty?
-
-        defaults[:attributes] = attributes
-
-        validations.each do |key, options|
-          next unless options
-          key = "#{key.to_s.camelize}Validator"
-
-          begin
-            validator = key.include?('::') ? key.constantize : const_get(key)
-          rescue NameError
-            raise ArgumentError, "Unknown validator: '#{key}'"
-          end
-
-          skip_validates_with(validator, defaults.merge(_parse_validates_options(options)))
-        end
-      end
-
-      def skip_validates_with(*args)
-        options = args.extract_options!
-        args.each do |klass|
-          validator = klass.new(options)
-
-          if validator.respond_to?(:attributes) && !validator.attributes.empty?
-            validator.attributes.each do |attribute|
-              _validators[attribute.to_sym].reject! { |x| x.instance_of? klass } if _validators.key? attribute.to_sym
-            end
-          else
-            _validators[nil].reject! { |x| x.instance_of? klass }
-          end
-
-          skip_validate(validator, options)
-        end
-      end
-
-      def validation_target(target)
-        ValidationsRegistry.register self, target
-      end
-    end
-  end
-end
+module ActiveEvent
+  module Validations
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+
+    def self.included(base)
+      super
+      base.extend const_get('RegisterMethods')
+    end
+
+    module RegisterMethods
+      def skip_validate(*args)
+        options = args.extract_options!
+        if options.key?(:on)
+          options = options.dup
+          options[:if] = Array(options[:if])
+          options[:if].unshift("validation_context == :#{options[:on]}")
+        end
+        args << options
+        skip_callback(:validate, *args)
+      end
+
+      def skip_validates(*attributes)
+        defaults = attributes.extract_options!.dup
+        validations = defaults.slice!(*_validates_default_keys)
+
+        return if attributes.empty?
+        return if validations.empty?
+
+        defaults[:attributes] = attributes
+
+        validations.each do |key, options|
+          next unless options
+          key = "#{key.to_s.camelize}Validator"
+
+          begin
+            validator = key.include?('::') ? key.constantize : const_get(key)
+          rescue NameError
+            raise ArgumentError, "Unknown validator: '#{key}'"
+          end
+
+          skip_validates_with(validator, defaults.merge(_parse_validates_options(options)))
+        end
+      end
+
+      def skip_validates_with(*args)
+        options = args.extract_options!
+        args.each do |klass|
+          validator = klass.new(options)
+
+          if validator.respond_to?(:attributes) && !validator.attributes.empty?
+            validator.attributes.each do |attribute|
+              _validators[attribute.to_sym].reject! { |x| x.instance_of? klass } if _validators.key? attribute.to_sym
+            end
+          else
+            _validators[nil].reject! { |x| x.instance_of? klass }
+          end
+
+          skip_validate(validator, options)
+        end
+      end
+
+      def validation_target(target)
+        ValidationsRegistry.register self, target
+      end
+    end
+  end
+end

data/lib/active_event/validations_registry.rb

@@ -1,18 +1,18 @@
-module ActiveEvent
-  class ValidationsRegistry
-
-    def self.register(validations, target)
-      self.bindings << {validation: validations, target: target}
-    end
-
-    def self.build
-      self.bindings.freeze.each do |binding|
-        Object.const_get(binding[:target].to_s).send :include, binding[:validation]
-      end
-    end
-
-    private
-    cattr_accessor :bindings
-    self.bindings = []
-  end
-end
+module ActiveEvent
+  class ValidationsRegistry
+    def self.register(validations, target)
+      bindings << {validation: validations, target: target}
+    end
+
+    def self.build
+      bindings.freeze.each do |binding|
+        Object.const_get(binding[:target].to_s).send :include, binding[:validation]
+      end
+    end
+
+    private
+
+    cattr_accessor :bindings
+    self.bindings = []
+  end
+end