dotcfg 0.0.1.1 → 0.0.1.12

data/lib/dotcfg.rb

@@ -4,38 +4,35 @@ require 'yaml'
 # uses JSON or YAML for serialization
 # top-level structure is object/hash/dict
 #
-# provide and prefer method-based access to str/sym/etc keys
 # e.g.
 # d = DotCfg.new('~/.dotcfg')
-# d.hello = 'world'
-# d.hello
+# d['hello'] = 'world'
+# d['hello']
 # => "world"
 # d.save
-# d.get = "bent"
+# d['get'] = "bent"
 # d.load
-# d.get
+# d['get']
 # => nil
 #
 class DotCfg
   def self.normalize key
     case key
     when Numeric, Symbol
-      key
+      key                # pass thru
     when String
       # leading numerics are invalid
       raise "invalid key: #{key}" if key[0,1] == '0' or key[0,1].to_i != 0
-      key.downcase.gsub(/\W/, '_').to_sym
+      key.downcase.gsub(/[\W_]+/, '_').gsub(/_\z/, '').to_sym
     else
       raise "invalid key: #{key} (#{key.class})"
     end
   end
 
-  DEFAULT = {}
-
   PROCS = {
     json: {
       to: proc { |data| data.to_json },
-      from: proc { |json| YAML.load json },
+      from: proc { |json| JSON.parse json }, # YAML.load json },
       pretty: proc { |data| JSON.pretty_generate data },
     },
     yaml: {
@@ -45,94 +42,90 @@ class DotCfg
     },
   }
 
-  attr_reader :filename, :format, :storage
+  attr_reader :filename, :format
 
   def initialize filename, format = :json
     @filename = File.expand_path filename
     @format = format
-    File.exists?(@filename) ? self.load : self.reset
+    @cfg = Hash.new
+    File.exists?(@filename) ? self.try_load : self.reset
   end
 
-
-  # manipulate @storage
   #
+  # @cfg manipulation
+  #
+
   def [] key
     key = self.class.normalize key
-    @storage[key] or @storage[key.to_s]
+    @cfg[key] or @cfg[key.to_s]
   end
-  #
+
   def []= key, value
-    @storage[self.class.normalize(key)] = value
+    @cfg[self.class.normalize key] = value
   end
-  #
+
   def delete key
-    @storage.delete(self.class.normalize(key))
+    @cfg.delete self.class.normalize key
   end
-  #
-  def method_missing key, *args
-    if key[-1,1] == '='
-      self[key[0, key.length - 1]] = args.first
-    else
-      self[key]
-    end
+
+  # if you need to call this, you might be Doing It Wrong (tm)
+  def to_h
+    @cfg
   end
+
   #
-  def respond_to? key, *args
-    true
-  end
+  # serialization, using PROCS
   #
-  # end simple @storage manipulation
-
 
-  # serialization, based on PROCS
-  #
   def serialize
-    raise "invalid storage" unless @storage.is_a? Hash
-    self.class::PROCS.fetch(@format)[:to].call @storage
+    raise "invalid storage" unless @cfg.is_a? Hash
+    self.class::PROCS.fetch(@format)[:to].call @cfg
   end
-  #
+
   def deserialize junk
     data = self.class::PROCS.fetch(@format)[:from].call junk
-    raise "invalid junk: #{junk} (#{junk.class})" unless data.is_a? Hash
+    unless data.is_a? Hash
+      raise ArgumentError, "invalid junk: #{junk} (#{junk.class})"
+    end
     data.each { |k, v| self[k] = v }
-    @storage
-  end
-  #
-  def dump
-    self.class::PROCS.fetch(@format)[:pretty].call @storage
+    @cfg
   end
-  #
-  # end serialization
 
+  def pretty
+    self.class::PROCS.fetch(@format)[:pretty].call @cfg
+  end
 
+  #
   # file operations
   #
+
   def save
     File.open(@filename, 'w') { |f| f.write self.serialize }
   end
-  #
+
   def load
+    File.open(@filename, 'r') { |f| self.deserialize f.read }
+  end
+
+  def try_load
     rescues = 0
     begin
-      File.open(@filename, 'r') { |f| @storage = self.deserialize f.read }
-    rescue Exception => e
+      self.load
+    rescue SystemCallError, ArgumentError, JSON::ParserError => e
       rescues += 1
       puts  "#{e} (#{e.class})"
       if rescues < 2
         puts "Resetting #{@filename}"
-        reset
+        self.reset
         retry
       end
-      puts "load failed!"
+      puts "try_load failed!"
       raise e
     end
   end
-  #
+
   def reset
-    @storage = DEFAULT.dup
-    save
+    @cfg = Hash.new
+    self.save
   end
-  #
-  # end file operations
-
 end

data/rakefile.rb

@@ -6,6 +6,7 @@ Buildar.new do |b|
   b.version_file = 'VERSION'
   b.gemspec.name = 'dotcfg'
   b.gemspec.summary = 'simple filesystem de/serialization for app configs'
+  b.gemspec.homepage = 'https://github.com/rickhull/dotcfg'
   b.gemspec.author = 'Rick Hull'
   b.gemspec.license = 'MIT'
   b.gemspec.description = 'JSON and YAML config serialization and synch'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotcfg
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - rakefile.rb
 - lib/dotcfg.rb
-homepage: 
+homepage: https://github.com/rickhull/dotcfg
 licenses:
 - MIT
 post_install_message: