sakuramochi 0.5.6 → 0.5.7

data/lib/sakuramochi.rb

@@ -10,43 +10,13 @@ module Sakuramochi
   autoload :Condition,        'sakuramochi/condition'
   autoload :Relation,         'sakuramochi/relation'
 
-  def self.configure(&block)
-    yield @config ||= Sakuramochi::Configuration.new
-  end
-
   def self.config
-    @config
+    @config ||= Sakuramochi::Configuration.new
   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 
+  def self.configure(&block)
+    yield config
+  end
 
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Relation.send(:include, Sakuramochi::Relation)

data/lib/sakuramochi/configuration.rb

@@ -6,6 +6,7 @@ module Sakuramochi
 
     def initialize
       @predicates = {}
+      restore
     end 
 
     def add(*args)
@@ -26,5 +27,41 @@ module Sakuramochi
         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

data/lib/sakuramochi/version.rb

@@ -1,3 +1,3 @@
 module Sakuramochi
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/spec/sakuramochi/predicate_builder_spec.rb

@@ -5,6 +5,7 @@ describe Sakuramochi::PredicateBuilder do
   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)

data/spec/sakuramochi/predicate_spec.rb

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

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1227588817688317651
+      hash: -1276016523191122260
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1227588817688317651
+      hash: -1276016523191122260
 requirements: []
 rubyforge_project: sakuramochi
 rubygems_version: 1.8.21