.gitmodules vendor/rubycocoa-prefs @@ -2,12 +2,11 @@ # You can redistribute it and/or modify it under the Ruby's license or the GPL2. require 'utility' -require 'singleton' require 'userdefaultsaccess' -require 'abstract_preferences_section' +require 'abstract_preferences' class Preferences - include Singleton + AbstractPreferencesSection = AbstractPreferencesNamespace class Keyword < AbstractPreferencesSection string_array_defaults_accessor :words, [], 'HighlightWordWrapper' ruby/model/preferences.rb @@ -1,13 +1,15 @@ require File.expand_path('../../test_helper', __FILE__) require 'preferences' -describe "Preferences sections" do - it "should include the `general' preferences" do - preferences.general.should.be.instance_of Preferences::General +describe "Preferences namespaces" do + it "should have instances of all section classes" do + %w{ keyword dcc general sound theme }.each do |section| + preferences.send(section).class.name.should == "Preferences::#{section.capitalize}" + end end %w{ General Keyword Dcc Sound }.each do |section| - it "should have set the correct default values for the `#{section}' section" do + it "should have set the correct default values for the `#{section}' namespace" do klass = Preferences.const_get(section) section_default_values = Preferences.default_values.select { |key, _| key.include? klass.section_defaults_key } section_default_values.should.not.be.empty test/model/preferences_test.rb @@ -11,6 +11,8 @@ require 'test/spec' require 'mocha' require 'rucola/test_case' +$: << File.join(APP_ROOT, 'vendor', 'rubycocoa-prefs', 'lib') + Dir.glob("#{APP_ROOT}/ruby/*").each do |dir| $: << dir if File.directory?(dir) end test/test_helper.rb ruby/model/abstract_preferences_section.rb test/model/abstract_preferences_section_test.rb a5d447ac353c91b3c78724c4a8ebdca8b0558891 Eloy Duran eloy.de.enige@gmail.com http://github.com/psychs/limechat/commit/69df08974dab8f489411c3099051804f7f3fb64f 69df08974dab8f489411c3099051804f7f3fb64f 2008-11-07T14:58:53-08:00 2008-11-07T14:19:14-08:00 Removed AbstractPreferencesSection and added the extraction rubycocoa-prefs as a submodule. Made the tests green by aliasing AbstractPreferencesSection to AbstractPreferencesNamespace. de0e0644cc585e8b2ba7841bbf8a560240cfc3ac Eloy Duran eloy.de.enige@gmail.com