rsettings 0.5.0 → 0.6.0

data/lib/rsettings/adapters/environment_settings.rb

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

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

@@ -1,20 +1,26 @@
-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
+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 
+
+  def inspect
+    defaults.map do |k,v|
+      "setting <#{k}> defaults to <#{v}>"
+    end.join "\n"
+  end
+
+  private
+
+  def defaults; @defaults ||= {}; end
+end

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

@@ -1,18 +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 
+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

@@ -1,41 +1,45 @@
-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
+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 inspect
+    [@defaults.inspect, @names.inspect].join "\n"
+  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

@@ -1,15 +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
+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

@@ -1,21 +1,27 @@
-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
+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
+
+  def inspect
+    @opts.map do |k,v|
+      "setting <#{k}> is translated from <#{v}>"
+    end.join "\n"
+  end
+end

data/lib/rsettings/core/rsettings.rb

@@ -1,29 +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.true?
-    end
-
-    notify :finding, m, name
-
-    result = @settings.get(name)
-
-    result.missing? ? nil : result.to_s
-  end
-end
+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.true?
+    end
+
+    notify :finding, m, name
+
+    result = @settings.get(name)
+
+    result.missing? ? nil : result.to_s
+  end
+end

data/lib/rsettings/core/setting.rb

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

data/lib/rsettings/core/setting_name.rb

@@ -1,15 +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
+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/rsettings.gemspec

@@ -1,79 +1,79 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: rsettings 0.5.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "rsettings"
-  s.version = "0.5.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Biddington"]
-  s.date = "2013-12-23"
-  s.description = "Settings"
-  s.email = "ben.biddington@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/rsettings.rb",
-    "lib/rsettings/adapters/basic_disk_settings.rb",
-    "lib/rsettings/adapters/environment_settings.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_provide_translations_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"
-  ]
-  s.homepage = "http://github.com/ben-biddington/rsettings"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
-  s.summary = "Settings for ruby programs"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<audible>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<audible>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<audible>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "rsettings"
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Biddington"]
+  s.date = "2014-05-07"
+  s.description = "Settings"
+  s.email = "ben.biddington@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/rsettings.rb",
+    "lib/rsettings/adapters/basic_disk_settings.rb",
+    "lib/rsettings/adapters/environment_settings.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_list_settings_spec.rb",
+    "spec/system.tests/can_provide_translations_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"
+  ]
+  s.homepage = "http://github.com/ben-biddington/rsettings"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Settings for ruby programs"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<audible>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    else
+      s.add_dependency(%q<audible>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<audible>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+