safety_check 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768cb88cef157bf5b487f5f988cf3ce0adfccfb7
-  data.tar.gz: c0b8b0dfd8ac6c2f3fd7ad6cde6ffd39246fd362
+  metadata.gz: b69b29a68b53c6b95b6a3f9a5d7698648e48420e
+  data.tar.gz: 962d6867ababa327165ec0a635fa670d57051202
 SHA512:
-  metadata.gz: a2af22acea0fe6318a8daa3751b894e1818e1eb6387dd804d06ce0bd4b5938aa6c7303b879056ca194f7bdbc8f30d8cee7413f8946b0647b1241222e81b1483a
-  data.tar.gz: 8dab9529587167d1738ec89a2c07b045e54d0ac236563b5fae2f1587576a86e27df14ddecc59c7b64d4ddc8737d51aeb9f6d907b0fc82e336fe33df2cd4d344e
+  metadata.gz: e304f523ddfca6d916e3f1037bc51475d21aff4686559e1f765a0e58c7074ea6eb33dccbc1a5c37a31368d133f1daac307b09dda10367eb955eb12920ba65533
+  data.tar.gz: 152629295a966098a9e985bcaf70bf1ff543d97be3785daa48381c4733ccd9669487470d13f2b65b9739e6d57d3f90d1e1634397d7758da744c0d1af17102c2b

data/lib/safety_check.rb

@@ -15,24 +15,26 @@ module SafetyCheck
 
       unsafe_method_name = "#{method_name.to_s}_without_type_safety".to_sym
 
-      if arg_types.length != receiver.instance_method(method_name).arity
-        raise ArgumentError, "wrong number of arguments for #{method_name.inspect} (#{arg_types.length} for #{receiver.instance_method(method_name).arity})"
+      required_arity = receiver.instance_method(method_name).parameters.select { |type, name| type == :req }.length
+
+      if arg_types.length < required_arity
+        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)
 
-      receiver.send(:define_method, method_name) do |*args|
-        if args.length != arg_types.length
+      receiver.send(:define_method, method_name) do |*args, &block|
+        if args.length < required_arity
           raise ArgumentError, "wrong number of arguments (#{args.length} for #{arg_types.length}) when calling #{method_name.inspect}"
         end
 
-        arg_types.zip(args).each do |arg_type, arg|
+        args.zip(arg_types).each do |arg, arg_type|
           unless arg.is_a? arg_type
             raise ArgumentError, "expected #{arg.inspect} to be a #{arg_type} when calling #{method_name.inspect}"
           end
         end
 
-        self.send(unsafe_method_name, *args)
+        self.send(unsafe_method_name, *args, &block)
       end
     end
   end

data/lib/version.rb

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

data/spec/safety_check/safety_check_spec.rb

@@ -5,7 +5,7 @@ describe SafetyCheck do
     it 'instance methods should not raise an error when the correct type of argument is used' do
       hi = Hello.new
 
-      expect(hi.greetings('world')).to eq("Hello, world!")
+      expect(hi.greetings('world')).to eq('Hello, world!')
     end
 
     it 'instance methods should raise an error when the wrong type of argument is used' do
@@ -20,8 +20,46 @@ describe SafetyCheck do
       expect { hi.greetings('world', 'lol') }.to raise_error
     end
 
+    it 'instance methods should not raise an error if optional arguments are ommited' do
+      hi = Hello.new
+
+      expect(hi.moshi_moshi('world')).to eq('Hello from Japan, world!')
+    end
+
+    it 'instance methods should not raise an error when the correct type of argument is used for optional arguments' do
+      hi = Hello.new
+
+      expect(hi.moshi_moshi('world', 'Sweden')).to eq('Hello from Sweden, world!')
+    end
+
+    it 'instance methods should raise an error when the wrong type of argument is used for optional arguments' do
+      hi = Hello.new
+
+      expect { hi.moshi_moshi('world', 5) }.to raise_error
+    end
+
+    it 'instance methods should not raise an error when the correct type of argument is used and a block is passed' do
+      hi = Hello.new
+
+      expect(
+        hi.hallo('world') do |subject|
+          "what a wonderful #{subject}"
+        end
+      ).to eq('Hi, what a wonderful world!')
+    end
+
+    it 'instance methods should raise an error when the wrong type of argument is used and a block is passed' do
+      hi = Hello.new
+
+      expect do
+        hi.hallo(5) do |subject|
+          "what a wonderful #{subject}"
+        end
+      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!")
+      expect(Hello.salutations('world')).to eq('Good day, world!')
     end
 
     it 'class methods should raise an error when the wrong type of argument is used' do
@@ -31,5 +69,33 @@ describe SafetyCheck do
     it 'class methods should raise an error when the wrong number of argument is used' do
       expect { Hello.salutations('world', 'lol') }.to raise_error
     end
+
+    it 'class methods should not raise an error if optional arguments are ommited' do
+      expect(Hello.ohayou_gozaimasu('world')).to eq('Good morning from Japan, world!')
+    end
+
+    it 'class methods should not raise an error when the correct type of argument is used for optional arguments' do
+      expect(Hello.ohayou_gozaimasu('world', 'Sweden')).to eq('Good morning from Sweden, world!')
+    end
+
+    it 'class methods should raise an error when the wrong type of argument is used for optional arguments' do
+      expect { Hello.ohayou_gozaimasu('world', 5) }.to raise_error
+    end
+
+    it 'class methods should not raise an error when the correct type of argument is used and a block is passed' do
+      expect(
+        Hello.guten_morgen('world') do |subject|
+          "from a distant #{subject}"
+        end
+      ).to eq('Good morning, from a distant world!')
+    end
+
+    it 'class methods should raise an error when the wrong type of argument is used and a block is passed' do
+      expect do
+        Hello.guten_morgen(5) do |subject|
+          "from a distant #{subject}"
+        end
+      end.to raise_error
+    end
   end
 end

data/spec/test_models/hello.rb

@@ -6,8 +6,40 @@ class Hello
   end
   safety_check :greetings, String
 
+  def moshi_moshi(subject, location = '')
+    if location == ''
+      "Hello from Japan, #{subject}!"
+    else
+      "Hello from #{location}, #{subject}!"
+    end
+  end
+  safety_check :moshi_moshi, String, String
+
+  def hallo(subject)
+    new_subject = yield subject
+
+    "Hi, #{new_subject}!"
+  end
+  safety_check :hallo, String
+
   def self.salutations(subject)
     "Good day, #{subject}!"
   end
   safety_check :salutations, String
+
+  def self.ohayou_gozaimasu(subject, location = '')
+    if location == ''
+      "Good morning from Japan, #{subject}!"
+    else
+      "Good morning from #{location}, #{subject}!"
+    end
+  end
+  safety_check :ohayou_gozaimasu, String, String
+
+  def self.guten_morgen(subject)
+    new_subject = yield subject
+
+    "Good morning, #{new_subject}!"
+  end
+  safety_check :guten_morgen, String
 end

metadata

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