settingslogic 1.0.3 → 1.0.4

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+*.log
+*.sqlite3
+pkg/*
+coverage/*
+doc/*
+benchmarks/*
+

data/Rakefile

@@ -1,20 +1,49 @@
-ENV['RDOCOPT'] = "-S -f html -T hanna"
+require 'rubygems'
+require 'rake'
 
-require "rubygems"
-require "hoe"
-require File.dirname(__FILE__) << "/lib/settingslogic/version"
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "settingslogic"
+    gem.summary = "A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern."
+    gem.email = "bjohnson@binarylogic.com"
+    gem.homepage = "http://github.com/binarylogic/settingslogic"
+    gem.authors = ["Ben Johnson of Binary Logic"]
+    gem.rubyforge_project = "settingslogic"
+    gem.add_dependency "activesupport"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
 
-Hoe.new("Settingslogic", Settingslogic::Version::STRING) do |p|
-  p.name = "settingslogic"
-  p.author = "Ben Johnson of Binary Logic"
-  p.email  = 'bjohnson@binarylogic.com'
-  p.summary = "A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern."
-  p.description = "A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern."
-  p.url = "http://github.com/binarylogic/settingslogic"
-  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
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :default => :test
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+    desc "Release gem to RubyForge"
+    task :release => ["rubyforge:release:gem"]
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 4
+:major: 1
+:minor: 0

data/init.rb

@@ -1 +1 @@
-require "settingslogic"
+require File.dirname(__FILE__) + "/rails/init.rb"

data/lib/settingslogic/settings.rb

@@ -40,10 +40,13 @@ module Settingslogic
         root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
         file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
         self.update YAML.load(ERB.new(File.read(file_path)).result).to_hash
-        self.update self[RAILS_ENV] if defined?(RAILS_ENV)
       else
         raise ArgumentError.new("Your settings must be a hash, a symbol representing the name of the .yml file in your config directory, or a string representing the abosolute path to your settings file.")
       end
+      if defined?(RAILS_ENV)
+        rails_env = self.keys.include?(RAILS_ENV) ? RAILS_ENV : RAILS_ENV.to_sym
+        self.update self[rails_env] if self[rails_env]
+      end
       define_settings!
     end
     
@@ -66,6 +69,9 @@ module Settingslogic
               def #{key}
                 @#{key} ||= self[#{key.inspect}]
               end
+              def #{key}=(value)
+                @#{key} = value
+              end
             end_eval
           end
         end

data/rails/init.rb

@@ -0,0 +1 @@
+require "settingslogic"

data/settingslogic.gemspec

@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{settingslogic}
+  s.version = "1.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Johnson of Binary Logic"]
+  s.date = %q{2009-06-28}
+  s.email = %q{bjohnson@binarylogic.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "init.rb",
+     "lib/settingslogic.rb",
+     "lib/settingslogic/config.rb",
+     "lib/settingslogic/settings.rb",
+     "rails/init.rb",
+     "settingslogic.gemspec",
+     "test/application.yml",
+     "test/application2.yml",
+     "test/application3.yml",
+     "test/config_test.rb",
+     "test/setting_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/binarylogic/settingslogic}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{settingslogic}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.}
+  s.test_files = [
+    "test/config_test.rb",
+     "test/setting_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+  end
+end

data/test/application3.yml

@@ -0,0 +1,9 @@
+neat:
+  cool:
+    awesome: <%= "Ben" + "Johnson" %>
+
+silly: 5
+fun: <%= 5 * 5 %>
+
+test:
+  silly: "test_specific"

data/test/{test_setting.rb → setting_test.rb}

@@ -40,4 +40,24 @@ class TestSetting < Test::Unit::TestCase
     assert_equal 5, settings1.silly
     assert_equal 25, settings1.fun
   end
+  
+  def test_environment_specific_settings
+    in_test_environment do
+      settings1 = Settings.new(File.dirname(__FILE__) + '/application3.yml')
+      assert_equal 25, settings1.fun
+      assert_equal "test_specific", settings1.silly
+    end
+  end
+  
+  def test_environment_specific_settings_when_initialized_with_hash
+    in_test_environment do
+      settings1 = Settings.new(
+          :silly => 5,
+          'fun' => 25,
+          :test => { :silly => "test_specific" }
+        )
+      assert_equal 25, settings1.fun
+      assert_equal "test_specific", settings1.silly
+    end
+  end
 end

data/test/test_helper.rb

@@ -18,4 +18,10 @@ class Test::Unit::TestCase
     configure
     Settingslogic::Settings.reset!
   end
+  
+  def in_test_environment(&block)
+    Settingslogic::Settings.const_set :RAILS_ENV, "test"
+    block.call
+    Settingslogic::Settings.send :remove_const, :RAILS_ENV
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: settingslogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -04:00
+date: 2009-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,48 +22,41 @@ dependencies:
       - !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: A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.
+description: 
 email: bjohnson@binarylogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- CHANGELOG.rdoc
+- LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG.rdoc
-- MIT-LICENSE
-- Manifest.txt
+- LICENSE
 - README.rdoc
 - Rakefile
+- VERSION.yml
 - init.rb
 - lib/settingslogic.rb
 - lib/settingslogic/config.rb
 - lib/settingslogic/settings.rb
-- lib/settingslogic/version.rb
+- rails/init.rb
+- settingslogic.gemspec
 - test/application.yml
 - test/application2.yml
-- test/test_config.rb
+- test/application3.yml
+- test/config_test.rb
+- test/setting_test.rb
 - test/test_helper.rb
-- test/test_setting.rb
 has_rdoc: true
 homepage: http://github.com/binarylogic/settingslogic
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,9 +74,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: settingslogic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.
-test_files: []
-
+test_files: 
+- test/config_test.rb
+- test/setting_test.rb
+- test/test_helper.rb

data/Manifest.txt

@@ -1,15 +0,0 @@
-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
-test/application.yml
-test/application2.yml
-test/test_config.rb
-test/test_helper.rb
-test/test_setting.rb

data/lib/settingslogic/version.rb

@@ -1,54 +0,0 @@
-module Settingslogic
-  # 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.
-  class Version
-    
-    include Comparable
-  
-    # A convenience method for instantiating a new Version instance with the
-    # given +major+, +minor+, and +tiny+ components.
-    def self.[](major, minor, tiny)
-      new(major, minor, tiny)
-    end
-
-    attr_reader :major, :minor, :tiny
-
-    # Create a new Version object with the given components.
-    def initialize(major, minor, tiny)
-      @major, @minor, @tiny = major, minor, tiny
-    end
-
-    # Compare this version to the given +version+ object.
-    def <=>(version)
-      to_i <=> version.to_i
-    end
-
-    # Converts this version object to a string, where each of the three
-    # version components are joined by the '.' character. E.g., 2.0.0.
-    def to_s
-      @to_s ||= [@major, @minor, @tiny].join(".")
-    end
-
-    # Converts this version to a canonical integer that may be compared
-    # against other version objects.
-    def to_i
-      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-    end
-    
-    def to_a
-      [@major, @minor, @tiny]
-    end
-
-    MAJOR = 1
-    MINOR = 0
-    TINY  = 3
-
-    # The current version as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
-    # The current version as a String
-    STRING = CURRENT.to_s
-    
-  end
-  
-end