cleanerupper 0.2.0 → 0.2.1

data/cleanerupper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cleanerupper}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Trpcic"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-20}
   s.email = %q{mike@fluidmedia.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "./pkg/cleanerupper-0.0.0.gem",
      "./pkg/cleanerupper-0.1.0.gem",
      "./pkg/cleanerupper-0.1.1.gem",
+     "./pkg/cleanerupper-0.2.0.gem",
      "./rails/init.rb",
      "./tasks/cleanerupper_tasks.rake",
      "./test/cleanerupper_test.rb",

data/lib/cleanerupper.rb

@@ -42,7 +42,7 @@ module Cleaner
 
     #Append the following methods to the ActiveRecord::Base class
     def bind(column, method, dictionary, callback = nil)
-      #debugger
+      dictionary = [dictionary].flatten.map{|d| Cleaner::Data.dictionaries[d]}.flatten.uniq
       old_value = read_attribute(column)
       to_save = true
 
@@ -81,7 +81,7 @@ module Cleaner
 
   #This method scrambles data by rearranging the letters.
   def scramble(value, dict)
-    Cleaner::Data.dictionaries[dict].each do |word|
+    dict.each do |word|
       value.to_s.gsub!(/#{word}/, word.split(//).shuffle.join(''))
     end
     value
@@ -90,7 +90,7 @@ module Cleaner
   #This method removes selected words from the string and replaces them
   #with nothing
   def remove(value, dict)
-    Cleaner::Data.dictionaries[dict].each do |word|
+    dict.each do |word|
       value.to_s.gsub!(/#{word}/, "")
     end
     value
@@ -99,7 +99,7 @@ module Cleaner
   #This method removes selected words from the string and replaces them
   #with 'swear' characters,such as '#$@!%&'
   def replace(value, dict)
-    Cleaner::Data.dictionaries[dict].each do |word|
+    dict.each do |word|
       value.to_s.gsub!(/#{word}/, word.split(//).map{|c| c = Cleaner::Data.replacement_chars.shuffle[0]}.join(''))
     end
     value

data/test/cleanerupper_test.rb

@@ -2,7 +2,8 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 Cleaner::Data.dictionaries = {
   :words => ["scramble_test", "remove_test", "replace_test", "custom_test", "default_test"],
-  :animals => ["cat_test", "dog_test", "fish_test"]
+  :animals => ["cat_test", "dog_test", "fish_test"],
+  :furniture => ["bed_test", "chair_test"]
 }
 
 class Widget < ActiveRecord::Base
@@ -59,6 +60,11 @@ class CustomDictWidget < ActiveRecord::Base
   clean :body, :with => :scramble, :dictionary => :animals
 end
 
+class MultiDictWidget < ActiveRecord::Base
+  set_table_name :widgets
+  clean :body, :with => :scramble, :dictionary => [:animals, :furniture]
+end
+
 class CleanerupperTest < Test::Unit::TestCase
 
   def test_automatically_replace
@@ -135,8 +141,18 @@ class CleanerupperTest < Test::Unit::TestCase
     w = CustomDictWidget.new(:body => body.dup)
     w.save
     w = CustomDictWidget.find(w.id)
-    puts w.body
     assert w.body != body
     assert w.body.include?("bird_test")
   end
+
+  def test_multiple_dictionaries
+    body = "dog_test regular_test bed_test"
+    w = MultiDictWidget.new(:body => body.dup)
+    w.save
+    w = MultiDictWidget.find(w.id)
+    assert w.body != body
+    assert w.body.include?("regular_test")
+    assert !w.body.include?("dog_test")
+    assert !w.body.include?("bed_test")
+  end
 end

data/test/debug.log

@@ -2719,3 +2719,84 @@
   CustomWidget Load (0.5ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 6) 
   ScrambleWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper tteusletfd_a body', NULL, NULL)
   ScrambleWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 7) 
+  SQL (0.4ms)   select sqlite_version(*)
+  SQL (0.8ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (73.8ms)   DROP TABLE "widgets"
+  SQL (2.9ms)   CREATE TABLE "widgets" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(100), "body" varchar(255), "author_name" varchar(100)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  RemoveWidget Create (0.4ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper test', 'cleanerupper test', NULL)
+  RemoveWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 1) 
+  ReplaceWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'cleanerupper *%&*@*$@!%%! test', NULL)
+  ReplaceWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 2) 
+  ScrambleWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper lcs_artetbesm test', NULL, NULL)
+  ScrambleWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 3) 
+  CallbackWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('CALLBACK', 'cleanerupper msuotet_cts body', NULL)
+  CallbackWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 4) 
+  CustomDictWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'gtdte_os bird_test fehittss_', NULL)
+  CustomDictWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 5) 
+  CustomWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('Custom Value: cleanerupper remove_test title', 'Custom Value: cleanerupper scramble_test body', NULL)
+  CustomWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 6) 
+  ScrambleWidget Create (0.1ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper lte_tafetdsu body', NULL, NULL)
+  ScrambleWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 7) 
+  SQL (0.4ms)   select sqlite_version(*)
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (41.0ms)   DROP TABLE "widgets"
+  SQL (4.1ms)   CREATE TABLE "widgets" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(100), "body" varchar(255), "author_name" varchar(100)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  RemoveWidget Create (0.3ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper test', 'cleanerupper test', NULL)
+  RemoveWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 1) 
+  ReplaceWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'cleanerupper $@!&*%%@!*!% test', NULL)
+  ReplaceWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 2) 
+  ScrambleWidget Create (0.3ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper reteml_scbast test', NULL, NULL)
+  ScrambleWidget Load (0.4ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 3) 
+  CallbackWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('CALLBACK', 'cleanerupper tsocste_tum body', NULL)
+  CallbackWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 4) 
+  CustomDictWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'tst_oged bird_test si_hfetst', NULL)
+  CustomDictWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 5) 
+  CustomWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('Custom Value: cleanerupper remove_test title', 'Custom Value: cleanerupper scramble_test body', NULL)
+  CustomWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 6) 
+  ScrambleWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper etatl_sedfut body', NULL, NULL)
+  ScrambleWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 7) 
+  MultiDictWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'tetdos_g regular_test ebted_st', NULL)
+  SQL (0.7ms)   select sqlite_version(*)
+  SQL (0.8ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (71.9ms)   DROP TABLE "widgets"
+  SQL (3.2ms)   CREATE TABLE "widgets" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(100), "body" varchar(255), "author_name" varchar(100)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  RemoveWidget Create (0.3ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper test', 'cleanerupper test', NULL)
+  RemoveWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 1) 
+  ReplaceWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'cleanerupper !&%@$%!!*@*@ test', NULL)
+  ReplaceWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 2) 
+  ScrambleWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper lascbe_tetmrs test', NULL, NULL)
+  ScrambleWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 3) 
+  CallbackWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('CALLBACK', 'cleanerupper tm_setcstuo body', NULL)
+  CallbackWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 4) 
+  CustomDictWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, '_tedsogt bird_test eifths_st', NULL)
+  CustomDictWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 5) 
+  CustomWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('Custom Value: cleanerupper remove_test title', 'Custom Value: cleanerupper scramble_test body', NULL)
+  CustomWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 6) 
+  ScrambleWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES('cleanerupper tdtaflt_suee body', NULL, NULL)
+  ScrambleWidget Load (0.2ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 7) 
+  MultiDictWidget Create (0.2ms)   INSERT INTO "widgets" ("title", "body", "author_name") VALUES(NULL, 'stdotge_ regular_test tb_edtse', NULL)
+  MultiDictWidget Load (0.3ms)   SELECT * FROM "widgets" WHERE ("widgets"."id" = 8) 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mike Trpcic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
+date: 2010-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - ./pkg/cleanerupper-0.0.0.gem
 - ./pkg/cleanerupper-0.1.0.gem
 - ./pkg/cleanerupper-0.1.1.gem
+- ./pkg/cleanerupper-0.2.0.gem
 - ./rails/init.rb
 - ./tasks/cleanerupper_tasks.rake
 - ./test/cleanerupper_test.rb