confstruct 0.1.0 → 0.2.0

data/README.md

@@ -4,7 +4,7 @@
 hash, struct, or block, confstruct aims to provide the flexibility to do things your
 way, while keeping things simple and intuitive.
 
-[![Build Status](https://secure.travis-ci.org/mbklein/confstruct.png)](http://travis-ci.org/mbklein/confstruct])
+[![Build Status](https://secure.travis-ci.org/mbklein/confstruct.png)](http://travis-ci.org/mbklein/confstruct)
 
 ## Usage
 
@@ -148,6 +148,9 @@ on the same global configuration object.
   
 ## Release History
 
+- <b>v0.1.0</b> - Initial release
+- <b>v0.2.0</b> - Add fallback value to HashWithStructAccess#lookup!, native support for Rails I18n.
+
 ## Contributing to confstruct
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/confstruct.rb

@@ -1,3 +1,8 @@
-module Confstruct  
-  VERSION = '0.1.0'
+require 'confstruct/utils'
+
+module Confstruct
+  autoload :HashWithStructAccess, 'confstruct/hash_with_struct_access'
+  autoload :Configuration, 'confstruct/configuration'
+  
+  VERSION = '0.2.0'
 end

data/lib/confstruct/hash_with_struct_access.rb

@@ -4,6 +4,18 @@ require 'confstruct/utils'
 module Confstruct
   class Deferred < Proc; end
   def self.deferred &block; Deferred.new(&block); end
+  
+  def self.i18n key=nil, &block
+    raise NameError, "I18n handler not loaded" unless Object.const_defined? :I18n # ensure the Rails I18n handler is loaded
+    Deferred.new do |hwsa|
+      val = block_given? ? eval_or_yield(hwsa, &block) : key
+      if val.is_a?(Date) or val.is_a?(Time) or val.is_a?(DateTime)
+        ::I18n.localize val
+      else
+        ::I18n.translate val
+      end
+    end
+  end
 
   if ::RUBY_VERSION < '1.9'
     begin
@@ -94,7 +106,7 @@ module Confstruct
     end
 
     def deferred! &block
-      Deferred.new(&block)
+      Confstruct.deferred(&block)
     end
     
     def has? key_path
@@ -111,6 +123,10 @@ module Confstruct
       return true
     end
     
+    def i18n! key=nil, &block
+      Confstruct.i18n(key,&block)
+    end
+    
     def inspect
       r = self.keys.collect { |k| "#{k.inspect}=>#{self[k].inspect}" }
       "{#{r.compact.join(', ')}}"
@@ -120,15 +136,15 @@ module Confstruct
       klazz == @@hash_class or super
     end
     
-    def lookup! key_path
+    def lookup! key_path, fallback = nil
       val = self
       keys = key_path.split(/\./)
       keys.each do |key|
-        return nil if val.nil?
+        return fallback if val.nil?
         if val.respond_to?(:has_key?) and val.has_key?(key.to_sym)
           val = val[key.to_sym]
         else
-          return nil
+          return fallback
         end
       end
       return val

data/spec/confstruct/configuration_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'confstruct/configuration'
 
 describe Confstruct::Configuration do
 

data/spec/confstruct/hash_with_struct_access_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'confstruct/hash_with_struct_access'
 
 describe Confstruct::HashWithStructAccess do
   
@@ -74,7 +73,10 @@ describe Confstruct::HashWithStructAccess do
     
     it "should properly respond to #lookup!" do
       @hwsa.lookup!('github.url').should == @hash[:github][:url]
+      @hwsa.lookup!('github.foo.bar.baz',:default).should == :default
       @hwsa.lookup!('github.foo.bar.baz').should be_nil
+      @hwsa.github.quux = nil
+      @hwsa.lookup!('github.quux',:default).should be_nil
     end
     
     it "should provide introspection" do
@@ -148,6 +150,26 @@ describe Confstruct::HashWithStructAccess do
     it "should fail on other method signatures" do
       lambda { @hwsa.error(1, 2, 3) }.should raise_error(NoMethodError)
     end
+    
+    it "should create arrays on the fly" do
+      @hwsa.github do
+        add_roles!({:jeeves => :valet}, {:wooster => :dolt})
+        add_roles! do
+          psmith :chum
+        end
+      end
+      @hwsa.github.roles.should == [{:jeeves => :valet}, {:wooster => :dolt}, {:psmith => :chum}]
+      @hwsa.github.roles.first.jeeves.should == :valet
+    end
+    
+    it "should not allow #add!ing to non-Array types" do
+      lambda { 
+        @hwsa.github do
+          add_url! 'https://github.com/mbklein/busted'
+        end
+      }.should raise_error(TypeError)
+    end
+    
   end
 
   context "Proc values as virtual methods" do
@@ -203,23 +225,19 @@ describe Confstruct::HashWithStructAccess do
       @hwsa.github.regproc.is_a?(Proc).should be_true
     end
     
-    it "should create arrays on the fly" do
+    it "should handle i18n translations" do
+      t = Time.now
+      I18n = RSpec::Mocks::Mock.new('I18n')
+      I18n.should_receive(:translate).with('Hello, World!').and_return('Bonjour, Monde!')
+      I18n.should_receive(:localize).with(t).and_return('French Time!')
       @hwsa.github do
-        add_roles!({:jeeves => :valet}, {:wooster => :dolt})
-        add_roles! do
-          psmith :chum
-        end
+        hello 'Hello, World!'
+        time t
+        local_hello i18n! { hello }
+        local_time i18n! { time }
       end
-      @hwsa.github.roles.should == [{:jeeves => :valet}, {:wooster => :dolt}, {:psmith => :chum}]
-      @hwsa.github.roles.first.jeeves.should == :valet
-    end
-    
-    it "should not allow #add!ing to non-Array types" do
-      lambda { 
-        @hwsa.github do
-          add_url! 'https://github.com/mbklein/busted'
-        end
-      }.should raise_error(TypeError)
+      @hwsa.github.local_hello.should == 'Bonjour, Monde!'
+      @hwsa.github.local_time.should == 'French Time!'
     end
     
   end

data/spec/confstruct/utils_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'confstruct/utils'
 
 describe "Kernel.eval_or_yield" do
   before :all do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confstruct
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Klein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake