rsettings 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/rsettings/adapters/basic_disk_settings.rb

@@ -24,7 +24,7 @@ class BasicDiskSettings
   end
 
   def get(name)
-    settings[name].tap{|result| notify_missing name unless result}
+    Setting.new(settings[name.value]).tap{|result| notify_missing name if result.missing?}
   end
 
   def file; @file; end

data/lib/rsettings/adapters/environment_settings.rb

@@ -2,7 +2,8 @@ class EnvironmentSettings
   require "audible"; include Audible;
   
   def get(name)
-    ENV[name.to_s].tap{|it| notify_missing(name) if it.nil?}
+    v = ENV[name.value.to_s]
+    Setting.new(v).tap{|it| notify_missing(name) if it.missing?}
   end
 
   private

data/lib/rsettings/core/internal/defaults.rb

@@ -0,0 +1,20 @@
+class Defaults
+  def initialize(names)
+    @names = names
+  end
+  
+  def get(setting)
+    real_name = @names.reverse_for setting
+    Setting.new defaults[real_name]
+  end
+
+  def add(name, value)
+    defaults[name] = value
+  end
+
+  def any?; false == defaults.empty? end 
+
+  private
+
+  def defaults; @defaults ||= {}; end
+end

data/lib/rsettings/core/internal/settings_chain.rb

@@ -0,0 +1,18 @@
+class SettingsChain
+  def initialize(*links)
+    @settings = *links.flatten
+  end
+
+  def link(link)
+    @settings << link
+  end
+
+  def get(name)
+    @settings.each do |setting|
+      result = setting.get(name)
+      return result unless result.missing?
+    end
+
+    Setting.new nil
+  end
+end 

data/lib/rsettings/core/internal/settings_configuration.rb

@@ -0,0 +1,41 @@
+class SettingsConfiguration
+  attr_reader :missing, :settings, :names
+
+  def initialize(&block)
+    @names    = Names.new
+    @defaults = Defaults.new @names
+    @settings = EnvironmentSettings.new
+
+    instance_exec &block if block_given?
+
+    @settings = SettingsChain.new(@settings).tap do |it|
+      it.link @defaults if defaults?
+      it.link tail  
+    end
+  end
+
+  def let(opts = {})
+    @names.add opts
+  end
+
+  def default(name, opts = {})
+    fail "Expected the :to option so I can tell what the default value is" unless opts[:to]
+    @defaults.add name, opts[:to]
+  end
+
+  def when_missing(type)
+    @tail = IgnoreMissing if type === :ignore 
+  end
+
+  def with_settings(opts={})
+    @settings = opts.is_a?(Hash) ? SettingsChain.new(opts[:chain].map{|it| it.new}) : opts.new
+  end
+
+  private
+
+  def tail
+    @tail || FailOnMissing
+  end
+
+  def defaults?; @defaults.any? end
+end

data/lib/rsettings/core/missing.rb

@@ -0,0 +1,15 @@
+module Missing
+  def get(name) 
+    Setting.new nil
+  end
+end
+
+class IgnoreMissing
+  extend Missing
+end
+
+class FailOnMissing
+  class << self
+    def get(name); fail "Setting <#{name.value}> not found"; end
+  end
+end

data/lib/rsettings/core/names.rb

@@ -0,0 +1,21 @@
+class Names
+  require "audible"; include Audible
+  
+  def initialize
+    @opts = {}
+  end
+
+  def add(opts={})
+    notify :adding, opts
+    @opts.merge!(opts.invert)
+  end
+
+  def for(setting)
+    notify :finding, setting
+    @opts[setting.to_s] || @opts[setting.to_sym] || setting
+  end
+
+  def reverse_for(name)
+    @opts.invert[name.value] || name.value
+  end
+end

data/lib/rsettings/core/rsettings.rb

@@ -0,0 +1,29 @@
+class RSettings
+  require "audible"; include Audible
+
+  def initialize(opts={})
+    @settings,@names = opts[:settings],opts[:names] 
+  end
+
+  def find(m)
+    query = m.to_s.end_with? "?"
+
+    m = m.to_s.delete "?" if query
+
+    name = ConvertibleSettingName.new(@names, m)
+    
+    if query
+      value = @settings.get(name)
+
+      fail "Unable to convert setting <#{name.value}> to flag" unless value.truthy?
+      
+      return value.to_s.downcase === "yes"
+    end
+
+    notify :finding, m, name
+
+    result = @settings.get(name)
+
+    result.missing? ? nil : result.to_s
+  end
+end

data/lib/rsettings/core/setting.rb

@@ -0,0 +1,12 @@
+class Setting
+  def truthy?; @truthy; end
+  
+  def initialize(text="")
+    @text = text
+    @truthy = (text||"").downcase.match /(yes|no)/
+  end
+
+  def missing?; @text.nil?; end
+
+  def to_s; @text.to_s; end
+end

data/lib/rsettings/core/setting_name.rb

@@ -0,0 +1,15 @@
+class SettingName
+  attr_reader :value
+
+  def initialize(name)
+    @value = name
+  end
+end
+
+class ConvertibleSettingName
+  def initialize(names, name)
+    @name,@names = name,names
+  end
+  
+  def value; @names.for @name; end
+end

data/lib/rsettings.rb

@@ -10,10 +10,37 @@ class Settings
   def method_missing(m, *args, &block)
     fail "Only support queries, cannot do command <#{m}>" unless args.empty?
 
-    RSettings.new(
+    rsettings = RSettings.new(
       :settings => @conf.settings,
-      :missing => @conf.missing,
       :names => @conf.names
-    ).find m
+    )
+
+    Probe.new rsettings
+
+    rsettings.find m
+  end
+end
+
+class Probe
+  def initialize(names)
+    names.on :finding do |e,args|
+      Log.info "[RSettings] Finding setting for <#{args.first}> by name <#{args[1].value}>"
+    end
+  end
+end
+
+class ConsoleLog
+  class << self
+    def info(what)
+      puts "[INFO] #{what}"
+    end
+  end
+end
+
+class DevNullLog
+  class << self
+    def info(what); end
   end
 end
+
+Log = ENV["LOUD"] == "on" ? ConsoleLog : DevNullLog

data/rsettings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rsettings"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Biddington"]
-  s.date = "2013-12-11"
+  s.date = "2013-12-16"
   s.description = "Settings"
   s.email = "ben.biddington@gmail.com"
   s.extra_rdoc_files = [
@@ -27,16 +27,20 @@ Gem::Specification.new do |s|
     "lib/rsettings.rb",
     "lib/rsettings/adapters/basic_disk_settings.rb",
     "lib/rsettings/adapters/environment_settings.rb",
-    "lib/rsettings/internal/names.rb",
-    "lib/rsettings/internal/rsettings.rb",
-    "lib/rsettings/internal/setting.rb",
-    "lib/rsettings/internal/settings_chain.rb",
-    "lib/rsettings/internal/settings_configuration.rb",
+    "lib/rsettings/core/internal/defaults.rb",
+    "lib/rsettings/core/internal/settings_chain.rb",
+    "lib/rsettings/core/internal/settings_configuration.rb",
+    "lib/rsettings/core/missing.rb",
+    "lib/rsettings/core/names.rb",
+    "lib/rsettings/core/rsettings.rb",
+    "lib/rsettings/core/setting.rb",
+    "lib/rsettings/core/setting_name.rb",
     "rsettings.gemspec",
     "spec/integration.tests/adapters/basic_disk_settings_spec.rb",
     "spec/spec_helper.rb",
     "spec/system.tests/can_fall_back_to_file_settings_spec.rb",
     "spec/system.tests/can_specify_flags_spec.rb",
+    "spec/system.tests/can_supply_defaults_for_missing_settings_spec.rb",
     "spec/system.tests/can_use_env_spec.rb",
     "spec/system.tests/options_spec.rb"
   ]

data/spec/integration.tests/adapters/basic_disk_settings_spec.rb

@@ -7,37 +7,40 @@ describe BasicDiskSettings do
     settings.clear
   end
 
+  let(:a) { SettingName.new :a}
+  let(:b) { SettingName.new :b}
+
   it "can store single setting" do
-    settings.set :name => "value"
+    settings.set :a => "value"
 
-    expect(settings.get(:name)).to eql "value"
+    expect(settings.get(a).to_s).to eql "value"
   end
 
   it "can store multiple settings at once" do
     settings.set :a => "value a", :b => "value b"
 
-    expect(settings.get(:a)).to eql "value a"
-    expect(settings.get(:b)).to eql "value b"
+    expect(settings.get(a).to_s).to eql "value a"
+    expect(settings.get(b).to_s).to eql "value b"
   end
 
   it "overwrites duplicates" do
     settings.set :a => "value a"
     settings.set :a => "another value for a"
 
-    expect(settings.get(:a)).to eql "another value for a"
+    expect(settings.get(a).to_s).to eql "another value for a"
   end
   
   it "overwrites duplicates even when setting the same setting" do
     settings.set :a => "value a", :a => "another value for a"
 
-    expect(settings.get(:a)).to eql "another value for a"
+    expect(settings.get(a).to_s).to eql "another value for a"
   end
 
   it "records all settings when you call set multiple times" do
     settings.set :a => "value a"
     settings.set :b => "value b"
 
-    expect(settings.get(:a)).to_not be_nil
-    expect(settings.get(:b)).to_not be_nil
+    expect(settings.get(a).to_s).to_not be_nil
+    expect(settings.get(b).to_s).to_not be_nil
   end
 end

data/spec/system.tests/can_supply_defaults_for_missing_settings_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe "default values for missing settings" do
+  it "can be configured to use a default when setting is missing" do
+    settings = Settings.new do
+      default :colour, :to => "red"
+    end
+
+    expect(settings.colour).to eql "red"
+  end
+
+  it "can be overwritten -- the last set one wins" do
+    settings = Settings.new do
+      default :colour, :to => "red"
+      default :colour, :to => "gold"
+    end
+
+    expect(settings.colour).to eql "gold"
+  end
+
+  it "you can default a mapped setting" do
+    settings = Settings.new do
+      let "C" => :colour
+      default :colour, :to => "green"
+    end
+
+    expect(settings.colour).to eql "green"
+  end
+
+  it "is ignored if present elsewhere" do
+    settings = Settings.new do
+      default :colour, :to => "red"
+    end
+
+    ENV["colour"] = "pink"
+
+    expect(settings.colour).to eql "pink"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsettings
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audible
@@ -109,16 +109,20 @@ files:
 - lib/rsettings.rb
 - lib/rsettings/adapters/basic_disk_settings.rb
 - lib/rsettings/adapters/environment_settings.rb
-- lib/rsettings/internal/names.rb
-- lib/rsettings/internal/rsettings.rb
-- lib/rsettings/internal/setting.rb
-- lib/rsettings/internal/settings_chain.rb
-- lib/rsettings/internal/settings_configuration.rb
+- lib/rsettings/core/internal/defaults.rb
+- lib/rsettings/core/internal/settings_chain.rb
+- lib/rsettings/core/internal/settings_configuration.rb
+- lib/rsettings/core/missing.rb
+- lib/rsettings/core/names.rb
+- lib/rsettings/core/rsettings.rb
+- lib/rsettings/core/setting.rb
+- lib/rsettings/core/setting_name.rb
 - rsettings.gemspec
 - spec/integration.tests/adapters/basic_disk_settings_spec.rb
 - spec/spec_helper.rb
 - spec/system.tests/can_fall_back_to_file_settings_spec.rb
 - spec/system.tests/can_specify_flags_spec.rb
+- spec/system.tests/can_supply_defaults_for_missing_settings_spec.rb
 - spec/system.tests/can_use_env_spec.rb
 - spec/system.tests/options_spec.rb
 homepage: http://github.com/ben-biddington/rsettings
@@ -136,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -726934447
+      hash: -70081105
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rsettings/internal/names.rb

@@ -1,13 +0,0 @@
-class Names
-  def initialize
-    @opts = {}
-  end
-
-  def add(opts={})
-    @opts.merge! opts.invert
-  end
-
-  def for(setting)
-    @opts[setting] || setting
-  end
-end

data/lib/rsettings/internal/rsettings.rb

@@ -1,29 +0,0 @@
-class RSettings
-  def initialize(opts={})
-    @settings,@missing,@names = opts[:settings],opts[:missing],opts[:names] 
-    
-    @settings.on :missing do |e,args|
-      @missing.on_missing args.first
-    end
-  end
-
-  def find(m)
-    query = m.to_s.end_with? "?"
-
-    m = m.to_s.delete "?" if query
-
-    setting_name = @names.for(m)
-    
-    if query
-      setting_name = @names.for(m)
-
-      value = Setting.new @settings.get(setting_name)
-      
-      fail "Unable to convert setting <#{setting_name}> to flag" unless value.truthy?
-      
-      return value.to_s.downcase === "yes"
-    end
-
-    @settings.get(setting_name)    
-  end
-end

data/lib/rsettings/internal/setting.rb

@@ -1,10 +0,0 @@
-class Setting
-  def truthy?; @truthy; end
-  
-  def initialize(text)
-    @text = text.to_s
-    @truthy = text.downcase.match /(yes|no)/
-  end
-
-  def to_s; @text; end
-end

data/lib/rsettings/internal/settings_chain.rb

@@ -1,22 +0,0 @@
-class SettingsChain
-  require "audible"; include Audible
-
-  def initialize(*links)
-    @settings = *links.flatten.map{|klass| klass.new}
-  end
-
-  def get(name)
-    @settings.each do |setting|
-      result = setting.get(name)
-      return result if result
-    end
-    
-    notify_missing name
-  end
-
-  private
-
-  def notify_missing(name)
-    notify :missing, name
-  end
-end 

data/lib/rsettings/internal/settings_configuration.rb

@@ -1,36 +0,0 @@
-class SettingsConfiguration
-  attr_reader :missing, :settings, :names
-
-  def initialize(&block)
-    @missing = FailOnMissing.new
-    @settings = EnvironmentSettings.new
-    @names = Names.new
-    instance_exec &block if block_given?
-  end
-
-  def let(opts = {})
-    @names.add opts
-  end
-
-  def when_missing(type)
-    @missing = IgnoreMissing.new if type === :ignore 
-  end
-
-  def with_settings(opts={})
-    if opts.is_a? Hash
-      @settings = SettingsChain.new(opts[:chain]) if opts[:chain]
-    else
-      @settings = opts.new
-    end
-  end
-end
-
-class IgnoreMissing
-  def on_missing(name); end
-end
-
-class FailOnMissing
-  def on_missing(name)
-    fail "Setting <#{name}> not found"
-  end
-end