safe_attributes 1.0.7 → 1.0.8

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use ruby-1.9.3-p0@safe_attributes

data/Gemfile

@@ -4,17 +4,24 @@ source "http://rubygems.org"
 if ENV.has_key?('SA_WITH_3_0')
   gem 'activesupport', '~> 3.0.0'
   gem 'activerecord', '~> 3.0.0'
+elsif ENV.has_key?('SA_WITH_3_1')
+  gem 'activesupport', '~> 3.1.0'
+  gem 'activerecord', '~> 3.1.0'
 else
   gem 'activesupport', '>= 3.0.0'
   gem 'activerecord', '>= 3.0.0'
 end
 
+platform :mri do
+  gem 'simplecov', :require => false, :group => :test
+end
+
 group :development do
   gem 'jeweler', '>= 1.5.2'
   gem 'rake', '>= 0.8.7'
   gem 'rdoc'
   gem 'rspec', '>= 2.3.0'
-  gem 'rcov'
+
   platform :ruby do
     gem 'sqlite3', '>= 1.3.4'
   end
@@ -22,4 +29,8 @@ group :development do
     gem 'activerecord-jdbcsqlite3-adapter'
     gem 'jruby-openssl'
   end
+  # For debugging under ruby 1.9 special gems are needed
+#  gem 'ruby-debug19', :platform => :mri
+#  gem 'ruby-debug-base19', '>=0.11.26'
+#  gem 'linecache19', '>=0.5.13'
 end

data/NEWS.rdoc

@@ -1,3 +1,13 @@
+= Version 1.0.8
+
+* Tested against Rails 3.2
+* No longer uses InstanceMethods, avoids deprecation warning under Rails 3.2
+* Updated README noting column named 'attribute' will never work
+
+= Version 1.0.7
+
+* Resolved validation issue when using Devise
+
 = Version 1.0.6
 
 * Updated gemspec after verifying gem works with ActiveRecord 3.1.

data/README.rdoc

@@ -95,6 +95,14 @@ not to generate.
     include SafeAttributes
   end
 
+== Caveats
+
+It is virtually impossible to have a column named 'attribute' in your
+schema when using ActiveRecord.  After spending some time trying to 
+make it work I've come to the conclusion the only way to support this
+will be to change the tactic I'm using entirely, and likely to
+get the developers of ActiveRecord to agree to a patch.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/safe_attributes.rb

@@ -52,13 +52,11 @@ module SafeAttributes
     end
   end
 
-  module InstanceMethods
-    def read_attribute_for_validation(attr)
-      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
+  def read_attribute_for_validation(attr)
+    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
 

data/safe_attributes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "safe_attributes"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones"]
-  s.date = "2011-11-18"
+  s.date = "2012-02-04"
   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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".rvmrc",
     "Gemfile",
     "LICENSE",
     "NEWS.rdoc",
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bjones/safe_attributes"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "Useful for legacy database support, adds support for reserved word column names with ActiveRecord"
 
   if s.respond_to? :specification_version then
@@ -47,7 +48,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0.8.7"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 1.3.4"])
       s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
@@ -58,7 +58,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0.8.7"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 1.3.4"])
       s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
@@ -70,7 +69,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0.8.7"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.3.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 1.3.4"])
     s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])

data/spec/safe_attributes/safe_attributes_spec.rb

@@ -12,7 +12,6 @@ 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
@@ -92,16 +91,6 @@ describe "models" 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70339699350360 !ruby/object:Gem::Requirement
+  requirement: &70237043376580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339699350360
+  version_requirements: *70237043376580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70339699349880 !ruby/object:Gem::Requirement
+  requirement: &70237043374880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339699349880
+  version_requirements: *70237043374880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70339699349380 !ruby/object:Gem::Requirement
+  requirement: &70237043374180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70339699349380
+  version_requirements: *70237043374180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70339699348900 !ruby/object:Gem::Requirement
+  requirement: &70237043373200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70339699348900
+  version_requirements: *70237043373200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70339699364800 !ruby/object:Gem::Requirement
+  requirement: &70237043403360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339699364800
+  version_requirements: *70237043403360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339699364320 !ruby/object:Gem::Requirement
+  requirement: &70237043400620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +76,10 @@ dependencies:
         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
+  version_requirements: *70237043400620
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70339699363360 !ruby/object:Gem::Requirement
+  requirement: &70237043398180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70339699363360
+  version_requirements: *70237043398180
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: &70339699362880 !ruby/object:Gem::Requirement
+  requirement: &70237043431700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339699362880
+  version_requirements: *70237043431700
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &70339699362360 !ruby/object:Gem::Requirement
+  requirement: &70237043427660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339699362360
+  version_requirements: *70237043427660
 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.
@@ -133,6 +122,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .rvmrc
 - Gemfile
 - LICENSE
 - NEWS.rdoc
@@ -159,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2431963502241220399
+      hash: 2760352587887080071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Useful for legacy database support, adds support for reserved word column