safe_attributes 1.0.6 → 1.0.7

data/NEWS.rdoc

@@ -1,3 +1,7 @@
+= Version 1.0.6
+
+* Updated gemspec after verifying gem works with ActiveRecord 3.1.
+
 = Version 1.0.5
 
 * Resolved issues with columns named 'changed' and 'errors'

data/README.rdoc

@@ -54,7 +54,7 @@ attempt to install it for you.  This can result in an error like below.
   ERROR:  Error installing safe_attributes:
     activemodel requires activesupport (= 3.0.3, runtime)
 
-You can use this gem with activerecord and activesupport >= 3.0 and < 3.1.  
+You can use this gem with activerecord and activesupport >= 3.0.  
 If you already have an appropriate version of activerecord and 
 activesupport installed then use --ignore-dependencies to avoid this
 error.  If you have the latest version already then the gem should install
@@ -64,11 +64,15 @@ without issue using the recommended approach above.
 
 === Ruby
 
-This gem has been tested to work with:
+This gem has been tested with:
 
 * Ruby 1.8.7 
 * Ruby 1.9.2
-* JRuby 1.5.6
+* JRuby 1.6.4
+
+Note that as of Sept. 25, 2011, jruby 1.6.4 failed some tests when using
+ActiveRecord 3.1.  Google indicates others have seen these issues so I 
+expect it will be addressed in the near future by a new jruby release.
 
 === Rails
 Add safe_attributes to your Gemfile.

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/safe_attributes.rb

@@ -54,7 +54,11 @@ module SafeAttributes
 
   module InstanceMethods
     def read_attribute_for_validation(attr)
-      self[attr.to_sym]
+      if (self.attributes.include?(attr.to_s))
+        self[attr.to_sym]
+      else
+        self.send(attr.to_s) if (self.respond_to?(attr.to_sym))
+      end
     end
   end
 

data/safe_attributes.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{safe_attributes}
-  s.version = "1.0.6"
+  s.name = "safe_attributes"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones"]
-  s.date = %q{2011-09-25}
-  s.description = %q{Better support for legacy database schemas for ActiveRecord, such as columns named class, or any other name that conflicts with an instance method of ActiveRecord.}
-  s.email = %q{cbj@gnu.org}
+  s.date = "2011-11-18"
+  s.description = "Better support for legacy database schemas for ActiveRecord, such as columns named class, or any other name that conflicts with an instance method of ActiveRecord."
+  s.email = "cbj@gnu.org"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -31,11 +31,11 @@ Gem::Specification.new do |s|
     "spec/safe_attributes/safe_attributes_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bjones/safe_attributes}
+  s.homepage = "http://github.com/bjones/safe_attributes"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.1}
-  s.summary = %q{Useful for legacy database support, adds support for reserved word column names with ActiveRecord}
+  s.rubygems_version = "1.8.11"
+  s.summary = "Useful for legacy database support, adds support for reserved word column names with ActiveRecord"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/safe_attributes/safe_attributes_spec.rb

@@ -12,6 +12,7 @@ ActiveRecord::Base.connection.create_table(:my_models) do |t|
   t.string :errors
   # support hyphenated column names
   t.string :"comment-frequency"
+  t.string :attribute
 end
 
 class MyModel < ActiveRecord::Base
@@ -20,7 +21,23 @@ class MyModel < ActiveRecord::Base
   validates_presence_of :class
 end
 
-describe MyModel do
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'my_users'")
+ActiveRecord::Base.connection.create_table(:my_users) do |t|
+  t.string :encrypted_password
+end
+
+class MyUser < ActiveRecord::Base
+  include SafeAttributes
+  attr_reader :password
+  def password=(p)
+    @password = p
+    self.encrypted_password = p
+  end
+
+  validates_presence_of :password
+end
+
+describe "models" do
 
   before(:each) do
     ActiveRecord::Base.connection.increment_open_transactions
@@ -75,6 +92,16 @@ describe MyModel do
     (@model.methods.include?('id') || @model.methods.include?(:id)).should be_true
   end
 
+  it "does not defined attribute()" do
+    @model.respond_to?(:attribute) # to force method generation
+    (@model.methods.include?('attribute') || @model.methods.include?(:attribute)).should be_false
+  end
+
+  it "does not defined attribute=()" do
+    @model.respond_to?(:attribute=) # to force method generation
+    (@model.methods.include?('attribute=') || @model.methods.include?(:attribute=)).should be_false
+  end
+
   it "can create instance in database with special attribute name" do
     m = MyModel.create!(:class => 'Foo')
     m = MyModel.find(m.id)
@@ -114,7 +141,7 @@ describe MyModel do
     m.size.should == 0
   end
 
-  it "validates presence of class" do
+  it "validates presence of bad attribute name" do
     @model.valid?.should be_false
     Array(@model.errors[:class]).include?("can't be blank").should be_true
 
@@ -132,5 +159,12 @@ describe MyModel do
     m.changed?.should be_true
   end
 
+  it "validates presence of non-attribute" do
+    m = MyUser.new()
+    m.valid?.should be_false
+    m = MyUser.new({:password => 'foobar'})
+    m.valid?.should be_true
+  end
+
 end
 

metadata

@@ -1,181 +1,176 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: safe_attributes
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.7
   prerelease: 
-  version: 1.0.6
 platform: ruby
-authors: 
-  - Brian Jones
+authors:
+- Brian Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-25 00:00:00 -04:00
-default_executable: 
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activesupport
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.0.0
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.0.0
-    requirement: *id002
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: jeweler
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.5.2
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.8.7
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rdoc
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id005
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.3.0
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rcov
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: sqlite3
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.3.4
-    requirement: *id008
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord-jdbcsqlite3-adapter
-    version_requirements: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id009
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    version_requirements: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id010
-    prerelease: false
-    type: :development
-description: Better support for legacy database schemas for ActiveRecord, such as columns named class, or any other name that conflicts with an instance method of ActiveRecord.
+date: 2011-11-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70339699350360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70339699350360
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70339699349880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70339699349880
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70339699349380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *70339699349380
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70339699348900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *70339699348900
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70339699364800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70339699364800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70339699364320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70339699364320
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70339699363840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70339699363840
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70339699363360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :development
+  prerelease: false
+  version_requirements: *70339699363360
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcsqlite3-adapter
+  requirement: &70339699362880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70339699362880
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  requirement: &70339699362360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70339699362360
+description: Better support for legacy database schemas for ActiveRecord, such as
+  columns named class, or any other name that conflicts with an instance method of
+  ActiveRecord.
 email: cbj@gnu.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
-files: 
-  - .document
-  - .rspec
-  - Gemfile
-  - LICENSE
-  - NEWS.rdoc
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - lib/safe_attributes.rb
-  - lib/safe_attributes/railtie.rb
-  - safe_attributes.gemspec
-  - spec/safe_attributes/safe_attributes_spec.rb
-  - spec/spec_helper.rb
-has_rdoc: true
+extra_rdoc_files:
+- LICENSE
+- README.rdoc
+files:
+- .document
+- .rspec
+- Gemfile
+- LICENSE
+- NEWS.rdoc
+- README.rdoc
+- Rakefile
+- VERSION
+- lib/safe_attributes.rb
+- lib/safe_attributes/railtie.rb
+- safe_attributes.gemspec
+- spec/safe_attributes/safe_attributes_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/bjones/safe_attributes
-licenses: 
-  - MIT
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -2431963502241220399
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Useful for legacy database support, adds support for reserved word column names with ActiveRecord
+summary: Useful for legacy database support, adds support for reserved word column
+  names with ActiveRecord
 test_files: []
-