rdbc 0.2.5 → 0.3.0

data/lib/rdbc.rb

@@ -1,7 +1,6 @@
 module Rdbc
   autoload 'Contract', 'rdbc/contract'
   autoload 'Decorator', 'rdbc/decorator'
-  autoload 'Translating', 'rdbc/translating'
 end
 
 
@@ -10,7 +9,7 @@ class Class
     old_new = self.method(:new)
     (class << self; self; end).send(:define_method, :new) do |*args|
       object = old_new.call(*args)
-      Rdbc::Decorator.new(object, contract_class.new)
+      Rdbc::Decorator.new(contract_class.new(object))
     end
   end
 end

data/lib/rdbc/contract.rb

@@ -1,55 +1,81 @@
 module Rdbc
   class Contract
-    class << self
-      include Translating
-    
-      def pre(method, &block)
-        define_method(method_pre(method), &block)
-      end
+    def self.method_pre(method)
+       method_with_prefix(method, 'pre')
+    end
 
-      def post(method, &block)
-        define_method(method_post(method), &block)
-      end
+    def self.method_post(method)
+      method_with_prefix(method, 'post')
+    end
 
-      def invariant(&block)
-        define_method(:invariant, &block)
-      end
+    def self.method_with_prefix(method, type)
+      (type + '_' + (operator?(method) ? operator(method) : method.to_s)).to_sym
     end
-    
-    include Translating
-   
-    def delegate_and_verify(object_pre, object)
-      send_method_pre(method, object, *args)
-      begin
-        result = object.send(method, *args)
-      rescue => exception
-        send_invariant(object)
-        send_method_post(method, object_pre, object, exception, result, *args)
-        raise exception
-      else
-        send_invariant(@object)
-        send_method_post(method, object_pre, object, exception, result, *args)
-        result
-      end
+
+    def self.operator?(method)
+      /^[A-Za-z_]/ !~ method.to_s
     end
- 
-    def send_method_pre(method, object, *args)
-      method_pre = method_pre(method)
-      if respond_to?(method_pre)
-        send(method_pre, object, *args)
-      end
+
+    def self.operator(method)
+      'op_' + OPERATOR[method]
     end
-    
-    def send_invariant(object)
-      if respond_to?(:invariant)
-        invariant(object)
-      end
+
+    OPERATOR = {
+      :[]  => 'element_read',
+      :[]= => 'element_write',
+      :**  => 'power',
+      :~   => 'not',
+      :+@  => 'unary_plus',
+      :-@  => 'unary_minus',
+      :*   => 'product',
+      :/   => 'quotient',
+      :%   => 'modulo',
+      :+   => 'plus',
+      :-   => 'minus',
+      :>>  => 'right_shift',
+      :<<  => 'left_shift',
+      :&   => 'and',
+      :^   => 'xor',
+      :|   => 'or',
+      :<=  => 'less_or_equal',
+      :<   => 'less',
+      :>   => 'greater',
+      :>=  => 'greater_or_equal',
+      :<=> => 'comparison',
+      :==  => 'eql',
+      :=== => 'case_comparison',
+      :=~  => 'match'
+    }
+
+    def self.pre(method, &block)
+      define_method(method_pre(method), &block)
+    end
+
+    def self.post(method, &block)
+      define_method(method_post(method), &block)
+    end
+
+    def self.invariant(&block)
+      define_method(:invariant, &block)
     end
     
-    def send_method_post(method, object_pre, object, exception, result, *args)
-      method_post = method_post(method)
-      if respond_to?(method_post)
-        send(method_post, object_pre, object, exception, result, *args)
+    def initialize(object)
+      @object = object
+      @translator = self.class
+    end
+   
+    def method_missing(method, *args)
+      @object_pre = @object.clone
+      send_if_respond_to(@translator.method_pre(method), *args)
+      result = @object.send(method, *args) rescue result
+      send_if_respond_to(:invariant)
+      send_if_respond_to(@translator.method_post(method), result, *args)
+      result
+    end
+ 
+    def send_if_respond_to(method, *args)
+      if respond_to?(method)
+        send(method, *args)
       end
     end
   end

data/lib/rdbc/decorator.rb

@@ -1,19 +1,20 @@
+require 'blankslate'
+
 module Rdbc
-  class Decorator
+  class Decorator < BlankSlate
     instance_methods.reject do |method|
       /__.*__/ === method
     end.each do |method|
       undef_method(method)
     end
   
-    def initialize(object, contract)
-      @object = object
+    def initialize(contract)
       @contract = contract
-      @contract.send_invariant(@object)
+      @contract.send_if_respond_to(:invariant)
     end
 
     def method_missing(method, *args)
-      @contract.delegate_and_verify(@object.clone, @object)
+      @contract.method_missing(method, *args)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdbc
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Armin Joellenbeck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 +01:00
+date: 2009-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,6 @@ files:
 - lib/rdbc.rb
 - lib/rdbc/contract.rb
 - lib/rdbc/decorator.rb
-- lib/rdbc/translating.rb
 has_rdoc: true
 homepage: http://github.com/armin-joellenbeck/rdbc/tree/master
 licenses: []

data/lib/rdbc/translating.rb

@@ -1,50 +0,0 @@
-module Rdbc
-  module Translating
-    def method_pre(method)
-       method_with_prefix(method, 'pre')
-    end
-
-    def method_post(method)
-      method_with_prefix(method, 'post')
-    end
-
-    def method_with_prefix(method, type)
-      (type + '_' + (operator?(method) ? operator(method) : method.to_s)).to_sym
-    end
-
-    def operator?(method)
-      /^[A-Za-z_]/ !~ method.to_s
-    end
-
-    def operator(method)
-      'op_' + OPERATOR[method]
-    end
-
-    OPERATOR = {
-      :[]  => 'element_read',
-      :[]= => 'element_write',
-      :**  => 'power',
-      :~   => 'not',
-      :+@  => 'unary_plus',
-      :-@  => 'unary_minus',
-      :*   => 'product',
-      :/   => 'quotient',
-      :%   => 'modulo',
-      :+   => 'plus',
-      :-   => 'minus',
-      :>>  => 'right_shift',
-      :<<  => 'left_shift',
-      :&   => 'and',
-      :^   => 'xor',
-      :|   => 'or',
-      :<=  => 'less_or_equal',
-      :<   => 'less',
-      :>   => 'greater',
-      :>=  => 'greater_or_equal',
-      :<=> => 'comparison',
-      :==  => 'eql',
-      :=== => 'case_comparison',
-      :=~  => 'match'
-    }
-  end
-end