battle-on 0.0.3 → 0.0.4

data/README.md

@@ -23,7 +23,7 @@ Now you're ready to attack!
 When you're in the middle of game of Battleship you want to focus on
 your attack - we help you do that. 
 
-First, require 'battle-on'
+First, require 'battle_on'
 
     require 'battle_on'
 

data/lib/battle_on/register_game.rb

@@ -3,12 +3,6 @@ require 'rest_client'
 
 module BattleOn
 
-  #Start the game
-  #
-  #mandatory parameters
-  #name: My Name
-  #email: my@email.com
-
   class RegisterGame
     attr_reader :name, :email
 
@@ -17,7 +11,8 @@ module BattleOn
     end
 
     def initialize(name, email)
-      @name, @email = name, email
+      @name =  name  or raise ArgumentError, "Missing your name"
+      @email = email or raise ArgumentError, "Missing your email"
     end
 
     def execute

data/lib/battle_on/send_attack.rb

@@ -2,17 +2,8 @@ require 'JSON'
 
 module BattleOn
 
-  #mandatory parameters:
-  #
-  #game_id: this relates to the id Plaform45's API
-  #provides when you launch your attack.
-  #
-  #and the attack the at you want to send
-  #x and y as keys, for example
-  #{:x => 4, :y => 5}
-
   class SendAttack
-    attr_reader :game_id, :args, :x_axis, :y_axis
+    attr_reader :game_id, :args, :x, :y
 
     def self.execute(game_id, args)
       new(game_id, args).execute
@@ -20,8 +11,8 @@ module BattleOn
 
     def initialize(game_id, args)
       @game_id = game_id
-      @x_axis  = args[:x_axis] #get_x(args)
-      @y_axis  = args[:y_axis] #get_y(args)
+      @x  = args[:x] or raise ArgumentError, "Must pass 'x' attack"
+      @y  = args[:y] or raise ArgumentError, "Must pass 'y' attack"
     end
 
     def execute
@@ -35,13 +26,7 @@ module BattleOn
     end
 
     def attack_params
-      { x: x_axis, y: y_axis, id: game_id}.to_json 
-    end
-
-    def get_x(args)
-    end
-
-    def get_y(args)
+      { x: x, y: y, id: game_id}.to_json
     end
 
   end

data/lib/battle_on/version.rb

@@ -1,3 +1,3 @@
 module BattleOn
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/battle_on/register_game_spec.rb

@@ -50,5 +50,28 @@ describe BattleOn::RegisterGame do
       end
 
     end
+
+    context "request is formatted incorrectly" do
+
+      let(:name_only)  { "henry thornton" }
+
+      context "email is missing" do
+
+        it "raises an ArgumentError" do
+          expect { begin_battle.execute(name_only, nil) }.to raise_error(ArgumentError, /Missing your email/)
+        end
+
+      end
+
+      let(:email_only) { "henry@thethornton.com" }
+
+      context "name is missing" do
+
+        it "raises an ArgumentError" do
+          expect { begin_battle.execute(nil, email_only) }.to raise_error(ArgumentError, /Missing your name/)
+        end
+
+      end
+    end
   end
 end

data/spec/battle_on/send_attack_spec.rb

@@ -11,7 +11,7 @@ describe BattleOn::SendAttack do
     let(:coordinates) { {:x => 5, :y => 9} }
     let(:send_attack) { BattleOn::SendAttack }
 
-    context "responds to the attack" do
+    context "attack is formatted correctly" do
 
       it "response is a hash" do
         #given
@@ -39,7 +39,7 @@ describe BattleOn::SendAttack do
         #expect
         response.should include("x")
       end
-      
+
       it "response contains a 'y'" do
         #given
         stubbed_request
@@ -50,5 +50,29 @@ describe BattleOn::SendAttack do
       end
 
     end
+
+    context "attack is formatted incorrectly" do
+
+      let(:x_only) { {:x => 1} }
+
+      context "attack is missing 'y' coordinate" do
+
+        it "raises an ArgumentError" do
+          expect { send_attack.execute(game, x_only) }.to raise_error(ArgumentError, /Must pass 'y' attack/)
+        end
+
+      end
+
+      let(:y_only) { {:y => 1} }
+
+      context "attack is missing 'x' coordinate" do
+
+        it "raises an ArgumentError" do
+          expect { send_attack.execute(game, y_only) }.to raise_error(ArgumentError, /Must pass 'x' attack/)
+        end
+
+      end
+
+    end
   end
 end

data/spec/helpers/send_attack_spec_helper.rb

@@ -1,7 +1,7 @@
 module SendAttackSpecHelper
 
   def stubbed_request
-    stub_request(:post, "http://battle.platform45.com/nuke").with(:body => "{\"x\":null,\"y\":null,\"id\":100}", :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'28', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => { :status=>"hit", :x => 0, :y => 4 }.to_json, :headers => {})
+    stub_request(:post, "http://battle.platform45.com/nuke").with(:body => "{\"x\":5,\"y\":9,\"id\":100}", :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'22', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => {:status => "hit", :x => 0, :y => 4}.to_json, :headers => {}) 
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: battle-on
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec