jerakia 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a0ffdcc717ef8705465da1d89d701353e31a4d
-  data.tar.gz: a40d224bb84863097b2b1e4d877aa5b8bfbed9c7
+  metadata.gz: 733f3ff0ffece8cc45246f1e4e4657c6e7729618
+  data.tar.gz: 4a493d69a56e2cff5eea275fd38201ccfaab6261
 SHA512:
-  metadata.gz: a1e2f422baea90e6bc37df8bd5ed1b9717b41a3968b4eb44ad50dfa80eb1defdc11461da6f57e749fd074d4a986a9f135ea9ddee6797fcd9a73ef14dcca0e9b5
-  data.tar.gz: a6f211698de9b7286b674e76285f9720bc7c50a70f5bb9d9d121610592fae36ecf5d0bb858fdaf54ea7268d3108f93f322514a5f4cefbe8d963b02ac9c61d931
+  metadata.gz: b5d658a3e2ef290b4fd29ca1a0bb2571c1b604793234464b699562e4972f02d6b226006b1ec725c6b513983f96dc6017ec39792d9b1e0df382ae0fbd1d1e4792
+  data.tar.gz: 8415c0e24ef76f3250f430b7e3085395226ce4f2014a6cfa2e3ea1dac29926d223872ac9025fda3566aee6562716f5ec6a0e42ddf07c18b4cb68c109aeeb51e2

data/lib/jerakia.rb

@@ -17,7 +17,6 @@ class Jerakia
     configfile = options[:config] || '/etc/jerakia/jerakia.yml'
     @@config = Jerakia::Config.new(configfile)
     @@filecache = {}
-    @@cache = Jerakia::Cache.new
     loglevel = options[:loglevel] || @@config["loglevel"] || "info"
     @@log = Jerakia::Log.new(loglevel.to_sym)
     @@log.debug("Jerakia initialized")
@@ -42,10 +41,6 @@ class Jerakia
     exit 1
   end 
 
-  def self.config
-    @@config
-  end
-
   def self.filecache(name)
     @@filecache[name] ||= File.read(name)
     return @@filecache[name]
@@ -55,9 +50,15 @@ class Jerakia
     @@filecache[name] = data
   end
 
+  def self.config
+    @@config
+  end
+
+
   def log
     @@log
   end
+  
 
   def self.log
     @@log

data/lib/jerakia/cache.rb

@@ -4,12 +4,14 @@
 #
 class Jerakia::Cache
 
+  @@bucket = {}
+
   def initialize
-    @@bucket = {}
   end
 
-  def bucket_add(index,data)
-    @@bucket[index] = data
+  def add(index,data)
+    @@bucket[index] ||= {}
+    @@bucket[index][:content] = data
     data
   end
 
@@ -17,6 +19,15 @@ class Jerakia::Cache
     @@bucket.has_key?(index)
   end
 
+  ## default behaviour is always validate if exists.
+  def valid?(index)
+    in_bucket?(index)
+  end
+  
+  def get(index)
+    @@bucket[index][:content]
+  end
+
   def bucket
     @@bucket
   end

data/lib/jerakia/cache/entry.rb

@@ -0,0 +1,17 @@
+class Jerakia::Cache::Entry
+
+  attr_accessor :key
+  attr_accessor :content
+  @@cache = Jerakia::Cache.new
+
+  def initialize(key='', content='')
+    @@cache.add(key, self)   
+  end
+
+  def valid?
+    true
+  end
+end
+
+
+

data/lib/jerakia/cache/file.rb

@@ -0,0 +1,33 @@
+require 'jerakia/cache'
+
+class Jerakia::Cache::File < Jerakia::Cache
+  
+  
+  def initialize
+    super
+  end
+
+
+  def state(filename)
+    if ::File.exists?(filename)
+      ::File.stat(filename).mtime
+    else
+      nil
+    end
+  end
+
+  def add(index,data)
+    @@bucket[index] ||= {}
+    @@bucket[index][:state] = state(index)
+    super
+  end
+
+  def valid?(index)
+    if in_bucket?(index)
+      @@bucket[index][:state] == state(index)
+    else
+      false
+    end
+  end
+
+end

data/lib/jerakia/datasource.rb

@@ -1,5 +1,5 @@
 require 'jerakia/cache'
-class Jerakia::Datasource < Jerakia::Cache
+class Jerakia::Datasource 
 
   require 'jerakia/response'
   attr_reader :response

data/lib/jerakia/datasource/file.rb

@@ -1,7 +1,12 @@
+require 'jerakia/cache/file'
+
+
 class Jerakia::Datasource
   module File
 
     attr_reader :file_format
+    @@cache = Jerakia::Cache::File.new
+
     def load_format_handler
       format = options[:format] || :yaml
       class_name=format.to_s.capitalize
@@ -9,29 +14,33 @@ class Jerakia::Datasource
       @file_format = eval "Jerakia::Datasource::File::#{class_name}"
     end
 
+
+    def cache
+      @@cache
+    end
+
     def read_from_file(fname)
       fpath = []
       fpath << options[:docroot] unless fname[0] == '/'
       fpath << [ fname, lookup.request.namespace ]
-      diskname = ::File.join(fpath.flatten).gsub(/\/$/, '')
 
-      Jerakia.log.debug("read_from_file() #{fname} using diskname #{diskname}")
+      extension = options[:extension] || @file_format::EXTENSION
+      diskname = "#{::File.join(fpath.flatten).gsub(/\/$/, '')}.#{extension}"
+      
 
-      import_args=[]
-      import_args << diskname
-      import_args << options[:extension] if options[:extension]
+      Jerakia.log.debug("read_from_file()  #{diskname}")
 
-      cache_index={ :diskname => diskname, :format => options[:format] }
+     
       if options[:enable_caching]
-        if in_bucket?(cache_index) 
-          Jerakia.log.debug("returning cached data #{bucket[cache_index]}")
-          bucket[cache_index]
+        if cache.valid?(diskname) 
+          Jerakia.log.debug("Returning cached data")
+          cache.get(diskname)
         else
-          Jerakia.log.debug("adding to cache #{@file_format.import_file(*import_args)}")
-          bucket_add(cache_index,@file_format.import_file(*import_args))
+          Jerakia.log.debug("Adding contents of #{diskname} to cache")
+          cache.add(diskname,@file_format.import_file(diskname))
         end
       else
-        @file_format.import_file(*import_args)
+        @file_format.import_file(diskname)
       end
     end
 

data/lib/jerakia/datasource/file/yaml.rb

@@ -1,13 +1,15 @@
 class Jerakia::Datasource
   module File
     class Yaml
+
+      EXTENSION='yaml'
+
       class << self
       require 'yaml'
-      def import_file(fname, extension='yml')
-        diskfile="#{fname}.#{extension}"
-        Jerakia.log.debug("scanning file #{diskfile}")
-        return {} unless ::File.exists?(diskfile)
-        data=::File.read(diskfile)
+      def import_file(fname)
+        Jerakia.log.debug("scanning file #{fname}")
+        return {} unless ::File.exists?(fname)
+        data=::File.read(fname)
         YAML.load(data)
       end
       end

data/lib/jerakia/log.rb

@@ -37,9 +37,9 @@ class Jerakia::Log < Jerakia
 #    self.new.error msg
 #  end
 #
-  def self.debug(msg)
-    self.new.debug msg
-  end
+#  def self.debug(msg)
+#    self.new.debug msg
+#  end
 #
 ##  def self.info(msg)
 #    puts @@logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Craig Dunn
@@ -22,6 +22,8 @@ files:
 - lib/jerakia.rb
 - lib/jerakia/answer.rb
 - lib/jerakia/cache.rb
+- lib/jerakia/cache/entry.rb
+- lib/jerakia/cache/file.rb
 - lib/jerakia/config.rb
 - lib/jerakia/datamodel.rb
 - lib/jerakia/datasource.rb