array_2d 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 318cf98676f86f1868df4c05d0abdbf3564d1228
+  data.tar.gz: 95acf1e096a5c75e6c0153d00d5fef4f031ed901
+SHA512:
+  metadata.gz: 0882c7dd437e6ef4e37c7a1740450ff308d987a777c58444c8966b13a927bf1f9e38b0ef15261855d747715383c39cc2f3eeadf397e73f101f3c11867e24eeb1
+  data.tar.gz: e01c3f5e3d18f7a2a7e58a172b66231b1353ce4c930593f6dcef712e64d2fd17946dca779ab7e5d66728e81cdd1f7233cb1b6faf47f8352437b8da5de82b9294

data/Gemfile

@@ -1,7 +1,8 @@
 source 'http://rubygems.org'
+ruby '2.2.2'
 
 group :development do
   gem 'rdoc'
-  gem 'bundler'
   gem 'jeweler'
+  gem 'minitest'
 end

data/Gemfile.lock

@@ -1,21 +1,59 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.4.0)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      oauth2
+    hashie (3.4.3)
+    highline (1.7.8)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.3)
+    jwt (1.5.2)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.5.0)
+    rdoc (4.2.1)
       json (~> 1.4)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   jeweler
+  minitest
   rdoc
+
+BUNDLED WITH
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/array_2d.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: array_2d 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "array_2d"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Luke Grecki"]
-  s.date = "2012-10-08"
+  s.date = "2016-01-15"
   s.description = "Create mutable 2D arrays that allow you to change subarrays."
   s.email = "lukegrecki@gmail.com"
   s.extra_rdoc_files = [
@@ -31,26 +33,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/lukegrecki/array_2d"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "2.4.5"
   s.summary = "A lightweight mutable 2D array class"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
     else
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
     end
   else
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
   end
 end
 

data/lib/array_2d.rb

@@ -49,24 +49,36 @@ class Array2D
       when Integer
         @state[x][y]
       when Range
-        subarray = Array.new(y.to_a.size)
-        y.each {|yi| subarray[yi - y.first] = @state[x][yi]}
-        subarray
+        if y.size <= column_size
+          subarray = Array.new(y.to_a.size)
+          y.each {|yi| subarray[yi - y.first] = @state[x][yi]}
+          subarray
+        else
+          raise IndexError, "Indices are out of range"
+        end
       end
     when Range
       case y
       when Integer
-        subarray = Array.new(x.to_a.size)
-        x.each {|xi| subarray[xi - x.first] = @state[xi][y]}
-        subarray
+        if x.size <= row_size
+          subarray = Array.new(x.to_a.size)
+          x.each {|xi| subarray[xi - x.first] = @state[xi][y]}
+          subarray
+        else
+          raise IndexError, "Indices are out of range"
+        end
       when Range
-        subarray = Array2D.new(x.to_a.size, y.to_a.size)
-        x.each do |xi|
-          y.each do |yi|
-            subarray.state[xi - x.first][yi - y.first] = @state[xi][yi]
+        if x.size <= row_size && y.size <= column_size
+          subarray = Array2D.new(x.to_a.size, y.to_a.size)
+          x.each do |xi|
+            y.each do |yi|
+              subarray.state[xi - x.first][yi - y.first] = @state[xi][yi]
+            end
           end
+          subarray
+        else
+          raise IndexError, "Indices are out of range"
         end
-        subarray
       end
     end
   end
@@ -78,8 +90,10 @@ class Array2D
       when Integer
         @state[x][y] = value
       when Range
-        if value.is_a?(Array) && y.to_a.size == value.size
+        if value.is_a?(Array) && y.size == value.size
           y.each {|yi| @state[x][yi] = value[yi - y.first]}
+        elsif value.is_a?(Array) && y.size != value.size
+          raise AssignmentError, "Value array is not the same size as subarray"
         else
           y.each {|yi| @state[x][yi] = value}
         end    
@@ -87,16 +101,20 @@ class Array2D
     when Range
       case y
       when Integer
-        if value.is_a?(Array) && x.to_a.size == value.size
+        if value.is_a?(Array) && x.size == value.size
           x.each {|xi| @state[xi][y] = value[xi - x.first]}
+        elsif value.is_a?(Array) && x.size != value.size
+          raise AssignmentError, "Value array is not the same size as subarray"
         else
           x.each {|xi| @state[xi][y] = value}
         end
       when Range
         x.each do |xi|
           y.each do |yi|
-            if value.is_a?(Array2D) && [x.to_a.size, y.to_a.size] == value.size
+            if value.is_a?(Array2D) && [x.size, y.size] == value.size
               @state[xi][yi] = value[xi - x.first, yi - y.first]
+            elsif value.is_a?(Array2D) && [x.size, y.size] != value.size
+              raise AssignmentError, "Value 2d array is not the same size as subarray"
             else
               @state[xi][yi] = value
             end
@@ -106,4 +124,7 @@ class Array2D
     end
   end
 
-end
+end
+
+class IndexError < StandardError; end
+class AssignmentError < StandardError; end

data/test/helper.rb

@@ -6,7 +6,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_array_2d.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Array2DTest < Test::Unit::TestCase
+class Array2DTest < Minitest::Test
   def setup
     @array2d = Array2D.new(3, 5, 0)
   end
@@ -10,21 +10,35 @@ class Array2DTest < Test::Unit::TestCase
     assert_instance_of Array2D, Array2D.new(3, 5, 0)
   end
 
+  def test_initial_value
+    assert_equal 0, @array2d[2, 2]
+  end
+
   def test_each
-    @array2d.each {|e| assert_equal(0, e)}
+    array2d = Array2D.new(2, 2)
+    array2d.state = [[1, 2], [3, 4]]
+    each_array = []
+    array2d.each { |e| each_array << e }
+    assert_equal [1, 2, 3, 4], each_array
   end
 
   def test_each_with_index
-    @array2d.each_with_index do |e, index| 
-      assert_equal 0, e
-      assert_instance_of Array, index
-      assert_equal 2, index.size
+    array2d = Array2D.new(2, 2)
+    array2d.state = [[1, 2], [3, 4]]
+    each_array = []
+    index_array = []
+    array2d.each_with_index do |e, index|
+      each_array << e 
+      index_array << index
     end
+    assert_equal [1, 2, 3, 4], each_array
+    assert_equal [[0, 0], [0, 1], [1, 0], [1, 1]], index_array
   end
 
   def test_to_s
-    array2d = Array2D.new(2, 2, 0)
-    assert_equal '[[0, 0], [0, 0]]', array2d.to_s
+    array2d = Array2D.new(2, 2)
+    array2d.state = [[1, 2], [3, 4]]
+    assert_equal '[[1, 2], [3, 4]]', array2d.to_s
   end
 
   def test_equality
@@ -76,4 +90,32 @@ class Array2DTest < Test::Unit::TestCase
     @array2d[0, 0...5] = 7
     assert_equal [7, 7, 7, 7, 7], @array2d[0, 0...5]
   end
+
+  def test_get_bracket_errors
+    assert_raises(IndexError) do
+      @array2d[0..(@array2d.row_size + 1), 0]
+    end
+
+    assert_raises(IndexError) do
+      @array2d[0, 0..(@array2d.column_size + 1)]
+    end
+
+    assert_raises(IndexError) do
+      @array2d[0..(@array2d.row_size + 1), 0..(@array2d.column_size + 1)]
+    end
+  end
+
+  def test_set_bracket_errors
+    assert_raises(AssignmentError) do
+      @array2d[0..(@array2d.row_size), 0] = Array.new(@array2d.row_size, 0)
+    end
+
+    assert_raises(AssignmentError) do
+      @array2d[0, 0..(@array2d.column_size)] = Array.new(@array2d.column_size + 2, 0)
+    end
+
+    assert_raises(AssignmentError) do
+      @array2d[0..(@array2d.row_size), 0..(@array2d.column_size)] = Array2D.new(@array2d.row_size + 2, @array2d.column_size + 2)
+    end
+  end
 end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: array_2d
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Luke Grecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &87113610 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87113610
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &87113040 !ruby/object:Gem::Requirement
-    none: false
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87113040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &87112770 !ruby/object:Gem::Requirement
-    none: false
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87112770
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create mutable 2D arrays that allow you to change subarrays.
 email: lukegrecki@gmail.com
 executables: []
@@ -52,7 +60,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -66,29 +74,25 @@ files:
 homepage: http://github.com/lukegrecki/array_2d
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 348675471
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A lightweight mutable 2D array class
 test_files: []