Use forked strip_attributes

Applies @henare's changes from 702399a. Upgrades from the deprecated bang syntax See #903 for more info.
mysociety · Nov 17, 2015 · 08115b2 · 08115b2
1 parent c23efa8
commit 08115b2
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 267 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,6 +32,7 @@ gem 'rmagick', '~> 2.14.0'
 gem 'ruby-msg', '~> 1.5.0',  :git => 'https://github.com/mysociety/ruby-msg.git', :ref => 'f9f928ed76c024b4bc3a08bc1a59beb62df36663'
 gem 'secure_headers', '~> 2.0.2'
 gem 'statistics2', '~> 0.54'
+gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3'
 gem 'syslog_protocol', '~> 0.9.2'
 gem 'thin', '~> 1.5.1'
 gem 'vpim', '~> 13.11.11'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -17,6 +17,14 @@ GIT
       ruby-ole (>= 1.2.8)
       vpim (>= 0.360)
 
+GIT
+  remote: https://github.com/mysociety/strip_attributes.git
+  revision: ce9e1f477bc9324074f6fbf1d3c3bb33305abb0d
+  branch: globalize3
+  specs:
+    strip_attributes (1.7.0)
+      activemodel (>= 3.0, < 5.0)
+
 GIT
   remote: https://github.com/technoweenie/acts_as_versioned.git
   revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b
@@ -375,6 +383,7 @@ DEPENDENCIES
   secure_headers (~> 2.0.2)
   spork-rails (~> 3.2.1)
   statistics2 (~> 0.54)
+  strip_attributes!
   syslog_protocol (~> 0.9.2)
   therubyracer (~> 0.12.0)
   thin (~> 1.5.1)

diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -22,7 +22,7 @@
 
 class Comment < ActiveRecord::Base
   include AdminColumn
-  strip_attributes!
+  strip_attributes :allow_empty => true
 
   belongs_to :user
   belongs_to :info_request

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
@@ -33,7 +33,7 @@ class InfoRequest < ActiveRecord::Base
 
   @non_admin_columns = %w(title url_title)
 
-  strip_attributes!
+  strip_attributes :allow_empty => true
 
   validates_presence_of :title, :message => N_("Please enter a summary of your request")
   # TODO: When we no longer support Ruby 1.8, this can be done with /[[:alpha:]]/

diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
@@ -51,7 +51,7 @@ class OutgoingMessage < ActiveRecord::Base
   # reindex if body text is edited (e.g. by admin interface)
   after_update :xapian_reindex_after_update
 
-  strip_attributes!
+  strip_attributes :allow_empty => true
   has_prominence
 
   self.default_url_options[:host] = AlaveteliConfiguration.domain

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
@@ -92,7 +92,7 @@ class ImportCSVDryRun < StandardError ; end
     [:tag_array_for_search, 'U', "tag"]
   ]
   has_tag_string
-  strip_attributes!
+  strip_attributes :allow_empty => true
   translates :name, :short_name, :request_email, :url_name, :notes, :first_letter, :publication_scheme
 
   # Cannot be grouped at top as it depends on the `translates` macro

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,7 +27,7 @@
 require 'digest/sha1'
 
 class User < ActiveRecord::Base
-  strip_attributes!
+  strip_attributes :allow_empty => true
 
   attr_accessor :password_confirmation, :no_xapian_reindex
 

diff --git a/config/initializers/strip_attributes.rb b/config/initializers/strip_attributes.rb
diff --git a/lib/has_tag_string/has_tag_string.rb b/lib/has_tag_string/has_tag_string.rb
@@ -11,7 +11,7 @@ module HasTagString
   # Represents one tag of one model.
   # The migration to make this is currently only in WDTK code.
   class HasTagStringTag < ActiveRecord::Base
-    # TODO: strip_attributes!
+    # TODO: strip_attributes
 
     validates_presence_of :name
 

diff --git a/lib/strip_attributes/README.rdoc b/lib/strip_attributes/README.rdoc
diff --git a/lib/strip_attributes/Rakefile b/lib/strip_attributes/Rakefile
diff --git a/lib/strip_attributes/strip_attributes.rb b/lib/strip_attributes/strip_attributes.rb
diff --git a/lib/strip_attributes/test/strip_attributes_test.rb b/lib/strip_attributes/test/strip_attributes_test.rb
diff --git a/lib/strip_attributes/test/test_helper.rb b/lib/strip_attributes/test/test_helper.rb
diff --git a/spec/integration/globalize_strip_attributes_spec.rb b/spec/integration/globalize_strip_attributes_spec.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe 'globalize3 and strip_attributes' do
+
+  it 'strips spaces from attributes in the default locale' do
+    body = FactoryGirl.build(:public_body, :name => ' Trailing Spaces ')
+    body.translations_attributes = { :es => { :locale => 'es',
+                                              :name => ' El Body ' } }
+    body.save!
+    body.reload
+    expect(body.name).to eq('Trailing Spaces')
+    expect(body.name(:es)).to eq(' El Body ')
+  end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -15,7 +15,6 @@
   add_filter  'commonlib'
   add_filter  'vendor/plugins'
   add_filter  'lib/attachment_to_html'
-  add_filter  'lib/strip_attributes'
   add_filter  'lib/has_tag_string'
   add_filter  'lib/acts_as_xapian'
   add_filter  'lib/themes'