rsettings 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rsettings/internal/names.rb

@@ -0,0 +1,13 @@
+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,9 +1,9 @@
 class RSettings
-  def initialize(settings, config)
-    @settings,@config = settings,config
+  def initialize(opts={})
+    @settings,@missing,@names = opts[:settings],opts[:missing],opts[:names] 
     
     @settings.on :missing do |e,args|
-      @config.missing.on_missing args.first
+      @missing.on_missing args.first
     end
   end
 
@@ -12,10 +12,10 @@ class RSettings
 
     m = m.to_s.delete "?" if query
 
-    setting_name = @config.name_for(m)
+    setting_name = @names.for(m)
     
     if query
-      setting_name = @config.name_for(m)
+      setting_name = @names.for(m)
 
       value = Setting.new @settings.get(setting_name)
       

data/lib/rsettings/internal/settings_configuration.rb

@@ -1,23 +1,21 @@
 class SettingsConfiguration
-  attr_reader :missing, :settings
+  attr_reader :missing, :settings, :names
 
-  def initialize
+  def initialize(&block)
     @missing = FailOnMissing.new
     @settings = EnvironmentSettings.new
+    @names = Names.new
+    instance_exec &block if block_given?
   end
 
   def let(opts = {})
-    _opts.merge! opts.invert
+    @names.add opts
   end
 
   def when_missing(type)
     @missing = IgnoreMissing.new if type === :ignore 
   end
 
-  def name_for(setting)
-    _opts[setting] || setting
-  end
-
   def with_settings(opts={})
     if opts.is_a? Hash
       @settings = SettingsChain.new(opts[:chain]) if opts[:chain]
@@ -25,10 +23,6 @@ class SettingsConfiguration
       @settings = opts.new
     end
   end
-
-  private
-
-  def _opts; @opts ||= {}; end
 end
 
 class IgnoreMissing

data/lib/rsettings.rb

@@ -4,22 +4,16 @@ Dir.glob(File.join(dir, "rsettings", "**", "*.rb")).each {|f| require f}
 
 class Settings
   def initialize(&block)
-    @config = SettingsConfiguration.new
-
-    if block_given?
-      @config = SettingsConfiguration.new.tap do |conf|
-        conf.instance_exec &block
-      end
-    end
-
-    @settings = @config.settings
-
-    fail "Error" unless @config.settings
+    @conf = SettingsConfiguration.new &block
   end
 
   def method_missing(m, *args, &block)
-    fail "Only support queries, cannot do <#{m}>" unless args.empty?
+    fail "Only support queries, cannot do command <#{m}>" unless args.empty?
 
-    RSettings.new(@settings, @config).find m
+    RSettings.new(
+      :settings => @conf.settings,
+      :missing => @conf.missing,
+      :names => @conf.names
+    ).find m
   end
 end

data/rsettings.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rsettings"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Biddington"]
@@ -14,29 +14,25 @@ Gem::Specification.new do |s|
   s.email = "ben.biddington@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
-    ".document",
-    ".rsettings",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "Rakefile",
     "VERSION",
     "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",
     "rsettings.gemspec",
-    "settings.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",

data/spec/system.tests/can_use_env_spec.rb

@@ -15,8 +15,6 @@ describe "Can use environment variables as a settings list" do
     ENV.clear
     expect{Settings.new.name}.to raise_error /Setting <name> not found/
   end
-
-  it "does type matter? Ought I be able to expect numbers for example. Currently all are strings."
   
   it "can supply mappings" do
     settings = Settings.new do 
@@ -72,11 +70,5 @@ describe "Can use environment variables as a settings list" do
     
     expect(settings.configure).to eql "xxx_conf_xxx"
   end
-
-  it "I wonder if ignoring missing settings would be nice -- at least allow me the option"
-
   # Can't use metaclass because class < Object which has lots of methods defined. BasicObject is what we want.
 end
-
-describe "Can use a file on disk"
-describe "Can use a chain of sources, for example ENV falling back to file on disk"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsettings
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -98,27 +98,23 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
-- .document
-- .rsettings
 - .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - 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
 - rsettings.gemspec
-- settings.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
@@ -140,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -382109293
+      hash: -726934447
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rsettings

@@ -1,2 +0,0 @@
----
-:ben_rules: 'yes'

data/README.rdoc

@@ -1,19 +0,0 @@
-= settings
-
-Description goes here.
-
-== Contributing to settings
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 Ben Biddington. See LICENSE.txt for
-further details.
-

data/settings.gemspec

@@ -1,61 +0,0 @@
-# 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 = "settings"
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Biddington"]
-  s.date = "2013-12-06"
-  s.description = "Settings"
-  s.email = "ben.biddington@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/settings.rb",
-    "lib/settings/adapters/environment_settings.rb",
-    "spec/spec_helper.rb",
-    "spec/system.tests/can_use_env_spec.rb"
-  ]
-  s.homepage = "http://github.com/ben-biddington/settings"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Settings"
-
-  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<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<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<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
-