@@ -38,27 +38,28 @@ module KVC VERSION = "0.0.2" class << self + def [](key) + if setting = KVC::Settings.find_by_key(key) + KVC::SettingsProxy.new setting + elsif KVC::Settings.strict_keys? + raise NoMethodError, "undefined method `#{key}' for KVC:Module" + end + end + + def []=(key, value) + setting = KVC::Settings.find_or_initialize_by_key(key) + setting.update_attributes! :value => value + end + private # Handles the key-value magic. def method_missing(method, *args, &block) key = method.to_s - key.sub!(/^\[\](=?)$/) { "#{args.shift}#{$1}" } - if key.sub!(/=$/) {} # Is it a writer method? - returning args.shift do |value| - setting = KVC::Settings.find_or_initialize_by_key(key) - setting.update_attributes!(:value => value) - end - elsif setting = KVC::Settings.find_by_key(key) # Is it a reader? - if args.present? - error_message = "wrong number of arguments (#{args.length} for 0)" - raise ArgumentError, error_message - end - - KVC::SettingsProxy.new(setting) - elsif args.present? || KVC::Settings.strict_keys? - raise NoMethodError + self[key] = *args + else + self[key, *args] end end end lib/kvc.rb @@ -43,14 +43,12 @@ class KVC::Settings < ActiveRecord::Base # Deserializes value from database. def value - @value ||= YAML.load(read_attribute(:value)) + @value ||= YAML.load read_attribute(:value) end # Serializes value for database. def value=(input) - returning @value = input do - write_attribute :value, input.to_yaml - end + write_attribute :value, (@value = input).to_yaml end private lib/kvc/settings.rb @@ -26,7 +26,7 @@ class KVCTest < ActiveSupport::TestCase end test "method_missing should re-raise if there are arguments" do - assert_raise NoMethodError do + assert_raise ArgumentError do KVC.this_should("not_work") end end test/kvc_test.rb 95af3c33e00a34baebaee4d420bdd8b8c10c49ca Stephen Celis stephen@stephencelis.com http://github.com/stephencelis/kvc/commit/504f9ef42a345823839d2d7fc0520ce90628b8a0 504f9ef42a345823839d2d7fc0520ce90628b8a0 2009-06-26T05:57:23-07:00 2009-06-26T05:57:23-07:00 Simplify and clean up. 7e1498f8d8ffe9109b787cc3d41b2d905a9295d6 Stephen Celis stephen@stephencelis.com