objective-ruby 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['spec/*_spec.rb']
+  t.verbose = true
+end

data/lib/objective-ruby/version.rb

@@ -1,3 +1,3 @@
 module ObjectiveRuby
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/objective-ruby.rb

@@ -2,45 +2,106 @@ require "objective-ruby/version"
 
 module ObjectiveRuby
   class << self
-      def included(base)
-        base.extend ClassMethods
-      end
+    def included(base)
+      base.extend ClassMethods
     end
+  end
  
   module ClassMethods
-    def obj method, input = {}, &block 
-       define_method(method)  do |method_input = {}| 
-          block_input = {}
-          method_input.each do |k,v| 
-            new_key = k.to_s.sub!(/(with_|and_)/, '').to_sym
-            if input[new_key].nil? 
-              raise ArgumentError.new "invalid input field #{k}"
-            end 
-            unless v.is_a? input[new_key]
-              raise ArgumentError.new "invalid type for #{new_key} expected #{input[new_key]}"
-            end 
-            block_input[new_key] = v
+    def objr method, input = {}, &block 
+      define_method(method)  do |method_input = {}| 
+        block_input = {}
+        method_input.each do |k,v| 
+          new_key = k.to_s.sub!(/(with_|and_)/, '').to_sym
+
+          if input[new_key].nil? 
+            raise ArgumentError.new "invalid input field #{new_key}"
+          end 
+
+          unless v.is_a? input[new_key]
+            raise ArgumentError.new "invalid type for #{new_key} expected #{input[new_key]}"
+          end 
+
+          block_input[new_key] = v
+        end
+
+        input.each do |k,v|
+          if block_input[k].nil?
+            raise ArgumentError.new "missing input field #{k}"
+          end
+        end
+
+        block.call block_input 
+      end
+    end
+
+    def objr_d method, input = {}, &block 
+      define_method(method)  do |method_input = {}| 
+        block_input = {}
+        method_input.each do |k,v| 
+          new_key = k.to_s.sub!(/(with_|and_)/, '').to_sym
+
+          if input.index(new_key).nil? 
+            raise ArgumentError.new "invalid input field #{new_key}"
+          end 
+
+          block_input[new_key] = v
+        end
+
+        input.each do |k,v|
+          if block_input[k].nil?
+            raise ArgumentError.new "missing input field #{k}"
           end
-   
-          block.call block_input 
         end
+
+        block.call block_input 
+      end
     end
+
+    def objc method, input = {}, &block 
+      define_method(method)  do |method_input = {}| 
+        block_input = {}
+        method_input.each do |k,v| 
+          if input[k].nil? 
+            raise ArgumentError.new "invalid input field #{k}"
+          end 
+
+          unless v.is_a? input[k][1]
+            raise ArgumentError.new "invalid type for #{k} expected #{input[k][1]}"
+          end 
+
+          block_input[input[k][0]] = v
+        end
  
-    def objr method, input = {}, &block 
-       define_method(method)  do |method_input = {}| 
-          block_input = {}
-          method_input.each do |k,v| 
-            if input[k].nil? 
-              raise ArgumentError.new "invalid input field #{k}"
-            end 
-            unless v.is_a? input[k][1]
-              raise ArgumentError.new "invalid type for #{new_key} expected #{input[new_key]}"
-            end 
-            block_input[input[k][0]] = v
+        input.each do |k,v|
+          if block_input[v[0]].nil?
+            raise ArgumentError.new "missing input field #{k}"
+          end
+        end
+
+        block.call block_input 
+      end
+    end
+
+    def objc_d method, input = {}, &block 
+      define_method(method)  do |method_input = {}| 
+        block_input = {}
+        method_input.each do |k,v| 
+          if input[k].nil? 
+            raise ArgumentError.new "invalid input field #{k}"
+          end 
+
+          block_input[input[k]] = v
+        end
+ 
+        input.each do |k,v|
+          if block_input[v].nil?
+            raise ArgumentError.new "missing input field #{k}"
           end
-   
-          block.call block_input 
         end
+
+        block.call block_input 
+      end
     end
   end
 end

data/spec/objective-ruby_spec.rb

@@ -0,0 +1,148 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'date'
+
+require_relative '../lib/objective-ruby'
+
+class Test
+  include ObjectiveRuby
+
+  objr :objr_method, foo: String, bar: Fixnum do |input|
+    input 
+  end
+
+  objr_d :objr_d_method, [:foo, :bar] do |input|
+    input 
+  end
+
+  objc :objc_method, with_foo: [:foo, String], also_bar: [:bar, Fixnum] do |input|
+    input
+  end
+
+  objc_d :objc_d_method, with_foo: :foo,  also_bar: :bar do |input|
+    input
+  end
+end
+
+describe ObjectiveRuby do
+
+  before do
+    @test = Test.new
+  end
+
+  describe 'self.objr' do
+    it 'should do the right thing with correct input' do
+      result = @test.objr_method with_foo: 'hello', and_bar: 12
+      result.must_equal foo: 'hello', bar: 12
+    end
+
+    it 'should allow for interchangable prefixes' do
+      results = Array.new 
+      results << (@test.objr_method with_foo: 'hello', and_bar: 12)
+      results << (@test.objr_method and_foo: 'hello', with_bar: 12)
+      results << (@test.objr_method with_foo: 'hello', with_bar: 12)
+      results << (@test.objr_method and_foo: 'hello', and_bar: 12)
+      results.each { |result| result.must_equal foo: 'hello', bar: 12 }
+    end
+
+    it 'should raise an error for invalid types' do
+      error = ( -> { @test.objr_method(with_foo: 1, and_bar: 12) }.must_raise ArgumentError )
+      error.message.must_equal 'invalid type for foo expected String'
+
+      error = ( -> { @test.objr_method(with_foo: 'hello', and_bar: nil) }.must_raise ArgumentError )
+      error.message.must_equal 'invalid type for bar expected Fixnum'
+    end
+
+    it 'should raise an error for missing parameters' do
+      error = ( -> { @test.objr_method(with_foo: 'hello') }.must_raise ArgumentError )
+      error.message.must_equal 'missing input field bar'
+    end
+
+    it 'should raise an error for extra parameters' do
+      error = ( -> { @test.objr_method(with_foo: 'hello', and_bar: 12, and_extra: 'this is extra!') }.must_raise ArgumentError )
+      error.message.must_equal 'invalid input field extra'
+    end
+  end
+
+  describe 'self.objr_d' do
+    it 'should do the right thing with correct input' do
+      result = @test.objr_d_method with_foo: 'hello', and_bar: 12
+      result.must_equal foo: 'hello', bar: 12
+    end
+
+    it 'should allow for duck typing' do
+      now = DateTime.now
+      result = @test.objr_d_method with_foo: now , and_bar: 'something' 
+      result.must_equal foo: now, bar: 'something' 
+    end
+
+    it 'should allow for interchangable prefixes' do
+      results = Array.new 
+      results << (@test.objr_d_method with_foo: 'hello', and_bar: 12)
+      results << (@test.objr_d_method and_foo: 'hello', with_bar: 12)
+      results << (@test.objr_d_method with_foo: 'hello', with_bar: 12)
+      results << (@test.objr_d_method and_foo: 'hello', and_bar: 12)
+      results.each { |result| result.must_equal foo: 'hello', bar: 12 }
+    end
+
+    it 'should raise an error for missing parameters' do
+      error = ( -> { @test.objr_d_method(with_foo: 'hello') }.must_raise ArgumentError )
+      error.message.must_equal 'missing input field bar'
+    end
+
+    it 'should raise an error for extra parameters' do
+      error = ( -> { @test.objr_d_method(with_foo: 'hello', and_bar: 12, and_extra: 'this is extra!') }.must_raise ArgumentError )
+      error.message.must_equal 'invalid input field extra'
+    end
+  end
+
+  describe 'self.objc' do
+    it 'should do the right thing with correct input' do
+      result = @test.objc_method with_foo: 'hello', also_bar: 12
+      result.must_equal foo: 'hello', bar: 12
+    end
+
+    it 'should raise an error for missing parameters' do
+      error = ( -> { @test.objc_method(with_foo: 'hello') }.must_raise ArgumentError )
+      error.message.must_equal 'missing input field also_bar'
+    end
+
+    it 'should raise an error for extra parameters' do
+      error = ( -> { @test.objc_method(with_foo: 'hello', also_bar: 12, and_extra: 'this is extra!') }.must_raise ArgumentError )
+      error.message.must_equal 'invalid input field and_extra'
+    end
+
+    it 'should raise an error for invalid types' do
+      error = ( -> { @test.objc_method(with_foo: 1, also_bar: 12) }.must_raise ArgumentError )
+      error.message.must_equal 'invalid type for with_foo expected String'
+
+      error = ( -> { @test.objc_method(with_foo: 'hello', also_bar: nil) }.must_raise ArgumentError )
+      error.message.must_equal 'invalid type for also_bar expected Fixnum'
+    end
+  end
+
+  describe 'self.objc_d' do
+    it 'should do the right thing with correct input' do
+      result = @test.objc_d_method with_foo: 'hello', also_bar: 12
+      result.must_equal foo: 'hello', bar: 12
+    end
+
+    it 'should allow for duck typing' do
+      now = DateTime.now
+      result = @test.objc_d_method with_foo: now , also_bar: 'something' 
+      result.must_equal foo: now, bar: 'something' 
+    end
+
+    it 'should raise an error for missing parameters' do
+      error = ( -> { @test.objc_d_method(with_foo: 'hello') }.must_raise ArgumentError )
+      error.message.must_equal 'missing input field also_bar'
+    end
+
+    it 'should raise an error for extra parameters' do
+      error = ( -> { @test.objc_d_method(with_foo: 'hello', also_bar: 12, and_extra: 'this is extra!') }.must_raise ArgumentError )
+      error.message.must_equal 'invalid input field and_extra'
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: objective-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -26,6 +26,7 @@ files:
 - lib/objective-ruby.rb
 - lib/objective-ruby/version.rb
 - objective-ruby.gemspec
+- spec/objective-ruby_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -50,5 +51,6 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Objective-C style Ruby.
-test_files: []
+test_files:
+- spec/objective-ruby_spec.rb
 has_rdoc: