property_sets 0.5.4 → 0.5.5

data/Gemfile

@@ -2,9 +2,9 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 
-gem "activesupport", "~> 2.3.10"
-gem "activerecord", "~> 2.3.10"
-gem "actionpack", "~> 2.3.10"
+gem "activesupport", "~> 2.3.14"
+gem "activerecord", "~> 2.3.14"
+gem "actionpack", "~> 2.3.14"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
       rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
     columnize (0.3.2)
     git (1.2.5)
     jeweler (1.5.2)
@@ -29,9 +29,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.10)
-  activerecord (~> 2.3.10)
-  activesupport (~> 2.3.10)
+  actionpack (~> 2.3.14)
+  activerecord (~> 2.3.14)
+  activesupport (~> 2.3.14)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
   mocha

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/property_sets/active_record_extension.rb

@@ -40,6 +40,8 @@ module PropertySets
                 value.to_f
               when :integer
                 value.to_i
+              when :boolean
+                ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
             end
           end
 
@@ -79,36 +81,44 @@ module PropertySets
             define_method "#{key}_record" do
               lookup(key)
             end
+          end
 
-            define_method "protected?" do |arg|
-              lookup(arg).protected?
-            end
+          def protected?(arg)
+            lookup(arg).protected?
+          end
 
-            define_method "enable" do |arg|
-              send("#{arg}=", "1")
-            end
+          def enable(arg)
+            send("#{arg}=", "1")
+          end
 
-            define_method "disable" do |arg|
-              send("#{arg}=", "0")
-            end
+          def disable(arg)
+            send("#{arg}=", "0")
+          end
 
-            # The finder method which returns the property if present, otherwise a new instance with defaults
-            define_method "lookup" do |arg|
-              instance   = detect { |property| property.name.to_sym == arg.to_sym }
-              instance ||= build(:name => arg.to_s, :value => property_class.default(arg))
+          def build_default(arg)
+            build(:name => arg.to_s, :value => default(arg))
+          end
 
-              instance.send("#{owner_class_sym}=", @owner) if @owner.new_record?
+          def lookup_without_default(arg)
+            detect { |property| property.name.to_sym == arg.to_sym }
+          end
 
-              instance
-            end
+          # The finder method which returns the property if present, otherwise a new instance with defaults
+          def lookup(arg)
+            instance   = lookup_without_default(arg)
+            instance ||= build_default(arg)
 
-            # 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
+            instance.send("#{owner_class_sym}=", @owner) if @owner.new_record?
+
+            instance
+          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.
+          def lookup_or_default(arg)
+            instance = detect { |property| property.name.to_sym == arg.to_sym }
+            instance ||= new(:value => default(arg))
           end
         end
       end

data/property_sets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-09-22}
+  s.date = %q{2011-11-29}
   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 = [
@@ -41,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.6.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Property sets for ActiveRecord}
   s.test_files = [
     "test/helper.rb",
@@ -54,18 +54,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.10"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.10"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.10"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.14"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.14"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.14"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 2.3.10"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.10"])
-      s.add_dependency(%q<actionpack>, ["~> 2.3.10"])
+      s.add_dependency(%q<activesupport>, ["~> 2.3.14"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.14"])
+      s.add_dependency(%q<actionpack>, ["~> 2.3.14"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -73,9 +73,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 2.3.10"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.10"])
-    s.add_dependency(%q<actionpack>, ["~> 2.3.10"])
+    s.add_dependency(%q<activesupport>, ["~> 2.3.14"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.14"])
+    s.add_dependency(%q<actionpack>, ["~> 2.3.14"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

data/test/test_property_sets.rb

@@ -208,6 +208,34 @@ class TestPropertySets < ActiveSupport::TestCase
       end
     end
 
+    context "lookup" do
+      context "with data" do
+        setup { @account.texts.foo = "1" }
+
+        should "return the data" do
+          assert_equal "1", @account.texts.lookup(:foo).value
+        end
+      end
+
+      context "without data" do
+        should "create a new record, returning the default" do
+          assert_equal nil, @account.texts.lookup(:foo).value
+          assert @account.texts.detect { |p| p.name == "foo" }
+        end
+      end
+    end
+
+    context "lookup_without_default" do
+      should "return the row if it exists" do
+        @account.texts.foo = "1"
+        assert_equal "1", @account.texts.lookup_without_default(:foo).value
+      end
+
+      should "return nil otherwise" do
+        assert_equal nil,  @account.texts.lookup_without_default(:foo)
+      end
+    end
+
     context "typed columns" do
       context "string data" do
         should "be writable and readable" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,60 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 -07:00
+date: 2011-11-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 2
         - 3
-        - 10
-        version: 2.3.10
+        - 14
+        version: 2.3.14
+  prerelease: false
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 2
         - 3
-        - 10
-        version: 2.3.10
+        - 14
+        version: 2.3.14
+  prerelease: false
   type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 2
         - 3
-        - 10
-        version: 2.3.10
+        - 14
+        version: 2.3.14
+  prerelease: false
   type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +77,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +93,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +109,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
+  prerelease: false
   type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
-  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,11 +123,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -138,6 +137,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
   requirement: *id008
 description: This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Property sets for ActiveRecord