lib/ridley/client.rb in ridley-0.11.2 vs lib/ridley/client.rb in ridley-0.12.0.rc1

@@ -52,12 +52,14 @@
       end
     end
 
     class << self
       def open(options = {}, &block)
-        cli = new(options)
-        cli.evaluate(&block)
+        client = new(options)
+        yield client
+      ensure
+        client.terminate if client && client.alive?
       end
 
       # @raise [ArgumentError]
       #
       # @return [Boolean]
@@ -264,34 +266,12 @@
 
     def server_url
       self.url_prefix.to_s
     end
 
-    def evaluate(&block)
-      unless block_given?
-        raise LocalJumpError, "no block given (yield)"
-      end
-
-      @self_before_instance_eval = eval("self", block.binding)
-      instance_eval(&block)
-    end
-    alias_method :sync, :evaluate
-
     private
 
       def connection
         @connection_registry[:connection_pool]
-      end
-
-      def method_missing(method, *args, &block)
-        if block_given?
-          @self_before_instance_eval ||= eval("self", block.binding)
-        end
-
-        if @self_before_instance_eval.nil?
-          super
-        end
-
-        @self_before_instance_eval.send(method, *args, &block)
       end
   end
 end