square_graph 0.1.0 → 0.2.0

data/lib/square_graph.rb

@@ -5,10 +5,10 @@ class SquareGraph
   attr_reader :length, :width
 
   def initialize(*dimen)
-    raise ArgumentError, "Only zero or two parameters" if ![0,2].include?(dimen.size)
+    raise ArgumentError if ![0,2].include?(dimen.size)
     if dimen.size == 2
-      raise ArgumentError if dimen[0].class != Fixnum or dimen[1].class != Fixnum
-      raise ArgumentError if dimen[0] < 1 or dimen[1] < 1
+      test_fixnum(dimen[0], dimen[1])
+      raise ArgumentError if test_range([1, dimen[0]], [1, dimen[1]])
       @length, @width = dimen[0], dimen[1]
       @sized = true
     else
@@ -19,23 +19,51 @@ class SquareGraph
 
   def resize(length, width)
     raise NoMethodError if @sized == false
-    raise ArgumentError if length.class != Fixnum or width.class != Fixnum
-    raise ArgumentError if length < 1 or width < 1
+    test_fixnum(length, width)
+    return nil if test_range([1, length], [1, width])
     @length, @width = length, width
   end
 
   def fill(*args)
     x, y = args[0], args[1]
+    test_fixnum(x, y)
+    if @sized == true
+      return nil if test_range([1, x], [1, y], [x, @length], [y, @length])
+    end
     @sg[[x,y]] = Face.new(x, y, true)
   end
 
   def get(x, y)
+    return nil if !@sg[[x,y]]
     @sg[[x,y]].object
   end
 
-  def insert
+  def remove(*args)
+    x, y = args[0], args[1]
+    test_fixnum(x, y)
+    @sg[[x, y]] = nil
+  end
+
+  def clear
+    @sg.clear
   end
 
-  def get_truthy(x, y)
+  def empty?
+    !(@sg.any? do |f|
+      @sg[f[0]] and @sg[f[0]].object
+    end)
   end
+
+  private
+
+  def test_fixnum(*value)
+    value.each do |v|
+      raise ArgumentError if v.class != Fixnum
+    end
+  end
+
+  def test_range(*value)
+    value.any? {|pair| pair[0] > pair[1]}
+  end
+
 end

data/spec/square_graph_spec.rb

@@ -5,7 +5,7 @@ describe SquareGraph, '#new' do
     SquareGraph.new(5,5).should_not be_nil
   end
   it "should error when given one parameter" do
-    expect {SquareGraph.new(0)}.to raise_error(ArgumentError, "Only zero or two parameters")
+    expect {SquareGraph.new(0)}.to raise_error(ArgumentError)
   end
   it "should accept no parameters" do
     SquareGraph.new.should_not be_nil
@@ -19,7 +19,7 @@ describe SquareGraph, '#new' do
     expect {SquareGraph.new("lalaland", "luftland")}.to raise_error(ArgumentError)
   end
   it "should only save positive integers into the parameters" do
-    expect {SquareGraph.new(0,5)}.to raise_error(ArgumentError)
+    expect {SquareGraph.new(0, 5)}.to raise_error(ArgumentError)
     expect {SquareGraph.new(5,-1)}.to raise_error(ArgumentError)
   end
   it "should not save len/wid if no parameters are given" do
@@ -42,24 +42,103 @@ describe SquareGraph, "#resize" do
   end
   it "should only resize to valid sizes" do
     sg = SquareGraph.new(5,5)
-    expect {sg.resize(0, -1)}.to raise_error(ArgumentError)
+    sg.resize(0, -1).should be_nil
   end
   it "should not be able to resize if conflicts" do
     #TODO yeah, let's implement this later
   end
 end
 
-describe SquareGraph, "#fill" do
-  it "simply fills in a location with a simple TrueClass" do
+describe SquareGraph, "#fill, #get" do
+  it "fills a single position with a TrueClass and gets it back with get" do
     sg = SquareGraph.new(5,5)
     sg.fill(2,2)
     sg.get(2,2).should eql(true)
   end
+  it "doesn't allow fills of outside the graph" do
+    sg = SquareGraph.new(5,10)
+    sg.fill(10, 2).should be_nil
+    sg.fill(2, 11).should be_nil
+    sg.fill(0, 0).should be_nil
+    #TODO there should be a better way to implement these.. srsly
+  end
+  it "doesn't allow random values" do
+    sg = SquareGraph.new(2,2)
+    expect {sg.fill("blah", 10)}.to raise_error(ArgumentError)
+    expect {sg.fill(0.1, 2)}.to raise_error(ArgumentError)
+  end
+  it "allows undimentioned graphs to fill anywhere, even negative" do
+    sg = SquareGraph.new
+    sg.fill(2,2)
+    sg.fill(-1, -3)
+    sg.get(-1, -3).should eql(true)
+  end
+  it "nils if getting something that doesn't exist yet" do
+    sg = SquareGraph.new
+    sg.get(0,0).should be_nil
+  end
+  it "nils when getting something out of the range of the graph" do
+    sg = SquareGraph.new(5,5)
+    sg.get(2,2).should be_nil
+    sg.get(10,10).should be_nil
+  end
 end
 
 describe SquareGraph, "#insert" do
   it "fills a location with an object" do
-    #TODO this one gets rly hard.
+    #TODO this one gets rly hard. don't know if we should put it into fill
   end
 end
 
+describe SquareGraph, "#remove" do
+  it "removes any objects from a certain position" do
+    sg = SquareGraph.new
+    sg.fill(2,2)
+    sg.get(2,2).should eql(true)
+    sg.remove(2,2)
+    sg.get(2,2).should be_nil
+  end
+  it "returns nil if there was nothing in the position" do
+    sg = SquareGraph.new
+    sg.remove(2, 2).should be_nil
+  end
+  it "returns nil if you try and remove something outside of rannge" do
+    sg = SquareGraph.new(5, 5)
+    sg.remove(10, 10).should be_nil
+  end
+end
+
+describe SquareGraph, "#clear" do
+  it "removes every object in the graph" do
+    sg = SquareGraph.new
+    (0..5).each {|x| sg.fill(x, x)}
+    (1..6).each {|x| sg.get(x-1, x-1).should eql(true)}
+    sg.clear
+    (2..7).each {|x| sg.get(x-2, x-2).should be_nil}
+  end
+end
+
+describe SquareGraph, "#empty?" do
+  it "informs us if SquareGraph is empty, ie, if none of the positions are filled" do
+    sg = SquareGraph.new(5, 5)
+    (1..5).each do |x|
+      (1..5).each do |y|
+        sg.fill(x,y)
+      end
+    end
+    sg.get(3, 3).should eql(true)
+    sg.clear
+    sg.empty?.should eql(true)
+  end
+  it "informs us even if we just remove the items" do
+    sg = SquareGraph.new
+    sg.fill(0,0)
+    sg.remove(0, 0)
+    sg.empty?.should eql(true)
+  end
+  it "returns false if the graph isn't empty" do
+    sg = SquareGraph.new
+    sg.fill(0,0)
+    sg.empty?.should eql(false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_graph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies: []
-description: No description for now.
+description: So far, you can create true's all over a graph that's either dimentioned
+  or not.\n Later, the world!
 email: Austin.L.D4L@gmail.com
 executables: []
 extensions: []
@@ -43,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: a better 2d array