nucleon 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f37db6374efb2285de5bd242cce45eb5817e2d5
-  data.tar.gz: d5fd9959abf368f329756ea44c24d844a0dc5ea3
+  metadata.gz: e2a05325532059ef176a3aa70f8b9cd37379821b
+  data.tar.gz: 00042b162c3c7793f8b1f631a96eddbd516322d6
 SHA512:
-  metadata.gz: eb017436c867b27eb087ef11e1de3cde238f65777a49fb3eaa0120e0dac595ccee944c60a67ec1de90a98b33edf8ef7bad02d98d36fa95de283413846a9aa7e4
-  data.tar.gz: 23db6461c2f61e51d6497ff6329d6588c66e01c34edece43a1356cd4e138a724f0f85b471c5ac5ba51883bcbbfce8e34c5ef55cd30d4d9c336a2705244507f03
+  metadata.gz: f3e768ca2276d0e30090b0a8f92aaea30943a47d009139bc8e90de6df58b7355151c72600515c01a14533c8b960476d69306731a3e0428ad962b81ba7d0c483d
+  data.tar.gz: b1887ddeaa81bd46acdf6bb5dc7b1bdac3ce0dce2d9520884c1f83637427ab93d1640925198764ea0f5f0547ddcbc6e6cfa7f72ab640d327c4d1eacd8b6c9cfe

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/core/plugin/action.rb

@@ -580,13 +580,26 @@ class Action < Nucleon.plugin_class(:nucleon, :base)
 
     search_action = lambda do |components|
       unless components.empty?
+        index             = action_index
         action_id         = components.is_a?(Array) ? components.flatten.join('::') : components
         action_id_pattern = action_id.gsub('::', ':.*:')
 
-        action_index.each do |loaded_action_id, loaded_action_info|
-          if loaded_action_id.match(/(^|\:)#{action_id_pattern.gsub(/\-/, '\-')}(\:|$)/)
+        # Check for exact matches
+        index.each do |loaded_action_id, loaded_action_info|
+          if loaded_action_id.match(/^[^\:]+\:\:#{action_id.gsub(/\-/, '\-')}$/)
             loaded_action_info[:action_id] = loaded_action_id
             actions_found << loaded_action_info
+            break
+          end
+        end
+
+        if actions_found.empty?
+          # Check for similarly named actions
+          index.each do |loaded_action_id, loaded_action_info|
+            if loaded_action_id.match(/(^|\:)#{action_id_pattern.gsub(/\-/, '\-')}(\:|$)/)
+              loaded_action_info[:action_id] = loaded_action_id
+              actions_found << loaded_action_info
+            end
           end
         end
       end

data/lib/core/util/cache.rb

@@ -2,74 +2,74 @@
 module Nucleon
 module Util
 class Cache < Core
-  
+
   @@cache_lock = Mutex.new
- 
+
   #-----------------------------------------------------------------------------
-  
+
   # This class already inherits much of what we need from the core config class.
   # Right now we just have to worry about persistence
- 
+
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
-     
+
   def initialize(root_path, id, cache_dir = '.cache', force = true)
     super({}, {}, force)
-    
-    @cache_dir  = cache_dir    
-    @cache_root = File.join(root_path, cache_dir)    
+
+    @cache_dir  = cache_dir
+    @cache_root = File.join(root_path, cache_dir)
     FileUtils.mkdir_p(base_path) unless File.directory?(base_path)
-    
+
     @cache_id         = id.to_sym
     @cache_translator = Nucleon.type_default(:nucleon, :translator)
     @cache_filename   = "#{id}.#{translator}"
     @cache_path       = File.join(@cache_root, @cache_filename)
-    
+
     load
   end
-      
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def status
     @status
   end
-  
+
   #---
-  
+
   def base_path
     @cache_root
   end
-  
+
   #---
-  
+
   def directory_name
     @cache_dir
   end
-  
+
   #---
-  
+
   def id
     @cache_id
   end
-  
+
   #---
-  
+
   def translator
     @cache_translator
   end
-  
+
   #---
-    
+
   def file
     @cache_path
   end
-  
+
   #---
-  
+
   def get(keys, default = nil, format = false)
     result = super(keys, nil)
-    
+
     if result.nil?
       load
       result = super(keys, nil)
@@ -79,88 +79,86 @@ class Cache < Core
   end
 
   #---
-  
+
   def set(keys, value, delete_nil = false)
     result = super
     save if initialized?
     result
   end
-   
+
   #---
-  
+
   def delete(keys, default = nil)
     result = super
     save if initialized?
     result
   end
-  
+
   #---
-  
+
   def clear
     result = super
     save if initialized?
     result
   end
-  
+
   #-----------------------------------------------------------------------------
   # Operations
-  
+
   def import_base(properties, options = {})
     config = Config.ensure(options)
-    
+
     result = super
     save if initialized? && ! config.get(:no_save, false)
     result
   end
-  
+
   #---
-  
+
   def load
     success = false
     @status = 255
-    
-    @@cache_lock.synchronize do  
+
+    @@cache_lock.synchronize do
       logger.info("Loading #{translator} translated cache from #{file}")
-          
+
       parser = CORL.translator({}, translator)
-      raw    = Disk.read(file)    
-        
+      raw    = Disk.read(file)
+
       if parser && raw && ! raw.empty?
-        logger.debug("Cache file contents: #{raw}")            
+        logger.debug("Cache file contents: #{raw}")
         parse_properties = Data.hash(parser.parse(raw))
-        
+
         Nucleon.remove_plugin(parser)
-        
+
         import(parse_properties, { :no_save => true }) unless parse_properties.empty?
         success = true
         @status = Nucleon.code.success
       end
-    end  
-    success   
+    end
+    success
   end
-  protected :load
-  
+
   #---
-  
+
   def save
     success = false
     @status = 255
-    
+
     @@cache_lock.synchronize do
       if renderer = CORL.translator({}, translator)
         rendering = renderer.generate(export)
-        
+
         Nucleon.remove_plugin(renderer)
-          
+
         if Disk.write(file, rendering)
           success = true
           @status = Nucleon.code.success
         end
       end
     end
-    success   
+    success
   end
-  protected :save 
 end
 end
 end

data/lib/nucleon_base.rb

@@ -452,6 +452,10 @@ end
 #
 require 'rubygems'
 #
+# Extra time functions
+#
+require 'time'
+#
 # Basic CLI option parsing
 #
 require 'optparse'

data/nucleon.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nucleon 0.2.9 ruby lib
+# stub: nucleon 0.2.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2015-02-19"
+  s.date = "2015-02-26"
   s.description = "\nA framework that provides a simple foundation for building Ruby applications that are:\n\n* Highly configurable (with both distributed and persistent configurations)\n* Extremely pluggable and extendable\n* Easily parallel\n\nNote: This framework is still very early in development!\n"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["nucleon"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r