safety_check 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69b29a68b53c6b95b6a3f9a5d7698648e48420e
-  data.tar.gz: 962d6867ababa327165ec0a635fa670d57051202
+  metadata.gz: edbdc93bd92869005603ec859d9057d964734650
+  data.tar.gz: 6ecd8ba86c8544e48b8f8490f2590f6704b602fc
 SHA512:
-  metadata.gz: e304f523ddfca6d916e3f1037bc51475d21aff4686559e1f765a0e58c7074ea6eb33dccbc1a5c37a31368d133f1daac307b09dda10367eb955eb12920ba65533
-  data.tar.gz: 152629295a966098a9e985bcaf70bf1ff543d97be3785daa48381c4733ccd9669487470d13f2b65b9739e6d57d3f90d1e1634397d7758da744c0d1af17102c2b
+  metadata.gz: ba08ad29c688e332933173c37559719db769ee72eb84a8d4bb63298dd751cdb08b46f557ab235e304b3f139147d3b8ca628bde23ca9ff58552c43e2e426fc535
+  data.tar.gz: 82c4a016afeacd6c2d0604d3cfaa0e274cd89f1b411bd2ceab40d3bc1055f40c50c3058e2ea2eef9cce7af80b9192946b8a638f317d3148451e91566e1f5952f

data/README.md

@@ -1,3 +1,16 @@
 #Safety Check
 
 Selectively add type safety to your methods.
+
+# Usage
+
+```ruby
+class Widget
+  include SafetyCheck
+
+  def foo(a, b, c)
+    # ...
+  end
+  safety_check :foo, String, Fixnum, Symbol
+end
+```

data/lib/safety_check.rb

@@ -21,7 +21,17 @@ module SafetyCheck
         raise ArgumentError, "wrong number of arguments for #{method_name.inspect} (#{arg_types.length} for #{required_arity})"
       end
 
-      receiver.send(:alias_method, unsafe_method_name, method_name)
+      arg_types = arg_types.map do |arg_type|
+        if arg_type.is_a? Array
+          arg_type
+        else
+          [arg_type]
+        end
+      end
+
+      unless receiver.instance_methods.include?(unsafe_method_name)
+        receiver.send(:alias_method, unsafe_method_name, method_name)
+      end
 
       receiver.send(:define_method, method_name) do |*args, &block|
         if args.length < required_arity
@@ -29,7 +39,7 @@ module SafetyCheck
         end
 
         args.zip(arg_types).each do |arg, arg_type|
-          unless arg.is_a? arg_type
+          unless arg_type.select { |arg_t| arg.is_a? arg_t }.length > 0
             raise ArgumentError, "expected #{arg.inspect} to be a #{arg_type} when calling #{method_name.inspect}"
           end
         end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SafetyCheck
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/safety_check/safety_check_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe SafetyCheck do
   describe 'safety_check' do
+    # When this test fails Ruby will segfault!
+    it 'should properly overwrite an existing call to safety_check' do
+      expect do
+        class Hello
+          safety_check :salut, [String, Symbol]
+        end
+      end.to_not raise_error
+    end
+
     it 'instance methods should not raise an error when the correct type of argument is used' do
       hi = Hello.new
 
@@ -58,6 +67,26 @@ describe SafetyCheck do
       end.to raise_error
     end
 
+    it 'instance methods should allow an argument\'s type constraint to be an array of types' do
+      hi = Hello.new
+
+      expect(
+        hi.salut('world')
+      ).to eq('Salut, world!')
+
+      expect(
+        hi.salut(:world)
+      ).to eq('Salut, world!')
+    end
+
+    it 'instance methods should raise an error when the wrong type of argument is used for arguments with an array of allowed types' do
+      hi = Hello.new
+
+      expect do
+        hi.salut(5)
+      end.to raise_error
+    end
+
     it 'class methods should not raise an error when the correct type of argument is used' do
       expect(Hello.salutations('world')).to eq('Good day, world!')
     end
@@ -97,5 +126,21 @@ describe SafetyCheck do
         end
       end.to raise_error
     end
+
+    it 'class methods should allow an argument\'s type constraint to be an array of types' do
+      expect(
+        Hello.bonjour('world')
+      ).to eq('Bonjour, world!')
+
+      expect(
+        Hello.bonjour(:world)
+      ).to eq('Bonjour, world!')
+    end
+
+    it 'class methods should raise an error when the wrong type of argument is used for arguments with an array of allowed types' do
+      expect do
+        Hello.bonjour(5)
+      end.to raise_error
+    end
   end
 end

data/spec/test_models/hello.rb

@@ -22,6 +22,11 @@ class Hello
   end
   safety_check :hallo, String
 
+  def salut(subject)
+    "Salut, #{subject}!"
+  end
+  safety_check :salut, [String, Symbol]
+
   def self.salutations(subject)
     "Good day, #{subject}!"
   end
@@ -42,4 +47,9 @@ class Hello
     "Good morning, #{new_subject}!"
   end
   safety_check :guten_morgen, String
+
+  def self.bonjour(subject)
+    "Bonjour, #{subject}!"
+  end
+  safety_check :bonjour, [String, Symbol]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safety_check
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sean Eshbaugh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec