ruby_ext 0.5.9 → 0.5.10

data/spec/core/multiple_inheritance_spec.rb

@@ -1,4 +1,4 @@
-require "core/spec_helper"
+require "spec_helper"
 
 describe "Multiple Inheritance" do
   after do
@@ -28,7 +28,7 @@ describe "Multiple Inheritance" do
     A.new.should respond_to(:instance_method)
     A.new.should respond_to(:some_accessor)
 
-    M.directly_included_by.should == [A].to_set
+    M.directly_included_by.should == {A => true}
   end
 
   it "should inherit all ancestors class methods" do
@@ -58,8 +58,8 @@ describe "Multiple Inheritance" do
     B.should respond_to(:class_method2)
     B.new.should respond_to(:instance_method)
 
-    M.directly_included_by.should == [M2].to_set
-    M2.directly_included_by.should == [B].to_set
+    M.directly_included_by.should == {M2 => true}
+    M2.directly_included_by.should == {B => true}
   end
 
   it "shouldn't redefine ancestors class methods" do

data/spec/core/must_spec.rb

@@ -1,4 +1,4 @@
-require "core/spec_helper"
+require "spec_helper"
 
 describe 'Assert' do
   it 'must & must_not' do

data/spec/core/object_spec.rb

@@ -1,15 +1,15 @@
-require "core/spec_helper"
+require "spec_helper"
 
 describe 'Object' do
-  after(:all){remove_constants :RespondTest}
+  after{remove_constants :Tmp}
 
   it "respond_to" do
-    class RespondTest
+    class Tmp
       def test; 2 end
     end
 
-    r = RespondTest.new
-    r.respond_to(:not_exist).should be_nil
-    r.respond_to(:test).should == 2
+    o = Tmp.new
+    o.respond_to(:not_exist).should be_nil
+    o.respond_to(:test).should == 2
   end
 end

data/spec/core/open_object_spec.rb

@@ -1,4 +1,4 @@
-require "core/spec_helper"
+require "spec_helper"
 
 describe 'OpenObject' do
   it 'should be comparable with hashes' do

data/spec/more/callbacks_spec.rb

@@ -1,9 +1,8 @@
-require 'more/spec_helper'
+require 'spec_helper'
 
 describe "Callbacks" do
-  before :all do
-    module CallbacksSpec; end
-    class CallbacksSpec::Basic
+  before do
+    class ABase
       inherit RubyExt::Callbacks
 
       set_callback :save, :before, :before_save
@@ -17,10 +16,10 @@ describe "Callbacks" do
         end
     end
   end
-  after(:all){remove_constants :CallbacksSpec}
+  after{remove_constants :ABase, :SomeClass, :AnotherClass}
 
   it "basic" do
-    o = CallbacksSpec::Basic.new
+    o = ABase.new
     o.should_receive :before_save
     o.should_receive :around_save_called
     o.should_receive :after_save
@@ -28,7 +27,7 @@ describe "Callbacks" do
   end
 
   it "should be possible to call before & after separatelly (in this mode :around is not available)" do
-    o = CallbacksSpec::Basic.new
+    o = ABase.new
     o.should_receive :before_save
     o.run_before_callbacks(:save)
     o.should_receive :after_save
@@ -36,7 +35,7 @@ describe "Callbacks" do
   end
 
   it "blocks" do
-    class CallbacksSpec::Blocks
+    class SomeClass
       inherit RubyExt::Callbacks
 
       set_callback(:save, :before){|controller| controller.result << :before}
@@ -55,13 +54,13 @@ describe "Callbacks" do
       end
     end
 
-    o = CallbacksSpec::Blocks.new
+    o = SomeClass.new
     o.run_callbacks(:save){"result"}.should == "result"
     o.result.should == [:before, :around_begin, :after, :around_end]
   end
 
   it "execution order" do
-    class CallbacksSpec::ExecutionOrder
+    class SomeClass
       inherit RubyExt::Callbacks
 
       # order is important, don't change it
@@ -77,7 +76,7 @@ describe "Callbacks" do
         end
     end
 
-    o = CallbacksSpec::ExecutionOrder.new
+    o = SomeClass.new
     o.should_receive(:before1).ordered.once
     o.should_receive(:around1_called).ordered.once
     o.should_receive(:before2).ordered.once
@@ -86,11 +85,11 @@ describe "Callbacks" do
   end
 
   it "inheritance" do
-    class CallbacksSpec::Inheritance < CallbacksSpec::Basic
+    class SomeClass < ABase
       set_callback :save, :before, :before_save2
     end
 
-    o = CallbacksSpec::Inheritance.new
+    o = SomeClass.new
     o.should_receive :before_save
     o.should_receive :before_save2
     o.should_receive :around_save_called
@@ -99,7 +98,7 @@ describe "Callbacks" do
   end
 
   it 'terminator' do
-    class CallbacksSpec::Terminator
+    class SomeClass
       inherit RubyExt::Callbacks
 
       set_callback :save, :before, :before_save, terminator: false
@@ -117,23 +116,23 @@ describe "Callbacks" do
         end
     end
 
-    o = CallbacksSpec::Terminator.new
+    o = SomeClass.new
     o.should_not_receive :before_save2
     o.run_callbacks(:save){"result"}.should_not == "result"
   end
 
   it 'conditions' do
-    class CallbacksSpec::Conditions
+    class SomeClass
       inherit RubyExt::Callbacks
 
       set_callback :save, :before, :before_save, only: :another_method
     end
 
-    o = CallbacksSpec::Conditions.new
+    o = SomeClass.new
     o.should_not_receive :before_save
     o.run_callbacks(:save, method: :method){"result"}.should == 'result'
 
-    o = CallbacksSpec::Conditions.new
+    o = SomeClass.new
     o.should_receive :before_save
     o.run_callbacks(:save, method: :another_method){"result"}.should == 'result'
   end
@@ -173,7 +172,7 @@ describe "Callbacks" do
 
 
   it "around callback should be able to change result value" do
-    class CallbacksSpec::ChangeResult
+    class SomeClass
       inherit RubyExt::Callbacks
 
       set_callback :save, :around, :around_save
@@ -184,7 +183,78 @@ describe "Callbacks" do
       end
     end
 
-    o = CallbacksSpec::ChangeResult.new
+    o = SomeClass.new
     o.run_callbacks(:save){"result"}.should == 'another result'
   end
+
+  describe "wrapping methods in callbacks" do
+    it "wrap_method_with_callbacks" do
+      class SomeClass
+        inherit RubyExt::Callbacks
+
+        set_callback :save, :before, :before_save
+
+        def update
+          'ok'
+        end
+
+        wrap_method_with_callbacks :update, :save
+      end
+
+      o = SomeClass.new
+      o.should_receive(:before_save).once
+      o.update.should == 'ok'
+    end
+
+    it "wrap_with_callbacks" do
+      class SomeClass
+        inherit RubyExt::Callbacks
+        def update; end
+
+        should_receive(:wrap_method_with_callbacks).with(:update, :save)
+        wrap_with_callback :save
+      end
+    end
+
+    it "callbacks for method with super call should be called only once" do
+      class SomeClass
+        inherit RubyExt::Callbacks
+
+        set_callback :save, :before, :before_save
+
+        def update
+          'ok'
+        end
+        wrap_method_with_callbacks :update, :save
+      end
+
+      class AnotherClass < SomeClass
+        def update
+          super
+          'ok2'
+        end
+        wrap_method_with_callbacks :update, :save
+      end
+
+      o = AnotherClass.new
+      o.should_receive(:before_save).once
+      o.update.should == 'ok2'
+    end
+
+    it "run_callbacks_only_once" do
+      class SomeClass
+        inherit RubyExt::Callbacks
+
+        set_callback :save, :before, :before_save
+      end
+
+      o = SomeClass.new
+      o.should_receive(:before_save).once
+      (o.run_callbacks_only_once :save do
+        o.run_callbacks_only_once :save do
+          'result'
+        end
+      end).should == 'result'
+    end
+  end
 end

data/spec/more/declarative_cache_spec.rb

@@ -1,44 +1,58 @@
-require "more/spec_helper"
+require "spec_helper"
 
 describe 'DeclarativeCache' do
-  class CachedClass
-    attr_accessor :value
-    def value_get; @value end
-    cache_method :value_get
-
-    attr_accessor :value2
-    def value2_get; @value2 end
-
-    attr_accessor :params
-    def params_get param; @params[param] end
-
-    attr_accessor :multiplier
-    def *(arg)
-      @multiplier * arg
+  after{remove_constants :Tmp, :TmpModule}
+
+  # class CachedClass
+  #   attr_accessor :value
+  #   def value_get; @value end
+  #   cache_method :value_get
+  #
+  #   attr_accessor :value2
+  #   def value2_get; @value2 end
+  #
+  #   attr_accessor :params
+  #   def params_get param; @params[param] end
+  #
+  #   attr_accessor :multiplier
+  #   def *(arg)
+  #     @multiplier * arg
+  #   end
+  #   cache_method_with_params '*'
+  # end
+  #
+  # RubyExt::DeclarativeCache.cache_method CachedClass, :value2_get
+  # RubyExt::DeclarativeCache.cache_method_with_params CachedClass, :params_get
+
+  it "basics" do
+    class Tmp
+      attr_accessor :value
+      def value_get; @value end
+      cache_method :value_get
     end
-    cache_method_with_params '*'
-  end
-
-  RubyExt::DeclarativeCache.cache_method CachedClass, :value2_get
-  RubyExt::DeclarativeCache.cache_method_with_params CachedClass, :params_get
 
-  it "Simple Cache" do
-    o = CachedClass.new
+    o = Tmp.new
     o.value = 0
-    o.value2 = 0
     o.value_get.should == 0
-    o.value2_get.should == 0
 
     o.value = 1
-    o.value2 = 1
     o.value_get.should == 0
-    o.value2_get.should == 0
   end
 
-  it "should define <method>_with_cache and <method>_without_cache methods" do
-    o = CachedClass.new
+  it "should define {method}_with_cache and {method}_without_cache methods" do
+    class Tmp
+      attr_accessor :value
+      def value_get; @value end
+      cache_method :value_get
+
+      attr_accessor :params
+      def params_get param; @params[param] end
+      cache_method_with_params :params_get
+    end
+
+    o = Tmp.new
 
-    # without params
+    # Without params.
     o.value = 0
     o.value_get.should == 0
     o.value = 1
@@ -46,7 +60,7 @@ describe 'DeclarativeCache' do
     o.value_get_with_cache.should == 0
     o.value_get_without_cache.should == 1
 
-    # with params
+    # With params.
     o.params = {a: :b}
     o.params_get(:a).should == :b
     o.params = {a: :c}
@@ -56,7 +70,13 @@ describe 'DeclarativeCache' do
   end
 
   it "clear_cache" do
-    o = CachedClass.new
+    class Tmp
+      attr_accessor :value
+      def value_get; @value end
+      cache_method :value_get
+    end
+
+    o = Tmp.new
     o.value = 0
     o.value_get.should == 0
 
@@ -67,13 +87,24 @@ describe 'DeclarativeCache' do
     o.value_get.should == 1
   end
 
-  it "should check for parameters" do
-    o = CachedClass.new
+  it "should check for method signature" do
+    class Tmp
+      def value_get; @value end
+      cache_method :value_get
+    end
+
+    o = Tmp.new
     lambda{o.value_get(1)}.should raise_error(/cache_method_with_params/)
   end
 
-  it "Cache With Params" do
-    o = CachedClass.new
+  it "cache_method_with_params" do
+    class Tmp
+      attr_accessor :params
+      def params_get param; @params[param] end
+      cache_method_with_params :params_get
+    end
+
+    o = Tmp.new
     o.params = {a: :b}
     o.params_get(:a).should == :b
     o.params = {a: :c}
@@ -81,62 +112,52 @@ describe 'DeclarativeCache' do
   end
 
   it "should works with operators" do
-    o = CachedClass.new
+    class Tmp
+      attr_accessor :multiplier
+      def *(arg)
+        @multiplier * arg
+      end
+      cache_method_with_params '*'
+    end
+
+    o = Tmp.new
     o.multiplier = 2
     (o * 2).should == 4
     o.multiplier = 3
     (o * 2).should == 4
   end
 
-  class CachedClass2
-    class << self
-      attr_accessor :value
-      def value_get; @value end
-      cache_method :value_get
+  it "should works with singleton classes" do
+    class Tmp
+      class << self
+        attr_accessor :value
+        def value_get; @value end
+        cache_method :value_get
+      end
     end
-  end
 
-  it "Simple Cache" do
-    CachedClass2.value = 0
-    CachedClass2.value_get.should == 0
-    CachedClass2.value = 1
-    CachedClass2.value_get.should == 0
+    Tmp.value = 0
+    Tmp.value_get.should == 0
+    Tmp.value = 1
+    Tmp.value_get.should == 0
   end
 
-  module CachedModule
-    attr_accessor :value
-    def value_get; @value end
-    cache_method :value_get
-  end
+  it "should works with included modules (from error)" do
+    module TmpModule
+      attr_accessor :value
+      def value_get; @value end
+      cache_method :value_get
+    end
 
-  class CachedClass3
-    include CachedModule
-  end
+    class Tmp
+      include TmpModule
+    end
 
-  it "should also works with modules (from error)" do
-    o = CachedClass.new
+    o = Tmp.new
     o.value = 0
     o.value_get.should == 0
 
     o.value = 1
     o.value_get.should == 0
   end
-
-  class CachedClass4
-    attr_accessor :value
-    def value_get; @value end
-  end
-
-  it "should not cache twice, and should works" do
-    CachedClass4.cache_method :value_get
-
-    Object.should_receive(:warn){|msg| msg =~ /twice/}
-    CachedClass4.cache_method :value_get
-
-    o = CachedClass.new
-    o.value = 0
-    o.value_get.should == 0
-    o.value = 1
-    o.value_get.should == 0
-  end
 end