aidmock 0.3.1 → 0.4.0

data/README.textile

@@ -24,17 +24,27 @@ In order to use Aidmock, you need to configure it on your test environment. Sinc
 
 bc.. RSpec.configure do |config|
   config.before :all do
-    Aidmock.setup # it will do any nescessary setup, like extending your framework mocks
+    Aidmock.setup! # it will do any nescessary setup, like extending your framework mocks
   end
 
   config.after :each do
-    Aidmock.verify # it will verify created mocks after each spec
+    Aidmock.verify! # it will verify created mocks after each spec
   end
 end
 
 # load or write your interfaces here
 
-Aidmock::Sanity.sanitize # it will run sanity checks, just call it after have all interfaces defined
+Aidmock::Sanity.sanitize! # it will run sanity checks, just call it after have all interfaces defined
+
+h2. Automatic Interfacing
+
+Since version 0.3.1 Aidmock supports automatic interfacing, this feature is enabled by default. With automatic interfacing Aidmock will define the class interface automatically for you if the interface is not already defined, we still encorage you to do some manual interface definitions since automatic interfacing can't be too much precise (it will generate method names and correct arity, but can't check value real types). But automatic interfaces is a nice start point for you at Aidmock, no need for big setups, work with third-part code (also built-in Ruby code too) and will give to you a new layer of safe to your mocks.
+
+Even when you start doing interfaces by hand, you may want to still having this feature enabled, since it will interface third-part code and built-in code.
+
+If you wanna do a hardcore Aidmock use, you can disable automatic interfacing with following snippet:
+
+bc. Aidmock.autointerface = false
 
 h2. How It Works
 
@@ -214,6 +224,15 @@ Example:
 bc. method :something, s(nil) # will accept splat with anything(nil will be converted one AnythingMatcher)
 method :something, splat(nil) # same as above
 
+h2. Mixing automatic and manual interfaces
+
+Why just manual OR automatic interfacing? You can have both!
+You can tell Aidmock to fill the interface with automatic generated methods, and them just override with manual interface, to do this, just send @:auto => true@ to interface definition:
+
+bc.. Aidmock.interface Person, :auto => true do
+  method :name, String
+end
+
 h2. Class Inheritance and Modules
 
 Aidmock respects your class inheritance and module definition, so, the below example will be valid:
@@ -238,6 +257,20 @@ end
 
 h2. Changelog
 
+h3. 0.4.0
+
+* Fixed automatic generation step
+* Hability to mix automatic interfacing with manual interface
+* Methods: Aidmock.setup, Aidmock.verify, Aidmock::Sanity.sanitize now requires ! (now you should use Aidmock.setup!, Aidmock.verify!, Aidmock::Sanity.sanitize!)
+
+h3. 0.3.1
+
+* Supporting automatic interfacing
+
+h3. 0.3.0
+
+* bad release, ignore this version please
+
 h3. 0.2.0
 
 * Added .constrained_to to mocks

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/aidmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aidmock}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wilker Lucio"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-02-07}
   s.description = %q{Aidmock, safe mocking and interfacing for Ruby}
   s.email = %q{wilkerlucio@gmail.com}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/wilkerlucio/aidmock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Aidmock, safe mocking and interfacing for Ruby}
   s.test_files = [
     "spec/aidmock/auto_interface_spec.rb",
@@ -66,7 +66,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/aidmock.rb

@@ -35,14 +35,13 @@ module Aidmock
     alias :warn_undefined_interface? :warn_undefined_interface
     alias :autointerface? :autointerface
 
-    def interface(klass, &block)
-      interfaces[klass] = create_or_update_interface(klass, &block)
+    def interface(klass, options = {}, &block)
+      options = {:auto => false}.merge(options)
+      AutoInterface.define(klass) if options[:auto]
+      interfaces[klass] = create_or_update_interface(klass, &block) if block
     end
 
-    def stub(klass, stubs = {})
-    end
-
-    def verify
+    def verify!
       framework.mocks.each do |mock|
         verify_double(mock)
       end
@@ -64,7 +63,7 @@ module Aidmock
       ::Aidmock::TestFrameworks::RSpec
     end
 
-    def setup
+    def setup!
       framework.extend_doubles
     end
 
@@ -72,12 +71,12 @@ module Aidmock
 
     def verify_double(double)
       klass = extract_class(double.object)
+      AutoInterface.define(klass) if autointerface? and !has_interface?(klass)
+
       chain = chain_for(klass)
 
       if chain.length > 0
         verify_double_on_chain(double, chain)
-      elsif autointerface?
-        AutoInterface.define(klass)
       else
         puts "Aidmock Warning: unsafe mocking on class #{klass}, please interface it" if warn_undefined_interface?
       end

data/lib/aidmock/interface.rb

@@ -31,12 +31,16 @@ module Aidmock
     end
 
     def method(name, type, *arguments)
+      @methods.delete_if { |md| md.name == name }
+
       method = MethodDescriptor.new(name, type, *arguments)
       @methods << method
       method
     end
 
     def class_method(name, type, *arguments)
+      @class_methods.delete_if { |md| md.name == name }
+
       method = MethodDescriptor.new(name, type, *arguments)
       method.class_method = true
       @class_methods << method

data/lib/aidmock/sanity.rb

@@ -21,7 +21,7 @@
 module Aidmock
   module Sanity
     class << self
-      def sanitize
+      def sanitize!
         describe "Aidmock Sanity Checks:" do
           Aidmock.interfaces.each_pair do |klass, interface|
             context klass.to_s do

data/spec/aidmock/interface_spec.rb

@@ -23,8 +23,57 @@ require File.expand_path("../../spec_helper", __FILE__)
 describe Aidmock::Interface do
   Interface = Aidmock::Interface
   MockDescriptor = Aidmock::Frameworks::MockDescriptor
+  MethodDescriptor = Aidmock::MethodDescriptor
 
-  context "finding the method" do
+  context "#method" do
+    it "add a new method" do
+      descriptor = mock "method descriptor"
+      MethodDescriptor.stub(:new).with("test", "type") { descriptor }
+
+      interface = Interface.new(Object)
+      interface.method("test", "type")
+      interface.methods.should include(descriptor)
+    end
+
+    it "remove old method if it has same name" do
+      descriptor = mock "method descriptor", :name => "test"
+      descriptor2 = mock "method descriptor"
+      MethodDescriptor.stub(:new).with("test", "type") { descriptor }
+      MethodDescriptor.stub(:new).with("test", "type2") { descriptor2 }
+
+      interface = Interface.new(Object)
+      interface.method("test", "type")
+      interface.method("test", "type2")
+      interface.methods.should include(descriptor2)
+      interface.methods.should_not include(descriptor)
+    end
+  end
+
+  context "#class_method" do
+    it "add a new method" do
+      descriptor = mock "method descriptor", :class_method= => true
+      MethodDescriptor.stub(:new).with("test", "type") { descriptor }
+
+      interface = Interface.new(Object)
+      interface.class_method("test", "type")
+      interface.class_methods.should include(descriptor)
+    end
+
+    it "remove old method if it has same name" do
+      descriptor = mock "method descriptor", :name => "test", :class_method= => true
+      descriptor2 = mock "method descriptor", :class_method= => true
+      MethodDescriptor.stub(:new).with("test", "type") { descriptor }
+      MethodDescriptor.stub(:new).with("test", "type2") { descriptor2 }
+
+      interface = Interface.new(Object)
+      interface.class_method("test", "type")
+      interface.class_method("test", "type2")
+      interface.class_methods.should include(descriptor2)
+      interface.class_methods.should_not include(descriptor)
+    end
+  end
+
+  context "#find_method" do
     it "find the method defined by exact name" do
       interface = Interface.new(Object)
       method = interface.method(:some, nil)

data/spec/aidmock_spec.rb

@@ -22,9 +22,20 @@ require File.expand_path("../spec_helper", __FILE__)
 
 describe Aidmock do
   context ".interface" do
-  end
+    context "automatic interfacing" do
+      it "define interface if auto is specified" do
+        Aidmock::AutoInterface.should_receive(:define).with(String) {}
+        Aidmock.stub!(:interfaces) { {} }
+
+        Aidmock.interface String, :auto => true
+      end
+
+      it "don't automatic define interface if auto is false" do
+        Aidmock::AutoInterface.should_not_receive(:define)
 
-  context ".stub" do
+        Aidmock.interface String
+      end
+    end
   end
 
   context ".verify" do
@@ -37,7 +48,7 @@ describe Aidmock do
       Aidmock.should_receive(:verify_double).with(m2) { nil }
       Aidmock.should_receive(:verify_double).with(m3) { nil }
 
-      Aidmock.verify
+      Aidmock.verify!
     end
   end
 
@@ -59,7 +70,8 @@ describe Aidmock do
           double = Aidmock::Frameworks::MockDescriptor.new("object", :to_s, nil, [])
 
           Aidmock.stub!(:autointerface?) { true }
-          Aidmock.stub!(:chain_for).with(String) { [] }
+          Aidmock.stub!(:has_interface?).with(String) { false }
+          Aidmock.stub!(:verify_double_on_chain)
           Aidmock::AutoInterface.should_receive(:define).with(String) {}
 
           Aidmock.send :verify_double, double

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: aidmock
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Wilker Lucio
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -03:00
+date: 2011-02-07 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -70,21 +66,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Aidmock, safe mocking and interfacing for Ruby