Add clear and restore method

Author: mashiro

lib/sakuramochi.rb

@@ -18,36 +18,6 @@ def self.config
     @config
   end
 
-  configure do |config|
-    predicates = {
-      :contains =>    [:contains],
-      :starts_with => [:starts_with, :start_with],
-      :ends_with =>   [:ends_with, :end_with],
-      :in =>          [:in],
-      :eq =>          [:eq, :equal, :equals],
-      :gt =>          [:gt],
-      :gte =>         [:gte, :gteq],
-      :lt =>          [:lt],
-      :lte =>         [:lte, :lteq],
-    }
-    negative = proc { |p| "not_#{p}" }
-
-    config.add predicates[:contains],                   :arel_predicate => :matches,        :converter => proc { |v| "%#{v}%" }
-    config.add predicates[:contains].map(&negative),    :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}%" }
-    config.add predicates[:starts_with],                :arel_predicate => :matches,        :converter => proc { |v| "#{v}%" }
-    config.add predicates[:starts_with].map(&negative), :arel_predicate => :does_not_match, :converter => proc { |v| "#{v}%" }
-    config.add predicates[:ends_with],                  :arel_predicate => :matches,        :converter => proc { |v| "%#{v}" }
-    config.add predicates[:ends_with].map(&negative),   :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}" }
-    config.add predicates[:in],                         :arel_predicate => :in
-    config.add predicates[:in].map(&negative),          :arel_predicate => :not_in
-    config.add predicates[:eq],                         :arel_predicate => :eq
-    config.add predicates[:eq].map(&negative), :ne,     :arel_predicate => :not_eq
-    config.add predicates[:gt],                         :arel_predicate => :gt
-    config.add predicates[:gte],                        :arel_predicate => :gteq
-    config.add predicates[:lt],                         :arel_predicate => :lt
-    config.add predicates[:lte],                        :arel_predicate => :lteq
-  end 
-
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Relation.send(:include, Sakuramochi::Relation)
     ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)

lib/sakuramochi/configuration.rb

@@ -6,6 +6,7 @@ class Configuration
 
     def initialize
       @predicates = {}
+      restore
     end 
 
     def add(*args)
@@ -26,5 +27,41 @@ def add(*args)
         end
       end 
     end 
+
+    def clear
+      @predicates.clear
+    end
+
+    def restore
+      clear
+
+      names = {
+        :contains =>    [:contains],
+        :starts_with => [:starts_with, :start_with],
+        :ends_with =>   [:ends_with, :end_with],
+        :in =>          [:in],
+        :eq =>          [:eq, :equal, :equals],
+        :gt =>          [:gt],
+        :gte =>         [:gte, :gteq],
+        :lt =>          [:lt],
+        :lte =>         [:lte, :lteq],
+      }
+      negative = proc { |p| "not_#{p}" }
+
+      add names[:contains],                   :arel_predicate => :matches,        :converter => proc { |v| "%#{v}%" }
+      add names[:contains].map(&negative),    :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}%" }
+      add names[:starts_with],                :arel_predicate => :matches,        :converter => proc { |v| "#{v}%" }
+      add names[:starts_with].map(&negative), :arel_predicate => :does_not_match, :converter => proc { |v| "#{v}%" }
+      add names[:ends_with],                  :arel_predicate => :matches,        :converter => proc { |v| "%#{v}" }
+      add names[:ends_with].map(&negative),   :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}" }
+      add names[:in],                         :arel_predicate => :in
+      add names[:in].map(&negative),          :arel_predicate => :not_in
+      add names[:eq],                         :arel_predicate => :eq
+      add names[:eq].map(&negative), :ne,     :arel_predicate => :not_eq
+      add names[:gt],                         :arel_predicate => :gt
+      add names[:gte],                        :arel_predicate => :gteq
+      add names[:lt],                         :arel_predicate => :lt
+      add names[:lte],                        :arel_predicate => :lteq
+    end
   end 
 end

spec/sakuramochi/predicate_builder_spec.rb

@@ -5,6 +5,7 @@
   describe 'matches' do
     before do
       Sakuramochi.configure do |config|
+        config.clear
         config.add :contains, :arel_predicate => :matches, :converter => proc { |v| "%#{v}%" }
       end
       @statuses = Status.where(key => value)

spec/sakuramochi/predicate_spec.rb

@@ -86,6 +86,7 @@
     context 'config.add :test' do
       before do
         Sakuramochi.configure do |config|
+          config.clear
           config.add :test
         end
       end

spec/spec_helper.rb

@@ -12,4 +12,7 @@
     CreateTestTables.up
     CreateTestTables.seed
   end
+  config.after do
+    Sakuramochi.config.restore
+  end
 end