canfig 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d7a71f3425215cb0226cd0f6eeabc7912dd552
-  data.tar.gz: 378a6def629c7ed263384211bf8361fbe28338a6
+  metadata.gz: 19205ebc7b976f9e5d9f15a0a891699687f48c28
+  data.tar.gz: a1832b75a3870d72dbc3c303c2a1c154bd51db34
 SHA512:
-  metadata.gz: cbf3b023b2f8853dcbd0d5731baa98f9de2995ece01982da2718fe7919724efb7b4de7d350054330cf0749aaa7a5cd3c362f74db340e42c4521ca993800bbe09
-  data.tar.gz: bb8e16f4eaee8db347246e7e45e5abcf16a673c1bb1eacab89b76f930a8eeac3d4abee81c638d208ef061e1b2115286bab8608078f5d09919ef949a3da65c14d
+  metadata.gz: ffce29c8ae20dfc4714b4a447f542cb4310f8fa12297b3eb35afc8669b5853d82df314fc7b2244ccf4c3a0877df5f389edd245345954b10f2f6c468e29552dc4
+  data.tar.gz: 4c60c5327c9207c5811d08bd73700f5ac3cdc8ff0f817123b3935ff557b7d7c1ee42ce59955c4e6b9f9850657930fdb985568e23ecf54b60f91a109372f374d6

data/lib/canfig/config.rb

@@ -1,14 +1,21 @@
 module Canfig
   class Config
 
-    def configure(argh={}, &block)
+    def configure(argh={}, file=nil, &block)
       save_state! do
+        configure_with_file file unless file.nil?
         configure_with_args argh
         configure_with_block &block
       end
       self
     end
 
+    def configure_with_file(file)
+      save_state! do
+        configure_with_args(Canfig::YAML.new(file).load)
+      end
+    end
+
     def configure_with_args(argh)
       save_state! do
         argh.symbolize_keys.each { |key,val| set(key, val) }
@@ -47,7 +54,7 @@ module Canfig
     end
 
     def changed
-      Hash[@state.map { |key,val| [key, [@saved_state[key], val]] if @saved_state[key] != val }.compact]
+      Hash[@allowed.map { |key| [key, [@saved_state[key], @state[key]]] if @saved_state[key] != @state[key] }.compact]
     end
 
     def changed?(key)
@@ -102,7 +109,7 @@ module Canfig
 
     def initialize(*args, &block)
       options = args.extract_options!
-      @allowed = (args + options.symbolize_keys.keys).uniq.map(&:to_sym)
+      @allowed = (args.map(&:to_sym) + options.symbolize_keys.keys).uniq
       @state = {}
       enable_state_saves!
       configure options, &block

data/lib/canfig/module.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 module Canfig
   module Module
     def self.included(base)
-      base.send :cattr_reader, :configuration
+      base.send :mattr_reader, :configuration
       base.send :class_variable_set, :@@configuration, Canfig::OpenConfig.new
       base.send :extend, ClassMethods
     end

data/lib/canfig/open_config.rb

@@ -1,11 +1,12 @@
 module Canfig
   class OpenConfig < Config
-    def allowed?(opt)
-      true
+    def set(key, val)
+      super(key, val)
+      @allowed << key unless @allowed.include?(key)
     end
 
-    def to_h
-      @state.to_h
+    def allowed?(opt)
+      true
     end
   end
 end

data/lib/canfig/version.rb

@@ -1,3 +1,3 @@
 module Canfig
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/canfig/yaml.rb

@@ -0,0 +1,25 @@
+module Canfig
+  class YAML
+    attr_reader :file
+
+    def initialize(file)
+      @file = file
+    end
+
+    def load
+      @data ||= ::YAML.load_file(file).symbolize_keys
+    end
+    alias_method :data, :load
+
+    def reload
+      @data = nil
+      self.load
+    end
+
+    def write
+      File.open(file, 'w') do |f|
+        f.write(::YAML.dump(data))
+      end
+    end
+  end
+end

data/lib/canfig.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/keys'
 require 'canfig/version'
+require 'canfig/yaml'
 require 'canfig/config'
 require 'canfig/open_config'
 require 'canfig/module'

data/spec/canfig/yaml_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+RSpec.describe Canfig::YAML do
+  subject { described_class.new('spec/fixtures/config.yml') }
+
+  describe '#load' do
+    it 'loads the file into a hash' do
+      expect(subject.load).to be_a(Hash)
+    end
+  end
+
+  describe '#write' do
+    subject { described_class.new('spec/fixtures/test.yml') }
+
+    before do
+      FileUtils.cp 'spec/fixtures/config.yml', 'spec/fixtures/test.yml'
+    end
+
+    it 'writes the hash back to the file in YAML' do
+      subject.data[:foo] = 'bar'
+      subject.write
+      subject.reload
+      expect(subject.data[:foo]).to eq('bar')
+    end
+
+    after do
+      FileUtils.rm 'spec/fixtures/test.yml'
+    end
+  end
+
+  describe '#reload' do
+    it 'reloads the data from the file' do
+      subject.data[:foo] = 'bar'
+      subject.reload
+      expect(subject.data[:foo]).to eq('foo')
+    end
+  end
+end

data/spec/fixtures/config.yml

@@ -0,0 +1,3 @@
+foo: 'foo'
+bar: 'bar'
+baz: 'baz'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,9 +66,12 @@ files:
 - lib/canfig/module.rb
 - lib/canfig/open_config.rb
 - lib/canfig/version.rb
+- lib/canfig/yaml.rb
 - spec/canfig/config_spec.rb
 - spec/canfig/open_config_spec.rb
+- spec/canfig/yaml_spec.rb
 - spec/canfig_spec.rb
+- spec/fixtures/config.yml
 - spec/spec_helper.rb
 homepage: http://github.com/markrebec/canfig
 licenses: []
@@ -89,12 +92,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Dead simple canned configuration for gems or whatever
 test_files:
 - spec/canfig/config_spec.rb
 - spec/canfig/open_config_spec.rb
+- spec/canfig/yaml_spec.rb
 - spec/canfig_spec.rb
+- spec/fixtures/config.yml
 - spec/spec_helper.rb