property_sets 0.4.1 → 0.4.2

data/Gemfile

@@ -14,3 +14,8 @@ group :development do
   gem "jeweler", "~> 1.5.1"
   gem "ruby-debug"
 end
+
+group :test do
+  gem "sqlite3"
+  gem "mocha"
+end

data/Gemfile.lock

@@ -14,6 +14,7 @@ GEM
       git (>= 1.2.5)
       rake
     linecache (0.43)
+    mocha (0.9.12)
     rack (1.1.0)
     rake (0.8.7)
     ruby-debug (0.10.4)
@@ -22,6 +23,7 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     shoulda (2.11.3)
+    sqlite3 (1.3.3)
 
 PLATFORMS
   ruby
@@ -32,5 +34,7 @@ DEPENDENCIES
   activesupport (= 2.3.10)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
+  mocha
   ruby-debug
   shoulda
+  sqlite3

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/db/.gitignore

@@ -0,0 +1 @@
+property_sets_test.sqlite

data/lib/property_sets/active_record_extension.rb

@@ -33,7 +33,7 @@ module PropertySets
 
             # Reports the coerced truth value of the property
             define_method "#{key}?" do
-              lookup(key).true?
+              lookup_or_default(key).true?
             end
 
             # Returns the value of the property
@@ -70,6 +70,15 @@ module PropertySets
               instance   = detect { |property| property.name.to_sym == arg.to_sym }
               instance ||= @owner.send(association).build(:name => arg.to_s, :value => property_class.default(arg))
             end
+
+            # This finder method returns the property if present,
+            #   otherwise a new instance with the default value.
+            # It does not have the side effect of adding a new setting object.
+            define_method 'lookup_or_default' do |arg|
+              instance = detect { |property| property.name.to_sym == arg.to_sym }
+              instance ||= property_class.new(:value => property_class.default(arg))
+            end
+
           end
         end
       end

data/property_sets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-03-28}
   s.description = %q{This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties}
   s.email = %q{morten@zendesk.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "db/.gitignore",
     "lib/property_sets.rb",
     "lib/property_sets/action_view_extension.rb",
     "lib/property_sets/active_record_extension.rb",
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/morten/property_sets}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Property sets for ActiveRecord}
   s.test_files = [
     "test/helper.rb",
@@ -50,7 +51,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/database.yml

@@ -1,7 +1,6 @@
 test:
-  adapter: mysql
+  adapter: sqlite3
   encoding: utf8
-  database: property_sets_test
+  database: db/property_sets_test.sqlite
   username: root
   password:
-  socket: /tmp/mysql.sock

data/test/test_property_sets.rb

@@ -53,6 +53,21 @@ class TestPropertySets < ActiveSupport::TestCase
       assert_equal 'skep', @account.settings.hep
     end
 
+    context 'querying for a setting that does not exist' do
+      setup do
+        assert_equal([], @account.settings)
+        assert_equal(true, @account.settings.hep?)
+      end
+
+      should 'not add a new setting' do
+        assert_equal([], @account.settings)
+      end
+
+      should 'give back the default value' do
+        assert_equal('skep', @account.settings.hep)
+      end
+    end
+
     should "reject settings with an invalid name" do
       s = AccountSetting.new(:account => @account)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -33,12 +31,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirements: *id001
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: activerecord
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -49,12 +47,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirements: *id002
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: actionpack
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,12 +63,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: actionpack
+  version_requirements: *id003
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: shoulda
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +77,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: shoulda
+  version_requirements: *id004
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +93,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: *id005
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +109,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: *id006
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: ruby-debug
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,12 +123,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  version_requirements: *id007
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: thoughtbot-shoulda
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,7 +137,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  name: thoughtbot-shoulda
+  version_requirements: *id008
+  prerelease: false
 description: This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties
 email: morten@zendesk.com
 executables: []
@@ -157,6 +157,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- db/.gitignore
 - lib/property_sets.rb
 - lib/property_sets/action_view_extension.rb
 - lib/property_sets/active_record_extension.rb
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Property sets for ActiveRecord