active_attr 0.13.1 → 0.14.0

data/active_attr.gemspec

@@ -9,6 +9,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/cgriego/active_attr"
   gem.license       = "MIT"
 
+  gem.metadata = {
+    "changelog_uri" => "https://github.com/cgriego/active_attr/blob/master/CHANGELOG.md",
+  }
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -16,11 +20,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ActiveAttr::VERSION
 
+  gem.required_ruby_version = ">= 1.9.2"
+
+  gem.add_runtime_dependency "actionpack",    ">= 3.0.2", "< 6.1"
   gem.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 6.1"
   gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 6.1"
 
   gem.add_development_dependency "bundler",      "~> 1.0"
-  gem.add_development_dependency "factory_girl", ">= 2.2", "< 5.0"
+  gem.add_development_dependency "factory_bot",  "< 5.0"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake",         ">= 0.9.0", "< 10.6"
   gem.add_development_dependency "rspec",        "~> 3.0"

data/gemfiles/rails_3_0.gemfile

@@ -2,9 +2,5 @@ source "https://rubygems.org"
 
 gemspec :development_group => :test, :path => ".."
 
-if RUBY_VERSION < "1.9.2"
-  gem "factory_girl", "< 3.0", :group => :test
-end
-
 gem "activemodel",   "~> 3.0.2"
 gem "activesupport", "~> 3.0.2"

data/gemfiles/rails_3_1.gemfile

@@ -2,10 +2,6 @@ source "https://rubygems.org"
 
 gemspec :development_group => :test, :path => ".."
 
-if RUBY_VERSION < "1.9.2"
-  gem "factory_girl", "< 3.0", :group => :test
-end
-
 if RUBY_VERSION < "1.9.3"
   gem "i18n", "< 0.7"
 end

data/gemfiles/rails_3_2.gemfile

@@ -2,10 +2,6 @@ source "https://rubygems.org"
 
 gemspec :development_group => :test, :path => ".."
 
-if RUBY_VERSION < "1.9.2"
-  gem "factory_girl", "< 3.0", :group => :test
-end
-
 if RUBY_VERSION < "1.9.3"
   gem "i18n", "< 0.7"
 end

data/gemfiles/rails_4_0.gemfile

@@ -4,5 +4,5 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 4.0.0"
 gem "activesupport", "~> 4.0.0"
-gem "actionpack",    "~> 4.0.0", :group => :test
+gem "actionpack",    "~> 4.0.0"
 gem "protected_attributes", :group => :test

data/gemfiles/rails_4_1.gemfile

@@ -4,5 +4,5 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 4.1.0"
 gem "activesupport", "~> 4.1.0"
-gem "actionpack",    "~> 4.1.0", :group => :test
+gem "actionpack",    "~> 4.1.0"
 gem "protected_attributes", :group => :test

data/gemfiles/rails_4_2.gemfile

@@ -4,5 +4,5 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
-gem "actionpack",    "~> 4.2.0", :group => :test
+gem "actionpack",    "~> 4.2.0"
 gem "protected_attributes", :group => :test

data/gemfiles/rails_5_0.gemfile

@@ -4,6 +4,6 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 5.0.0"
 gem "activesupport", "~> 5.0.0"
-gem "actionpack",    "~> 5.0.0", :group => :test
+gem "actionpack",    "~> 5.0.0"
 gem "activemodel-serializers-xml", :group => :test
 gem "protected_attributes_continued", :group => :test

data/gemfiles/rails_5_1.gemfile

@@ -4,6 +4,6 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 5.1.0"
 gem "activesupport", "~> 5.1.0"
-gem "actionpack",    "~> 5.1.0", :group => :test
+gem "actionpack",    "~> 5.1.0"
 gem "activemodel-serializers-xml", :group => :test
 gem "protected_attributes_continued", :group => :test

data/gemfiles/rails_5_2.gemfile

@@ -4,6 +4,6 @@ gemspec :development_group => :test, :path => ".."
 
 gem "activemodel",   "~> 5.2.0"
 gem "activesupport", "~> 5.2.0"
-gem "actionpack",    "~> 5.2.0", :group => :test
+gem "actionpack",    "~> 5.2.0"
 gem "activemodel-serializers-xml", :group => :test
 gem "protected_attributes_continued", :group => :test

data/gemfiles/rails_head.gemfile

@@ -5,7 +5,7 @@ gemspec :development_group => :test, :path => ".."
 git "git://github.com/rails/rails.git" do
   gem "activemodel"
   gem "activesupport"
-  gem "actionpack", :group => :test
+  gem "actionpack"
 end
 
 gem "activemodel-serializers-xml", :group => :test, :git => "git://github.com/rails/activemodel-serializers-xml.git"

data/lib/active_attr.rb

@@ -4,7 +4,7 @@ require "active_support/dependencies/autoload"
 # ActiveAttr is a set of modules to enhance Plain Old Ruby Objects (POROs)
 #
 # These modules give your objects the type of features that are normally found
-# in popular Object Relation Mappers (ORMs) like ActiveRecord, DataMapper, and
+# in popular Object Relation Mappers (ORMs) like ActiveRecord, Sequel, and
 # Mongoid. The goal is to lower the bar for creating easy-to-use Ruby models.
 module ActiveAttr
   extend ActiveSupport::Autoload

data/lib/active_attr/attributes.rb

@@ -5,6 +5,12 @@ require "active_model"
 require "active_support/concern"
 require "active_support/hash_with_indifferent_access"
 
+begin
+  require "active_support/parameter_filter"
+rescue LoadError
+  require "action_dispatch/http/parameter_filter"
+end
+
 module ActiveAttr
   # Attributes provides a set of class methods for defining an attributes
   # schema and instance methods for reading and writing attributes.
@@ -23,11 +29,42 @@ module ActiveAttr
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
-    # Methods deprecated on the Object class which can be safely overridden
-    # @since 0.3.0
-    DEPRECATED_OBJECT_METHODS = %w(id type)
+    # @private
+    # @since 0.14.0
+    FILTERED = '[FILTERED]'.freeze
+
+    # @private
+    # @since 0.14.0
+    PARAMETER_FILTER = if defined?(ActiveSupport::ParameterFilter)
+      ActiveSupport::ParameterFilter
+    else
+      ActionDispatch::Http::ParameterFilter
+    end
+
+    # Specifies attributes which won't be exposed while calling #inspect
+    #
+    # @return [Array<#to_s, Regexp, Proc>] filter_attributes Configured
+    # global default filtered attributes
+    #
+    # @since 0.14.0
+    def self.filter_attributes
+      @filter_attributes ||= []
+    end
+
+    # Configure the global default filtered attributes
+    #
+    # @param [Array<#to_s, Regexp, Proc>] new_filter_attributes The new
+    # global default filtered attributes
+    #
+    # @since 0.14.0
+    def self.filter_attributes=(new_filter_attributes)
+      @filter_attributes = new_filter_attributes
+    end
 
     included do
+      class_attribute :filter_attributes, :instance_writer => false
+      self.filter_attributes = Attributes.filter_attributes
+
       attribute_method_suffix "" if attribute_method_matchers.none? { |matcher| matcher.prefix == "" && matcher.suffix == "" }
       attribute_method_suffix "="
     end
@@ -70,7 +107,20 @@ module ActiveAttr
     #
     # @since 0.2.0
     def inspect
-      attribute_descriptions = attributes.sort.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
+      inspection_filter = PARAMETER_FILTER.new(filter_attributes)
+      original_attributes = attributes
+      filtered_attributes = inspection_filter.filter(original_attributes)
+
+      attribute_descriptions = filtered_attributes.sort.map { |key, value|
+        inspect_value = case
+        when original_attributes[key].nil? then nil.inspect
+        when value == FILTERED then FILTERED
+        else value.inspect
+        end
+
+        "#{key}: #{inspect_value}"
+      }.join(", ")
+
       separator = " " unless attribute_descriptions.empty?
       "#<#{self.class.name}#{separator}#{attribute_descriptions}>"
     end
@@ -150,7 +200,9 @@ module ActiveAttr
     #
     # @since 0.7.0
     def attributes_map
-      Hash[ self.class.attribute_names.map { |name| [name, yield(name)] } ]
+      self.class.attribute_names.each_with_object({}) do |name, hash|
+        hash[name] = yield(name)
+      end
     end
 
     module ClassMethods
@@ -202,6 +254,7 @@ module ActiveAttr
           # Force active model to generate attribute methods
           remove_instance_variable("@attribute_methods_generated") if instance_variable_defined?("@attribute_methods_generated")
           define_attribute_methods([attribute_definition.name]) unless attribute_names.include? attribute_name
+          remove_instance_variable("@attribute_names") if instance_variable_defined?("@attribute_names")
           attributes[attribute_name] = attribute_definition
         end
       end
@@ -215,7 +268,7 @@ module ActiveAttr
       #
       # @since 0.5.0
       def attribute_names
-        attributes.keys
+        @attribute_names ||= attributes.keys
       end
 
       # Returns a Hash of AttributeDefinition instances
@@ -251,7 +304,7 @@ module ActiveAttr
       # @since 0.6.0
       def dangerous_attribute?(name)
         attribute_methods(name).detect do |method_name|
-          !DEPRECATED_OBJECT_METHODS.include?(method_name.to_s) && allocate.respond_to?(method_name, true)
+          allocate.respond_to?(method_name, true)
         end unless attribute_names.include? name.to_s
       end
 
@@ -273,8 +326,8 @@ module ActiveAttr
 
       # Assign a set of attribute definitions, used when subclassing models
       #
-      # @param [Array<ActiveAttr::AttributeDefinition>] The Array of
-      #   AttributeDefinition instances
+      # @param [Array<ActiveAttr::AttributeDefinition>] attributes The
+      #   Array of AttributeDefinition instances
       #
       # @since 0.2.2
       def attributes=(attributes)

data/lib/active_attr/chainable_initialization.rb

@@ -18,14 +18,10 @@ module ActiveAttr
   module ChainableInitialization
     class << self
       # A collection of Ruby base objects
-      #   [Object] on Ruby 1.8
-      #   [Object, BasicObject] on Ruby 1.9
+      #   [Object, BasicObject]
       #
       # @private
-      BASE_OBJECTS = [].tap do |base_objects|
-        superclass = Class.new
-        base_objects << superclass while superclass = superclass.superclass
-      end
+      BASE_OBJECTS = [Object, BasicObject]
 
       # Only append the features of this module to the class that inherits
       # directly from one of the BASE_OBJECTS

data/lib/active_attr/logger.rb

@@ -24,7 +24,7 @@ module ActiveAttr
 
     # Configure the global default logger
     #
-    # @param [Logger, #debug] logger The new global default logger
+    # @param [Logger, #debug] new_logger The new global default logger
     #
     # @since 0.3.0
     def self.logger=(new_logger)

data/lib/active_attr/mass_assignment.rb

@@ -24,8 +24,8 @@ module ActiveAttr
     #   person.first_name #=> "Chris"
     #   person.last_name #=> "Griego"
     #
-    # @param [Hash{#to_s => Object}, #each] attributes Attributes used to
-    #   populate the model
+    # @param [Hash{#to_s => Object}, #each] new_attributes Attributes
+    #   used to populate the model
     # @param [Hash, #[]] options Options that affect mass assignment
     #
     # @option options [Symbol] :as (:default) Mass assignment role

data/lib/active_attr/matchers/have_attribute_matcher.rb

@@ -76,7 +76,7 @@ module ActiveAttr
         @attribute_options[:default] = default_value
         @description << " with a default value of #{default_value.inspect}"
         @expected_ancestors << "ActiveAttr::AttributeDefaults"
-        @attribute_expectations << lambda { actual_attribute_definition[:default] == default_value }
+        @attribute_expectations << lambda { @model_class.allocate.send(:_attribute_default, @attribute_name) == default_value }
         self
       end
 

data/lib/active_attr/model.rb

@@ -23,6 +23,7 @@ module ActiveAttr
   module Model
     extend ActiveSupport::Concern
     include BasicModel
+    include ActiveModel::Validations::Callbacks
     include BlockInitialization
     include Logger
     include MassAssignment

data/lib/active_attr/query_attributes.rb

@@ -52,7 +52,7 @@ module ActiveAttr
     private
 
     def attribute?(name)
-      Typecasting::BooleanTypecaster.new.call(read_attribute(name))
+      !!Typecasting::BooleanTypecaster.new.call(read_attribute(name))
     end
   end
 end

data/lib/active_attr/railtie.rb

@@ -1,3 +1,4 @@
+require "active_attr/attributes"
 require "active_attr/logger"
 
 module ActiveAttr
@@ -6,5 +7,9 @@ module ActiveAttr
     initializer "active_attr.logger" do
       Logger.logger ||= ::Rails.logger
     end
+
+    initializer "active_attr.attributes" do
+      Attributes.filter_attributes += Rails.application.config.filter_parameters
+    end
   end
 end

data/lib/active_attr/typecasting/boolean_typecaster.rb

@@ -17,6 +17,13 @@ module ActiveAttr
       # @since 0.5.0
       FALSE_VALUES = ["n", "N", "no", "No", "NO", "false", "False", "FALSE", "off", "Off", "OFF", "f", "F"]
 
+      # Values which force a nil result for typecasting
+      #
+      # These values are based on the behavior of ActiveRecord
+      #
+      # @since 0.14.0
+      NIL_VALUES = ["", nil]
+
       # Typecasts an object to true or false
       #
       # Similar to ActiveRecord, when the attribute is a zero value or
@@ -34,6 +41,7 @@ module ActiveAttr
       def call(value)
         case value
         when *FALSE_VALUES then false
+        when *NIL_VALUES then nil
         when Numeric, /\A[-+]?(0+\.?0*|0*\.?0+)\z/ then !value.to_f.zero?
         else value.present?
         end

data/lib/active_attr/version.rb

@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/spec/functional/active_attr/attributes_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "active_attr/attributes"
 require "active_model"
-require "factory_girl"
+require "factory_bot"
 
 module ActiveAttr
   describe Attributes do
@@ -149,22 +149,22 @@ module ActiveAttr
       end
     end
 
-    context "building with FactoryGirl" do
-      subject(:model) { FactoryGirl.build(:person) }
+    context "building with FactoryBot" do
+      subject(:model) { FactoryBot.build(:person) }
 
       before do
         Object.const_set("Person", model_class)
 
-        FactoryGirl.define do
+        FactoryBot.define do
           factory :person, :class => :person do
-            first_name "Chris"
-            last_name "Griego"
+            first_name { "Chris" }
+            last_name { "Griego" }
           end
         end
       end
 
       after do
-        FactoryGirl.factories.clear
+        FactoryBot.factories.clear
         Object.send :remove_const, "Person"
       end
 
@@ -284,7 +284,7 @@ module ActiveAttr
             end
 
             def respond_to?(method_name, include_private=false)
-              super || method_name.to_s == "my_less_proper_missing_method" || (RUBY_VERSION < "1.9" && respond_to_missing?(method_name, include_private))
+              super || method_name.to_s == "my_less_proper_missing_method"
             end
           end
         end

data/spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb

@@ -14,6 +14,14 @@ module ActiveAttr
           include AttributeDefaults
           include TypecastedAttributes
 
+          def john
+            "John"
+          end
+
+          def doe
+            "Doe"
+          end
+
           def self.name
             "Person"
           end
@@ -167,6 +175,25 @@ module ActiveAttr
           end
         end
 
+        context "a class with the attribute and a different default (lazy evaluation)" do
+          before { model_class.attribute :first_name, :default => lambda { doe } }
+
+          describe "#matches?" do
+            it { matcher.matches?(model_class).should == false }
+          end
+
+          describe "#failure_message" do
+            before { matcher.matches?(model_class) }
+
+            it do
+              matcher.failure_message.should match Regexp.new <<-MESSAGE.strip_heredoc.chomp, Regexp::MULTILINE
+                expected: attribute :first_name, :default => "John"
+                     got: attribute :first_name, :default => #<Proc.+?>
+              MESSAGE
+            end
+          end
+        end
+
         context "a class with the attribute and the right default" do
           before { model_class.attribute :first_name, :default => "John" }
 
@@ -187,6 +214,27 @@ module ActiveAttr
             end
           end
         end
+
+        context "a class with the attribute and the right default (lazy evaluation)" do
+          before { model_class.attribute :first_name, :default => lambda { john } }
+
+          describe "#matches?" do
+            it { matcher.matches?(model_class).should == true }
+          end
+
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
+
+              it do
+                matcher.send(method).should match Regexp.new <<-MESSAGE.strip_heredoc.chomp, Regexp::MULTILINE
+                  expected not: attribute :first_name, :default => "John"
+                           got: attribute :first_name, :default => #<Proc.+?>
+                MESSAGE
+              end
+            end
+          end
+        end
       end
 
       context "a matcher with a default value of false" do