flexmock 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158433b510fe021438b3e2c88a82b1ffd0efcb36
-  data.tar.gz: 65961b49054d7ff956bf6807d007aadb0b1105a9
+  metadata.gz: 33bb2c48e90a98ffbe177d885fdedd82aa7c7fc8
+  data.tar.gz: 2c6dfcfac4032dd6fdd3110c204f5c91939e4104
 SHA512:
-  metadata.gz: ed5f37949186a46a14c4391ee4987f9b314acf1d876979a538704957526d24f7e1f6a67f00fd27a31d668b1b5086537a8a805269baae81d799059a3e041f94b3
-  data.tar.gz: 0c92dadcc4e1bea6951214e0e43704d6e677201ed53ea370eea3ad4ddfd9b60b6ec28a56264f98b59b73b216a7afdb830ce24376a1aa6836be78e12e38c5d296
+  metadata.gz: 74fdc213dda95788d74cfd973f2f7309611d0b21838c309d2c86a8013660f42057685d7f198498ff878f6fae34e3e4e3b27886ff5eb6e36a771bdfcca4e291fe
+  data.tar.gz: 558319ae76251ca95e1eaedd13114ecf77540e95160700595a01a07f86cb027cc84b4c64317518ae7a189b18431343d55254204756e87d91943df2c6913c34fb

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - jruby-9.0.5.0
 
 script:
     - rake test

data/lib/flexmock/core.rb

@@ -146,6 +146,10 @@ class FlexMock
     @expectations[method_name]
   end
 
+  def flexmock_base_class
+    @base_class
+  end
+
   def flexmock_based_on(base_class)
     @base_class = base_class
     if base_class <= Kernel

data/lib/flexmock/mock_builder.rb

@@ -105,9 +105,15 @@ class FlexMock
       when :base, :safe
         opts.safe_mode = (args.shift == :safe)
         opts.domain_obj = args.shift
-      when :on
-        args.shift
-        opts.base_class = args.shift
+      when :on, :strict
+        if args.shift == :strict
+          if !opts.domain_obj
+            raise ArgumentError, "cannot use :strict outside a partial mock"
+          end
+          opts.base_class = opts.domain_obj.class
+        else
+          opts.base_class = args.shift
+        end
         opts.name ||= "#{opts.base_class} Mock"
       else
         CONTAINER_HELPER.extensions.each do |ext|

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.0.5"
+    VERSION = "2.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest