Fix sanitization of pantographs

joegattnet · Sep 9, 2013 · 6eefb80 · 6eefb80
1 parent 8eda793
commit 6eefb80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/models/concerns/pantographable.rb b/app/models/concerns/pantographable.rb
@@ -14,7 +14,7 @@ def sanitize(text)
           .gsub(/\[\{/, '(')
           .gsub(/\]\}/, ')')
           .downcase
-          .gsub(/[^#{ self.alphabet }]/, '')
+          .gsub(/[^#{ Settings.pantography.alphabet_escaped }]/, '')
     end
 
     def authenticated_twitter_client

diff --git a/config/settings.yml b/config/settings.yml
@@ -60,6 +60,7 @@ defaults: &defaults
       page_size: 30
   pantography:
     alphabet: 0123456789.,;:_@!?/#()%'-+= abcdefghijklmnopqrstuvwxyz
+    alphabet_escaped: 0123456789.,;:_@!?/#()%'\-+= abcdefghijklmnopqrstuvwxyz
     twitter_user_id: 394339242
   books:
     google_books:
@@ -172,6 +173,7 @@ development:
     errors: ['', 'UNKNOWN', 'BAD_DATA_FORMAT', 'PERMISSION_DENIED', 'INTERNAL_ERROR', 'DATA_REQUIRED', 'LIMIT_REACHED', 'QUOTA_REACHED', 'INVALID_AUTH', 'AUTH_EXPIRED', 'DATA_CONFLICT', 'ENML_VALIDATION', 'SHARD_UNAVAILABLE', 'LEN_TOO_SHORT', 'LEN_TOO_LONG', 'TOO_FEW', 'TOO_MANY', 'UNSUPPORTED_OPERATION']
   pantography:
     alphabet: 0123456789.,;:_@!?/#()%'-+= abcdefghijklmnopqrstuvwxyz
+    alphabet_escaped: 0123456789.,;:_@!?/#()%'\-+= abcdefghijklmnopqrstuvwxyz
     twitter_user_id: 237443494
 
 test:
@@ -202,6 +204,7 @@ test:
       page_size: 30
   pantography:
     alphabet: 0123456789.,;:_@!?/#()%'-+= abcdefghijklmnopqrstuvwxyz
+    alphabet_escaped: 0123456789.,;:_@!?/#()%'\-+= abcdefghijklmnopqrstuvwxyz
     twitter_user_id: 237443494
 
 

diff --git a/spec/models/pantograph_spec.rb b/spec/models/pantograph_spec.rb
@@ -29,6 +29,10 @@
     specify { Pantograph.calculate_after('.zz').should eq(',00') }
   end
 
+  describe '.sanitize' do
+    specify { Pantograph.sanitize(Settings.pantography.alphabet_escaped).should eq(Pantograph.alphabet) }
+  end
+
   # describe '.publish_next' do
   #   Pantograph.publish_next.should == ''
   # end