@@ -44,6 +44,11 @@ Notice we don't use hashes (#) like normal Ruby interpolation. Also, the names in the brackets don't really mean much. Interpolation is done in order -- the first argument replaces the first variable in brackets, the second the second, etc. +Interpolation can also be done via hash: + + >> "{name} is from {place}"[:hey_place, { :place => 'Gotham City', :name => 'Batman' }] + => "Batman is from Gotham City" + This of course works with your translations: $ cat lang/es.yml README @@ -59,7 +59,21 @@ module Gibberish private def interpolate_string(string, *args) - string.gsub(/\{\w+\}/) { args.shift } + if args.last.is_a? Hash + interpolate_with_hash(string, args.last) + else + interpolate_with_strings(string, args) + end + end + + def interpolate_with_hash(string, hash) + hash.inject(string) do |target, (search, replace)| + target.sub("{#{search}}", replace) + end + end + + def interpolate_with_strings(string, strings) + string.gsub(/\{\w+\}/) { strings.shift } end def language_files lib/gibberish/localize.rb @@ -134,6 +134,14 @@ context "A gibberish string (in general)" do '{computer} omg?'[:puter, 'mac'].should.equal "mac omg?" end + specify "should interpolate based on key if passed a hash" do + 'Hi, {user} of {place}'[:hi_there, { :place => 'france', :user => 'chris' }].should.equal "Hi, chris of france" + + bands = { 'other_bad_band' => 'Deputy', :good_band => 'Word Picture', 'bad_band' => 'Dagger' } + answer = 'Well, Dagger sucks and so does Deputy, but Word Picture is pretty rad.' + 'Well, {bad_band} sucks and so does {other_bad_band}, but {good_band} is pretty rad.'[:snobbish, bands].should.equal answer + end + specify "should not affect existing string methods" do string = "chris" answer = 'ch' test/gibberish_test.rb 9ea0649bc1e051f7e52e122ced35ad52d76ac13e Chris Wanstrath chris@ozmm.org http://github.com/defunkt/gibberish/commit/94d37d0946e4ddea52bae67a12e2486796b5ced2 94d37d0946e4ddea52bae67a12e2486796b5ced2 2007-05-08T23:48:41-07:00 2007-05-08T23:48:41-07:00 add hash interpolation to gibberish d1d43709f8bf9a9b2f96fa04d2e38e6cdfcf44e4 Chris Wanstrath chris@ozmm.org