safe_attributes 1.0.8 → 1.0.9

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails-3-0" do
+  gem "activerecord", "~> 3.0.0"
+end
+
+appraise "rails-3-1" do
+  gem "activerecord", "~> 3.1.0"
+end
+
+appraise "rails-3-2" do
+  gem "activerecord", "~> 3.2.0"
+end

data/Gemfile

@@ -1,36 +1,16 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Kind of hacky, supposed to be cleaner with bundler 1.1 later
-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
+gemspec
+
+gem 'appraisal'
 
-platform :mri do
-  gem 'simplecov', :require => false, :group => :test
+group :test do
+  gem 'simplecov', :require => false, :platform => :mri
 end
 
 group :development do
-  gem 'jeweler', '>= 1.5.2'
-  gem 'rake', '>= 0.8.7'
-  gem 'rdoc'
-  gem 'rspec', '>= 2.3.0'
-
-  platform :ruby do
-    gem 'sqlite3', '>= 1.3.4'
-  end
-  platform :jruby 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'
+  #gem 'ruby-debug19', :platform => :mri
+  #gem 'ruby-debug-base19', '>=0.11.26'
+  #gem 'linecache19', '>=0.5.13'
 end

data/NEWS.rdoc

@@ -1,3 +1,8 @@
+= Version 1.0.9
+
+* Can avoid the railtie that automatically includes SafeAttributes, see README
+* Using appraisal to test multiple versions of activerecord
+
 = Version 1.0.8
 
 * Tested against Rails 3.2

data/README.rdoc

@@ -31,7 +31,7 @@ These largely should not run afoul of Ruby or ActiveRecord in most cases.
 To access an attribute in ActiveRecord without its normal getter or setter
 you can use a couple of different approaches.
 
-* model_instance[:attribute]  # works as both getter and setter like a hash
+* \model_instance[:attribute]  # works as both getter and setter like a hash
 * model_instance.read_attribute('attribute')
 * model_instance.write_attribute('attribute', value)
 
@@ -67,7 +67,7 @@ without issue using the recommended approach above.
 This gem has been tested with:
 
 * Ruby 1.8.7 
-* Ruby 1.9.2
+* Ruby 1.9.3
 * JRuby 1.6.4
 
 Note that as of Sept. 25, 2011, jruby 1.6.4 failed some tests when using
@@ -89,10 +89,18 @@ not to generate.
     validates_presence_of :my_attr
   end
 
+If you do not want SafeAttributes to be automatically included into 
+ActiveRecord::Base, then instead add this to your Gemfile.
+
+  gem 'safe_attributes', :require => 'safe_attributes/base'
+
+You will then need to include the SafeAttributes::Base module into any
+model you wish to have this functionality.
+
 === Outside of Rails
-  require 'safe_attributes'
+  require 'safe_attributes/base'
   class MyModel < ActiveRecord::Base
-    include SafeAttributes
+    include SafeAttributes::Base
   end
 
 == Caveats
@@ -115,8 +123,10 @@ get the developers of ActiveRecord to agree to a patch.
 
 == Copyright
 
-Copyright (c) 2010,2011 C. Brian Jones. See LICENSE for details.
+Copyright (c) 2010,2011,2012 C. Brian Jones. See LICENSE for details.
 
 == Thanks
 
 * Jaime Bellmyer - http://kconrails.com
+* James Brennan
+* Billy Watson

data/Rakefile

@@ -1,44 +1,18 @@
-require 'rubygems'
-require 'bundler'
-begin 
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "safe_attributes"
-  gem.version = version
-  gem.homepage = "http://github.com/bjones/safe_attributes"
-  gem.license = "MIT"
-  gem.summary = %Q{Useful for legacy database support, adds support for reserved word column names with ActiveRecord}
-  gem.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.}
-  gem.email = "cbj@gnu.org"
-  gem.authors = ["Brian Jones"]
-end
-Jeweler::RubygemsDotOrgTasks.new
-
+require 'bundler/gem_tasks'
+require 'appraisal'
+require 'safe_attributes/version'
 require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task :default => :spec
 
 require 'rdoc/task'
-RDoc::Task.new do |rdoc|
+Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "SafeAttributes #{version}"
+  rdoc.title = "SafeAttributes #{SafeAttributes::VERSION::STRING}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('NEWS*')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/lib/safe_attributes.rb

@@ -1,65 +1,9 @@
+require 'active_support'
+require 'safe_attributes/base'
+
 module SafeAttributes
   extend ActiveSupport::Concern
-
-  module ClassMethods
-    # 
-    # Within your model call this method once with a list of 
-    # methods matching either attribute() or attribute=() for 
-    # attributes (column names) you do not want to create the
-    # the normal method for.  You should not need to do this
-    # but the option is there in case the default list is 
-    # inadequate.
-    #
-    def bad_attribute_names(*attrs)
-      @bad_attribute_names ||= lambda {
-        methods = Array.new(attrs.collect { |x| x.to_sym })
-        methods += ActiveRecord::Base.public_instance_methods.collect { |x| x.to_sym }
-        methods += ActiveRecord::Base.protected_instance_methods.collect { |x| x.to_sym }
-        methods += ActiveRecord::Base.private_instance_methods.collect { |x| x.to_sym }
-        methods -= [:id]
-        return methods
-      }.call
-    end
-
-    # 
-    # Override the default implementation to not create the
-    # attribute() method if that method name is in the list of
-    # bad names
-    #
-    def define_method_attribute(attr_name)
-      return if (bad_attribute_names.include?(attr_name.to_sym))
-      super(attr_name)
-    end
-
-    #
-    # Override the default implementation to not create the
-    # attribute= method if that method name is in the list of
-    # bad names
-    #
-    def define_method_attribute=(attr_name)
-      method = attr_name + '='
-      return if (bad_attribute_names.include?(method.to_sym))
-      super(attr_name)
-    end
-
-    def instance_method_already_implemented?(method_name)
-      begin 
-        return super(method_name)
-      rescue ActiveRecord::DangerousAttributeError
-        return true
-      end
-      return false
-    end
-  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
-
+  include SafeAttributes::Base
 end
 
 require 'safe_attributes/railtie.rb' if defined?(Rails)

data/lib/safe_attributes/base.rb

@@ -0,0 +1,67 @@
+require 'active_support'
+
+module SafeAttributes
+  module Base
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # 
+      # Within your model call this method once with a list of 
+      # methods matching either attribute() or attribute=() for 
+      # attributes (column names) you do not want to create the
+      # the normal method for.  You should not need to do this
+      # but the option is there in case the default list is 
+      # inadequate.
+      #
+      def bad_attribute_names(*attrs)
+        @bad_attribute_names ||= lambda {
+          methods = Array.new(attrs.collect { |x| x.to_sym })
+          methods += ActiveRecord::Base.public_instance_methods.collect { |x| x.to_sym }
+          methods += ActiveRecord::Base.protected_instance_methods.collect { |x| x.to_sym }
+          methods += ActiveRecord::Base.private_instance_methods.collect { |x| x.to_sym }
+          methods -= [:id]
+          return methods
+        }.call
+      end
+
+      # 
+      # Override the default implementation to not create the
+      # attribute() method if that method name is in the list of
+      # bad names
+      #
+      def define_method_attribute(attr_name)
+        return if (bad_attribute_names.include?(attr_name.to_sym))
+        super(attr_name)
+      end
+
+      #
+      # Override the default implementation to not create the
+      # attribute= method if that method name is in the list of
+      # bad names
+      #
+      def define_method_attribute=(attr_name)
+        method = attr_name + '='
+        return if (bad_attribute_names.include?(method.to_sym))
+        super(attr_name)
+      end
+
+      def instance_method_already_implemented?(method_name)
+        begin 
+          return super(method_name)
+        rescue ActiveRecord::DangerousAttributeError
+          return true
+        end
+        return false
+      end
+    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
+
+  end
+end

data/lib/safe_attributes/version.rb

@@ -0,0 +1,9 @@
+module SafeAttributes
+  module VERSION
+    MAJOR = 1
+    MINOR = 0
+    TINY = 9
+    
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+  end
+end

data/safe_attributes.gemspec

@@ -1,77 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "safe_attributes/version"
 
 Gem::Specification.new do |s|
   s.name = "safe_attributes"
-  s.version = "1.0.8"
+  s.version = SafeAttributes::VERSION::STRING
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = '>= 1.8.10'
   s.authors = ["Brian Jones"]
-  s.date = "2012-02-04"
+  s.date = Time.now.utc.strftime("%Y-%m-%d")
+  s.summary = "Useful for legacy database support, adds support for reserved word column names with ActiveRecord"
   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"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rvmrc",
-    "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"
-  ]
+  s.email = "cbjones1@gmail.com"
   s.homepage = "http://github.com/bjones/safe_attributes"
-  s.licenses = ["MIT"]
+  s.files = Dir.glob("{lib,spec}/**/*") + %w(README.rdoc NEWS.rdoc LICENSE Rakefile Gemfile Appraisals safe_attributes.gemspec)
+  s.test_files = Dir.glob("{spec}/**/*")
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Useful for legacy database support, adds support for reserved word column names with ActiveRecord"
+  s.licenses = ["MIT"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
-      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<sqlite3>, [">= 1.3.4"])
-      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-      s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-      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<sqlite3>, [">= 1.3.4"])
-      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-      s.add_dependency(%q<jruby-openssl>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-    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<sqlite3>, [">= 1.3.4"])
-    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-    s.add_dependency(%q<jruby-openssl>, [">= 0"])
-  end
+  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<sqlite3>, [">= 1.3.4"])
 end
 

data/spec/safe_attributes/safe_attributes_spec.rb

@@ -26,7 +26,7 @@ ActiveRecord::Base.connection.create_table(:my_users) do |t|
 end
 
 class MyUser < ActiveRecord::Base
-  include SafeAttributes
+  include SafeAttributes::Base
   attr_reader :password
   def password=(p)
     @password = p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70237043376580 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +21,31 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70237043376580
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70237043374880 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70237043374880
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70237043374180 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70237043374180
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70237043373200 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *70237043373200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70237043403360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237043403360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237043400620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,64 +69,49 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70237043400620
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70237043398180 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *70237043398180
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
-  requirement: &70237043431700 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70237043431700
-- !ruby/object:Gem::Dependency
-  name: jruby-openssl
-  requirement: &70237043427660 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70237043427660
+        version: 1.3.4
 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
+email: cbjones1@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- .rvmrc
-- Gemfile
-- LICENSE
-- NEWS.rdoc
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/safe_attributes.rb
+- lib/safe_attributes/base.rb
 - lib/safe_attributes/railtie.rb
-- safe_attributes.gemspec
+- lib/safe_attributes/version.rb
+- lib/safe_attributes.rb
 - spec/safe_attributes/safe_attributes_spec.rb
 - spec/spec_helper.rb
+- README.rdoc
+- NEWS.rdoc
+- LICENSE
+- Rakefile
+- Gemfile
+- Appraisals
+- safe_attributes.gemspec
 homepage: http://github.com/bjones/safe_attributes
 licenses:
 - MIT
@@ -149,18 +127,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2760352587887080071
+      hash: -522687641704913606
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.10
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Useful for legacy database support, adds support for reserved word column
   names with ActiveRecord
-test_files: []
+test_files:
+- spec/safe_attributes/safe_attributes_spec.rb
+- spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/.rvmrc

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

data/VERSION

@@ -1 +0,0 @@
-1.0.8