settable 1.0 → 1.1

data/examples/example.rb

@@ -3,7 +3,7 @@ require 'settable'
 
 class Configuration
   include Settable
-  
+
   def initialize(&block)
     instance_eval(&block) if block_given?
   end
@@ -11,14 +11,19 @@ end
 
 config = Configuration.new do
   set :environment, 'development'
-  
+
   set :api_token do
     return 'PRODTOKEN' if environment == 'production'
     'DEVTOKEN'
   end
-  
+
   set :api_endpoint, "http://example.com/api/#{api_token}"
   set :environment, 'production'
+
+  namespace :chat do
+    set :enabled, true
+    set :token, 'abcde90210'
+  end
 end
 
 # external stuffs
@@ -33,4 +38,6 @@ puts config.environment
 puts config.api_token
 puts config.api_endpoint
 puts config.something
-puts config.debug?
+puts config.debug?
+puts config.chat.enabled?
+puts config.chat.token

data/examples/rails.rb

@@ -9,7 +9,7 @@ end
 class Configuration
   include Settable
   include Settable::Rails
-    
+
   def initialize(&block)
     instance_eval(&block) if block_given?
   end
@@ -17,25 +17,36 @@ end
 
 @config = Configuration.new do
   define_environments :blah, :qa
-  
+
   set :something, in_blah?
   set :debug, in_environments?(:development, :test)
-  
+
   if in_production?
     enable :tracking, :caching
   else
     disable :tracking, :caching
   end
-  
+
+  namespace :api do
+    set :token do
+      in_production { return 'PRODTOKEN' }
+      in_development{ return 'DEVTOKEN' }
+      'OTHERTOKEN'
+    end
+
+    set :endpoint do
+      in_environments(:development, :test){ return "http://sandbox.example.com/api/#{token}" }
+      "http://example.com/api/#{token}"
+    end
+  end
+
   set :api_token do
     in_production { return 'PRODTOKEN' }
     in_development{ return 'DEVTOKEN' }
     'OTHERTOKEN'
   end
-  
+
   set :api_endpoint do
-    in_environments(:development, :test){ return "http://sandbox.example.com/api/#{api_token}" }
-    "http://example.com/api/#{api_token}"
   end
 end
 
@@ -44,6 +55,9 @@ puts @config.inspect
 
 puts '-' * 80
 
+puts @config.api.token
+puts @config.api.endpoint
+
 puts @config.tracking?
 puts @config.caching?
 puts @config.api_token

data/lib/settable.rb

@@ -1,14 +1,16 @@
 module Settable
-  VERSION = "1.0"
+  VERSION = "1.1"
   
   module Rails
     DEFAULT_ENVIRONMENTS = [:development, :production, :test]
+    CUSTOM_ENVIRONMENTS = []
     
     # allow us to add custom environment helpers
     def define_environments(*envs)
       envs.each do |env|
+        CUSTOM_ENVIRONMENTS << env
         define_metaclass_method(:"in_#{env}"){ |&block| in_environment(env.to_sym, &block) }
-        define_metaclass_method(:"in_#{env}?"){ in_environment?(env.to_sym) }      
+        define_metaclass_method(:"in_#{env}?"){ in_environment?(env.to_sym) }
       end
     end
     alias_method :define_environment, :define_environments
@@ -53,6 +55,10 @@ module Settable
       set key, Proc.new{value}
     end
   end
+  
+  def namespace(name, &block)
+    set name, Namespace.create(self, &block)
+  end
 
   def enable(*keys)
     keys.each{ |key| set key, true }
@@ -61,4 +67,21 @@ module Settable
   def disable(*keys)
     keys.each{ |key| set key, false }
   end
+  
+  class Namespace
+    def self.create(base, &block)
+      include Settable
+      klass = new
+      
+      # good lord this is hack. but we need to re-define the custom environments in our
+      # namespaces 
+      if base.class.ancestors.include?(Settable::Rails)
+        include Settable::Rails
+        klass.instance_eval{ define_environments *CUSTOM_ENVIRONMENTS }
+      end
+      
+      klass.instance_eval(&block)
+      klass
+    end
+  end
 end

data/test/settable_test.rb

@@ -0,0 +1,252 @@
+$:.push File.expand_path("../../lib", __FILE__)
+require 'test/unit'
+require 'settable'
+
+module Rails
+ class << self; attr_accessor :env; end
+ self.env = :development
+end
+
+class Configuration
+  include Settable
+  def initialize(&block)
+    instance_eval(&block) if block_given?
+  end
+end
+
+class RailsConfiguration < Configuration
+  include Settable::Rails
+end
+
+# test using an instance eval'd config
+class SettableBlockTest < Test::Unit::TestCase
+  def setup
+    @config = Configuration.new do
+      set :string, 'hello world'
+      set :numeric, 10
+      set :block do
+        'block'
+      end
+      set :combined, "#{string}-combined"
+      enable :tracking
+      disable :caching
+    end
+  end
+  
+  def test_settables
+    assert_equal [:string, :numeric, :block, :combined, :tracking, :caching].sort, @config.__settables__.sort
+  end
+  
+  def test_strings
+    assert_equal 'hello world', @config.string
+  end
+  
+  def test_numeric
+    assert_equal 10, @config.numeric
+  end
+  
+  def test_block
+    assert_equal 'block', @config.block
+  end
+  
+  def test_string_interpolation
+    assert_equal 'hello world-combined', @config.combined
+  end
+  
+  def test_enable
+    assert @config.tracking
+  end
+  
+  def test_disable
+    assert !@config.caching
+  end
+  
+  def test_question_marks
+    assert @config.combined? == true
+  end
+end
+
+# test individual setting config
+class SettableExternalTest < Test::Unit::TestCase
+  def setup
+    @config = Configuration.new
+  end
+  
+  def test_strings
+    @config.set :string, 'hello world'
+    assert_equal 'hello world', @config.string
+  end
+  
+  def test_numeric
+    @config.set :numeric, 10
+    assert_equal 10, @config.numeric
+  end
+  
+  def test_block
+    @config.set :block do
+      'block'
+    end
+    assert_equal 'block', @config.block
+  end
+  
+  def test_enable
+    @config.enable :tracking
+    assert @config.tracking
+  end
+  
+  def test_disable
+    @config.disable :caching
+    assert !@config.caching
+  end
+  
+  def test_block_with_value
+    @config.set :value, 'value'
+    @config.set :block do
+      value
+    end
+    assert_equal 'value', @config.block
+  end
+  
+  def test_string_interpolation
+    @config.set :hello, 'hello'
+    @config.set :combined, "#{@config.hello}-world"
+    assert_equal 'hello-world', @config.combined
+  end
+  
+  def test_question_marks
+    @config.set :hello, 'world'
+    assert @config.hello? == true
+  end
+end
+
+class SettableRailsTest < Test::Unit::TestCase
+  def setup
+    @config = RailsConfiguration.new do
+      define_environments :custom
+      set :debug, in_development?
+      
+      set :api_token do
+        in_production{ return 'PROD' }
+        in_custom{ return 'CUSTOM' }
+        'DEFAULT'
+      end
+      
+      set :api_endpoint do
+        in_environments(:development, :test){ return 'dev.example.com' }
+        'example.com'
+      end
+    end
+  end
+  
+  def test_settables
+    assert_equal [:debug, :api_endpoint, :api_token].sort, @config.__settables__.sort
+  end
+  
+  def test_in_environment_helper
+    Rails.env = :development
+    assert @config.in_development? == true
+  end
+  
+  def test_custom_environments
+    Rails.env = :custom
+    assert @config.in_custom? == true
+  end
+  
+  def test_development_block
+    Rails.env = :development
+    assert_equal 'DEFAULT', @config.api_token
+  end
+
+  def test_production_block
+    Rails.env = :production
+    assert_equal 'PROD', @config.api_token
+  end
+
+  def test_custom_block
+    Rails.env = :custom
+    assert_equal 'CUSTOM', @config.api_token
+  end
+  
+  def test_multiple_environments_in_development
+    Rails.env = :development
+    assert_equal 'dev.example.com', @config.api_endpoint
+  end
+
+  def test_multiple_environments_in_test
+    Rails.env = :test
+    assert_equal 'dev.example.com', @config.api_endpoint
+  end
+
+  def test_multiple_environments_in_other
+    Rails.env = :production
+    assert_equal 'example.com', @config.api_endpoint
+  end
+  
+  def test_question_marks
+    assert @config.api_endpoint? == true
+  end
+end
+
+# test using namespaces on bare configs
+class SettableNamespaceTest < Test::Unit::TestCase
+  def setup
+    @config = Configuration.new do
+      namespace :email do
+        set :from, 'no-reply@example.com'
+        set :subject do
+          "Mail from #{from}"
+        end
+      end
+      
+      set :from, 'russia with love'
+    end
+  end
+  
+  def test_namespace_from
+    assert_equal 'no-reply@example.com', @config.email.from
+  end
+
+  def test_from
+    assert_equal 'russia with love', @config.from
+  end
+  
+  def test_namespace_blocks
+    assert_equal 'Mail from no-reply@example.com', @config.email.subject
+  end
+end
+
+# test using namespaces on rails configs
+class SettableRailsNamespaceTest < Test::Unit::TestCase
+  def setup
+    @config = RailsConfiguration.new do
+      define_environments :custom
+      
+      namespace :api do
+        set :token do
+          in_production{ return 'PROD' }
+          in_custom{ return 'CUSTOM' }
+          'DEFAULT'
+        end
+      end
+    end
+  end
+  
+  def test_namespace_environments
+    assert @config.api.respond_to?(:in_custom?)
+  end
+
+  def test_namespace_blocks_dev
+    Rails.env = :development
+    assert_equal 'DEFAULT', @config.api.token
+  end
+
+  def test_namespace_blocks_prod
+    Rails.env = :production
+    assert_equal 'PROD', @config.api.token
+  end
+
+  def test_namespace_blocks_custom
+    Rails.env = :custom
+    assert_equal 'CUSTOM', @config.api.token
+  end
+end

metadata

@@ -1,29 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: settable
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: '1.1'
   prerelease: 
-  version: "1.0"
 platform: ruby
-authors: 
+authors:
 - Rob Hurring
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-09 00:00:00 -04:00
-default_executable: 
+date: 2012-01-20 00:00:00.000000000Z
 dependencies: []
-
 description: Small include to make config files better
-email: 
+email:
 - robhurring@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -32,33 +26,30 @@ files:
 - examples/rails.rb
 - lib/settable.rb
 - settable.gemspec
-has_rdoc: true
-homepage: ""
+- test/settable_test.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: settable
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Small include to make config files better
-test_files: []
-
+test_files:
+- test/settable_test.rb