square_graph 0.2.0 → 0.3.0

data/README.rdoc

@@ -6,13 +6,24 @@ This tool is an easier way of working with 2d arrays
 
 == How to Install
 
-  gem install squareGraph
+You can download directly from rubygems.org with the simple command (and it'll install too!):
+
+  $ gem install square_graph
+
+Or you can compile the project yourself (options to install inside rake):
+
+  $ git clone git@github.com:D4L/squareGraph.git
+  ... blah blah pull stuff ...
+  $ rake build_gem
+
+== License
+
+Released under the MIT License. See the {LICENSE}[https://github.com/D4L/squareGraph/blob/master/LICENSE] file for further details.
 
 == Authors
 
 Austin.L <b>~D4L</b>
 
-  
-  
+
 ---
 noli umquam oblivisci: cogito ergo sum

data/Rakefile

@@ -4,3 +4,19 @@ task :default => :spec
 
 desc "Run tests"
 RSpec::Core::RakeTask.new(:spec)
+
+desc "Builds gem"
+task :build_gem do
+  puts %s{gem build square_graph.gemspec}
+  output = `gem build square_graph.gemspec`
+  puts output
+  print %s{Do you want to install the gem (y|n)? }
+  while !%w{y n}.include?(inputs = STDIN.gets[0])
+    print %s{Please use either y or n: }
+  end
+  if inputs == 'y'
+    sh %s{gem install }.to_s + output.split.last
+  else
+    p %s{Alright, peace out.}
+  end
+end

data/lib/square_graph.rb

@@ -21,16 +21,19 @@ class SquareGraph
     raise NoMethodError if @sized == false
     test_fixnum(length, width)
     return nil if test_range([1, length], [1, width])
+    if !@sg.empty?
+      return nil if test_range([@sg.keys.max_by {|x| x[0]} [0], length], [@sg.keys.max_by {|y| y[1]} [1], width])
+    end
     @length, @width = length, width
   end
 
-  def fill(*args)
-    x, y = args[0], args[1]
+  def fill(x, y, o = true)
     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)
+    return nil if @sg[[x,y]]
+    @sg[[x,y]] = Face.new(x, y, o)
   end
 
   def get(x, y)
@@ -41,7 +44,7 @@ class SquareGraph
   def remove(*args)
     x, y = args[0], args[1]
     test_fixnum(x, y)
-    @sg[[x, y]] = nil
+    @sg.delete([x, y])
   end
 
   def clear
@@ -54,6 +57,27 @@ class SquareGraph
     end)
   end
 
+  def each_obj
+    @sg.each_pair do |f, o|
+      yield(o.object)
+    end
+  end
+
+  def each_pos
+    pos = Array.new
+    @length.downto(1).each do |l|
+      @width.downto(1).each do |w|
+        p = Hash.new
+        p[:x] = l
+        p[:y] = w
+        pos.push(p)
+      end
+    end
+    pos.each do |p|
+      yield(p)
+    end
+  end
+
   private
 
   def test_fixnum(*value)

data/spec/square_graph_spec.rb

@@ -1,5 +1,12 @@
 require 'square_graph'
 
+class DummyObject
+  attr_accessor :value
+  def initialize (value)
+    @value = value
+  end
+end
+
 describe SquareGraph, '#new' do
   it "should accept two parameters" do
     SquareGraph.new(5,5).should_not be_nil
@@ -45,7 +52,9 @@ describe SquareGraph, "#resize" do
     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
+    sg = SquareGraph.new(5, 5)
+    sg.fill(5, 5)
+    sg.resize(4, 4).should be_nil
   end
 end
 
@@ -55,6 +64,12 @@ describe SquareGraph, "#fill, #get" do
     sg.fill(2,2)
     sg.get(2,2).should eql(true)
   end
+  it "can also fill a single position with an object by specifying a third parameter" do
+    du = DummyObject.new (3)
+    sg = SquareGraph.new(5,5)
+    sg.fill(3,3,du)
+    sg.get(3,3).should eql(du)
+  end
   it "doesn't allow fills of outside the graph" do
     sg = SquareGraph.new(5,10)
     sg.fill(10, 2).should be_nil
@@ -82,6 +97,11 @@ describe SquareGraph, "#fill, #get" do
     sg.get(2,2).should be_nil
     sg.get(10,10).should be_nil
   end
+  it "return nil when filling a position that's already filled" do
+    sg = SquareGraph.new
+    sg.fill(0,0)
+    sg.fill(0,0).should be_nil
+  end
 end
 
 describe SquareGraph, "#insert" do
@@ -142,3 +162,54 @@ describe SquareGraph, "#empty?" do
     sg.empty?.should eql(false)
   end
 end
+
+describe SquareGraph, "#each_pos" do
+  it "returns a each loop where the value is a 2 value'd array containing x,y" do
+    i = 0
+    sg = SquareGraph.new(5,5)
+    sg.fill(3,3)
+    sg.each_pos do |p|
+      i += 1 if sg.get(p[:x], p[:y])
+    end
+    i.should eql(1)
+  end
+end
+
+describe SquareGraph, "#each_obj" do
+  it "returns an each loop where the value is every object in the graph" do
+    sg = SquareGraph.new
+    a = DummyObject.new(1)
+    b = DummyObject.new(2)
+    c = DummyObject.new(3)
+    d = DummyObject.new(4)
+    e = DummyObject.new(5)
+    total = 0
+    sg.fill(0,0,a)
+    sg.fill(0,1,b)
+    sg.fill(0,2,c)
+    sg.fill(0,3,d)
+    sg.fill(0,4,e)
+    sg.each_obj do |o|
+      total += o.value
+    end
+    total.should eql(15)
+  end
+end
+
+describe SquareGraph, "#[][]" do
+  it "does the same thing get does" do
+    #TODO do this stuff later patches this is epics
+    #sg = SquareGraph.new
+    #sg.fill(0,0)
+    #sg[0][0].should eql(true)
+  end
+end
+
+describe SquareGraph, "#[][]=" do
+  it "does the same thing fill does" do
+    #TODO dothis stuff later, if you need reminder, need row and column classes
+    #sg = SquareGraph.new
+    #sg[0][0] = true
+    #sg[0][0].should eql(true)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_graph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -25,7 +25,8 @@ files:
 - spec/square_graph_spec.rb
 - spec/face_spec.rb
 homepage: https://github.com/D4L/squareGraph
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: