settingslogic 1.0.1 → 1.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.0.2 released 2009-04-09
+
+* Call key? off of the self in the class level name method.
+
 == 1.0.1 released 2009-04-02
 
 * Inherit from hash.

data/{Manifest → Manifest.txt}

@@ -1,13 +1,13 @@
 CHANGELOG.rdoc
+MIT-LICENSE
+Manifest.txt
+README.rdoc
+Rakefile
 init.rb
+lib/settingslogic.rb
 lib/settingslogic/config.rb
 lib/settingslogic/settings.rb
 lib/settingslogic/version.rb
-lib/settingslogic.rb
-Manifest
-MIT-LICENSE
-Rakefile
-README.rdoc
 test/application.yml
 test/application2.yml
 test/test_config.rb

data/Rakefile

@@ -1,15 +1,20 @@
-require 'rubygems'
-require 'echoe'
+ENV['RDOCOPT'] = "-S -f html -T hanna"
 
+require "rubygems"
+require "hoe"
 require File.dirname(__FILE__) << "/lib/settingslogic/version"
 
-Echoe.new 'settingslogic' do |p|
-  p.version = Settingslogic::Version::STRING
+Hoe.new("Settingslogic", Settingslogic::Version::STRING) do |p|
+  p.name = "settingslogic"
   p.author = "Ben Johnson of Binary Logic"
   p.email  = 'bjohnson@binarylogic.com'
-  p.project = 'settingslogic'
-  p.summary = "Simple and straightforward application wide settings"
+  p.summary = "Simple settings manaement using YAML"
+  p.description = "Simple settings manaement using YAML"
   p.url = "http://github.com/binarylogic/settingslogic"
-  p.dependencies = []
-  p.include_rakefile = true
+  p.history_file = "CHANGELOG.rdoc"
+  p.readme_file = "README.rdoc"
+  p.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
+  p.remote_rdoc_dir = ''
+  p.test_globs = ["test/*/test_*.rb", "test/*_test.rb", "test/*/*_test.rb"]
+  p.extra_deps = %w(activesupport)
 end

data/lib/settingslogic.rb

@@ -10,4 +10,4 @@ rescue(NameError)
 end
 
 # Since we don't have a Settings constant, lets go ahead and use it
-::Settings = Settingslogic::Settings unless defined?(Settings) 
+::Settings = Settingslogic::Settings unless defined?(Settings)

data/lib/settingslogic/config.rb

@@ -1,5 +1,4 @@
 module Settingslogic
-  # = Config
   # Sets configuration on Settingslogic.
   class Config
     class << self

data/lib/settingslogic/settings.rb

@@ -1,11 +1,9 @@
 module Settingslogic
-  # = Setting
-  #
   # A simple settings solution using a YAML file. See README for more information.
   class Settings < Hash
     class << self
       def name # :nodoc:
-        instance._settings.key?("name") ? instance.name : super
+        instance.key?("name") ? instance.name : super
       end
       
       # Resets the singleton instance. Useful if you are changing the configuration on the fly. If you are changing the configuration on the fly you should consider creating instances.

data/lib/settingslogic/version.rb

@@ -1,29 +1,4 @@
-# (The MIT License)
-# 
-# Copyright (c) 2008 Jamis Buck <jamis@37signals.com>,
-#               with modifications by Bruce Williams <bruce@fiveruns.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# 'Software'), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 module Settingslogic
-  # = Version
-  #
   # A class for describing the current version of a library. The version
   # consists of three parts: the +major+ number, the +minor+ number, and the
   # +tiny+ (or +patch+) number.
@@ -67,7 +42,7 @@ module Settingslogic
 
     MAJOR = 1
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/application.yml

@@ -3,3 +3,4 @@ setting1:
 
 setting2: 5
 setting3: <%= 5 * 5 %>
+name: test

data/test/test_setting.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSetting < Test::Unit::TestCase
+  def test_conflicting_class_methods
+    assert_equal "test", Settings.name
+  end
+  
   def test_singleton_access
     assert_equal Settings, Settings.setting1.class
     assert_equal "saweet", Settings.setting1.setting1_child

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: settingslogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,48 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-02 00:00:00 -04:00
+date: 2009-04-09 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
-description: Simple and straightforward application wide settings
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.12.1
+    version: 
+description: Simple settings manaement using YAML
 email: bjohnson@binarylogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- Manifest.txt
 - CHANGELOG.rdoc
-- lib/settingslogic/config.rb
-- lib/settingslogic/settings.rb
-- lib/settingslogic/version.rb
-- lib/settingslogic.rb
 - README.rdoc
 files: 
 - CHANGELOG.rdoc
+- MIT-LICENSE
+- Manifest.txt
+- README.rdoc
+- Rakefile
 - init.rb
+- lib/settingslogic.rb
 - lib/settingslogic/config.rb
 - lib/settingslogic/settings.rb
 - lib/settingslogic/version.rb
-- lib/settingslogic.rb
-- Manifest
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 - test/application.yml
 - test/application2.yml
 - test/test_config.rb
 - test/test_helper.rb
 - test/test_setting.rb
-- settingslogic.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/settingslogic
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Settingslogic
 - --main
 - README.rdoc
 require_paths: 
@@ -65,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
@@ -73,8 +84,6 @@ rubyforge_project: settingslogic
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Simple and straightforward application wide settings
-test_files: 
-- test/test_config.rb
-- test/test_helper.rb
-- test/test_setting.rb
+summary: Simple settings manaement using YAML
+test_files: []
+

data/settingslogic.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{settingslogic}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-04-02}
-  s.description = %q{Simple and straightforward application wide settings}
-  s.email = %q{bjohnson@binarylogic.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/settingslogic/config.rb", "lib/settingslogic/settings.rb", "lib/settingslogic/version.rb", "lib/settingslogic.rb", "README.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "init.rb", "lib/settingslogic/config.rb", "lib/settingslogic/settings.rb", "lib/settingslogic/version.rb", "lib/settingslogic.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/application.yml", "test/application2.yml", "test/test_config.rb", "test/test_helper.rb", "test/test_setting.rb", "settingslogic.gemspec"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/binarylogic/settingslogic}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Settingslogic", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{settingslogic}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Simple and straightforward application wide settings}
-  s.test_files = ["test/test_config.rb", "test/test_helper.rb", "test/test_setting.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end