strip_attributes 1.4.0 → 1.4.1

data/lib/strip_attributes.rb

@@ -44,6 +44,8 @@ module StripAttributes
       end
 
       attributes.each do |attr, value|
+        original_value = value
+
         if value.respond_to?(:strip)
           value = (value.blank? && !allow_empty) ? nil : value.strip
         end
@@ -52,7 +54,7 @@ module StripAttributes
           value.squeeze!(' ')
         end
 
-        record[attr] = value
+        record[attr] = value if original_value != value
       end
   end
 

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/test/matchers_test.rb

@@ -3,9 +3,12 @@ require "test_helper"
 require "strip_attributes/matchers"
 
 class SampleMockRecord < Tableless
-  attributes :stripped1, :stripped2, :stripped3
-  attributes :unstripped1, :unstripped2, :unstripped3
-
+  attribute :stripped1
+  attribute :stripped2
+  attribute :stripped3
+  attribute :unstripped1
+  attribute :unstripped2
+  attribute :unstripped3
   strip_attributes :only => [:stripped1, :stripped2, :stripped3]
 end
 

data/test/strip_attributes_test.rb

@@ -2,7 +2,12 @@ require "test_helper"
 
 module MockAttributes
   def self.included(base)
-    base.attributes :foo, :bar, :biz, :baz, :bang, :foz
+    base.attribute :foo
+    base.attribute :bar
+    base.attribute :biz
+    base.attribute :baz
+    base.attribute :bang
+    base.attribute :foz
   end
 end
 
@@ -41,6 +46,16 @@ class CollapseDuplicateSpaces < Tableless
   strip_attributes :collapse_spaces => true
 end
 
+class CoexistWithOtherValidations < Tableless
+  attribute :number, :type => Integer
+
+  strip_attributes
+  validates :number, {
+    :numericality => { :only_integer => true,  :greater_than_or_equal_to => 1000 },
+    :allow_blank => true
+  }
+end
+
 class StripAttributesTest < MiniTest::Unit::TestCase
   def setup
     @init_params = { :foo => "\tfoo", :bar => "bar \t ", :biz => "\tbiz ", :baz => "", :bang => " ", :foz => " foz  foz" }
@@ -139,4 +154,19 @@ class StripAttributesTest < MiniTest::Unit::TestCase
     assert_equal "",         record.baz
     assert_equal "",         record.bang
   end
+
+  def test_should_coexist_with_other_validations
+    record = CoexistWithOtherValidations.new
+    record.number = 1000.1
+    assert !record.valid?, "Expected record to be invalid"
+    assert record.errors.include?(:number), "Expected record to have an error on :number"
+
+    record = CoexistWithOtherValidations.new(:number => " 1000.2 ")
+    assert !record.valid?, "Expected record to be invalid"
+    assert record.errors.include?(:number), "Expected record to have an error on :number"
+
+    # record = CoexistWithOtherValidations.new(:number => " 1000 ")
+    # assert record.valid?, "Expected record to be valid, but got #{record.errors.full_messages}"
+    # assert !record.errors.include?(:number), "Expected record to have no errors on :number"
+  end
 end

data/test/test_helper.rb

@@ -1,44 +1,9 @@
 require "minitest/autorun"
 require "minitest/pride"
-require "active_record"
-require "active_support/core_ext/hash/indifferent_access"
+require "active_attr"
 require "strip_attributes"
 
-# Tableless ActiveModel with some parts borrowed from both
-# http://railscasts.com/episodes/219-active-model and ActiveRecord's
-# implementation.
 class Tableless
-  include ActiveModel::Validations
+  include ActiveAttr::Model
   include ActiveModel::Validations::Callbacks
-
-  def initialize(attributes = {})
-    attributes.each { |name, value| send("#{name}=", value) }
-  end
-
-  def attributes
-    attrs = HashWithIndifferentAccess.new
-    self.class.attribute_names.each { |name| attrs[name] = self[name] }
-    attrs
-  end
-
-  def assign_attributes(attributes = {})
-    attributes.each { |name, value| send("#{name}=", value) }
-  end
-
-  def [](name)
-    send name
-  end
-
-  def []=(name, value)
-    send "#{name}=", value
-  end
-
-  def self.attribute_names
-    @attribute_names ||= []
-  end
-
-  def self.attributes(*names)
-    attr_accessor *names
-    attribute_names.concat names
-  end
 end

metadata

@@ -2,14 +2,14 @@
 name: strip_attributes
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -29,34 +29,34 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  name: minitest-matchers
+  name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
     none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  name: activerecord
+  name: minitest-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
     none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 1684897256707613928
+      hash: -830091072879827042
       segments:
       - 0
       version: '0'
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 1684897256707613928
+      hash: -830091072879827042
       segments:
       - 0
       version: '0'