grid_struct 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8123cc6cecee6f31395c03f4f6bb71d097ac4fd1
-  data.tar.gz: 8a620e7b2af1da9daa5bdb595c388c535a14c16d
+  metadata.gz: 257074659fe7fc009a0eb3a0f8b5000223595a37
+  data.tar.gz: d2d08a8e99c244ec3a4c89c6b4b92038151cd7a6
 SHA512:
-  metadata.gz: 64a7448a8fb6b4273d5dcf61d7625f523c5db7b9b97cc26cf66b8580a4df4c2cc2d7a28f4e785c82edd811ed305106be57c2768b1da0a909925dd600dfdae75a
-  data.tar.gz: 286fe7c82704872ecc924f2c414f5b0089b607623e4c2fecb79ee200ac547f3f7f7dfd3cde17e5c5755a9f5bd541f66f6df665f12d0b9288cc7fa7b34f811141
+  metadata.gz: 50ee3b942ab3be9bc95ca14ebecbedbd6aebd2fc36275db315b1d4ace8709e8c7e51a7572a85c3c5093faa6bcfafd801c8ed4e40bf5d7a128ee82f1fe1824f45
+  data.tar.gz: a186f4b1c87b8995004636566a7df145fe987e56b26fed4d87adbbb6cb01690913f0f34bcf536a68afc04c28d4886508178535e69f62295db7a0f053b7f2d359

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.5
+
+script: 'bundle exec rake'
+
+notifications:
+  email:
+    recipients:
+      - samuel@molinari.me
+    on_failure: change
+    on_success: never

data/README.md

@@ -1,5 +1,10 @@
 # GridStruct
 
+[![Gem Version](https://badge.fury.io/rb/grid_struct.svg)](http://badge.fury.io/rb/grid_struct)
+[![Build Status](https://travis-ci.org/samuelmolinari/grid_struct.svg?branch=master)](https://travis-ci.org/samuelmolinari/grid_struct)
+[![Code Climate](https://codeclimate.com/github/samuelmolinari/grid_struct/badges/gpa.svg)](https://codeclimate.com/github/samuelmolinari/grid_struct)
+[![Test Coverage](https://codeclimate.com/github/samuelmolinari/grid_struct/badges/coverage.svg)](https://codeclimate.com/github/samuelmolinari/grid_struct)
+
 Manipulate grid like structure in Ruby.
 
 ## Installation

data/grid_struct.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/grid_struct.rb

@@ -26,24 +26,15 @@ class GridStruct
     return self
   end
 
-  def map_row!(n)
-    @columns.times.each do |column|
-      index = get_index(n,column)
-      value = @store[index]
-      @store[index] = yield(value,column)
-    end
-    return self
+  def map_row!(n, &block)
+    return map_line!(n, @columns, true, &block)
   end
 
-  def map_column!(n)
-    @rows.times.each do |row|
-      index = get_index(row,n)
-      value = @store[index]
-      @store[index] = yield(value,row)
-    end
-    return self
+  def map_column!(n, &block)
+    return map_line!(n, @rows, false, &block)
   end
 
+
   def each
     @store.fill(nil,@store.size...size).each.with_index do |value, index|
       row_column = get_row_column_at(index)
@@ -79,25 +70,7 @@ class GridStruct
     sub_row = index / sub_columns
     sub_column = index - (sub_row * sub_columns)
 
-    indexes = []
-    rows.times.each do |r|
-      start_index = (r * @columns) +
-                    (sub_row * rows * @columns) +
-                    (sub_column * columns)
-      end_index = start_index + columns
-
-      start_row = get_row_column_at(start_index)[:row]
-      end_row = get_row_column_at(end_index)[:row]
-
-      if start_row != end_row
-        extras = [0,(end_index - @columns)].max % @columns
-        end_index -= extras
-      end
-
-      final_row_indexes = (start_index...end_index).to_a
-      final_row_indexes.fill(nil,final_row_indexes.size...columns)
-      indexes += final_row_indexes
-    end
+    indexes = retrieve_sliced_indexes(rows,columns,sub_row,sub_column)
 
     return GridStruct::Selector.new(self, *indexes).dimensions(rows,columns)
   end
@@ -139,8 +112,50 @@ class GridStruct
     @store == other.instance_variable_get(:@store)
   end
 
+  def within_bounds?(row,column)
+    row_within_bounds?(row) && column_within_bounds?(column)
+  end
+
   protected
 
+  def fit_selection_within_same_row(start_index, end_index)
+    start_row = get_row_column_at(start_index)[:row]
+    end_row = get_row_column_at(end_index)[:row]
+
+    if start_row != end_row
+      extras = [0,(end_index - @columns)].max % @columns
+      end_index -= extras
+    end
+
+    return start_index...end_index
+  end
+
+  def retrieve_sliced_indexes(rows, columns, sub_row, sub_column)
+    rows.times.inject([]) do |memo, r|
+      start_index = (r * @columns) +
+        (sub_row * rows * @columns) +
+        (sub_column * columns)
+      end_index = start_index + columns
+
+      final_row_indexes = fit_selection_within_same_row(start_index, end_index).to_a
+      final_row_indexes.fill(nil,final_row_indexes.size...columns)
+
+      memo += final_row_indexes
+    end
+  end
+
+  def line_within_bounds?(n, axis_size)
+    n >= 0 && n < axis_size
+  end
+
+  def row_within_bounds?(row)
+    line_within_bounds?(row, @rows)
+  end
+
+  def column_within_bounds?(column)
+    line_within_bounds?(column, @columns)
+  end
+
   def get_index(row,column)
     (row * @columns) + column
   end
@@ -156,31 +171,36 @@ class GridStruct
     column = coordinates[:column]
     index = get_index(row,column)
 
-    if !diagonal_indexes.include?(index) &&
-        row >= 0 &&
-        column >= 0 &&
-        row < @rows &&
-        column < @columns
-
+    if !diagonal_indexes.include?(index) && within_bounds?(row, column)
       diagonal_indexes.method(action).call(get_index(row,column))
 
-      diagonal_builder({ row: row - (row_direction * 1),
-                         column: column - (column_direction * 1) },
-                         row_direction,
-                         column_direction,
-                         diagonal_indexes,
-                         :unshift)
-
-      diagonal_builder({ row: row + (row_direction * 1),
-                         column: column + (column_direction * 1) },
-                         row_direction,
-                         column_direction,
-                         diagonal_indexes,
-                         :push)
-
+      fetch_diagonal_index(row, column, row_direction, column_direction, diagonal_indexes, -1)
+      fetch_diagonal_index(row, column, row_direction, column_direction, diagonal_indexes, 1)
     end
 
     return diagonal_indexes
   end
 
+  def fetch_diagonal_index(row, column, row_direction, column_direction, diagonal_indexes, sign)
+    row = row + sign * row_direction
+    column = column + sign * column_direction
+    action = sign > 0 ? :push : :unshift
+
+    diagonal_builder({ row: row,
+                       column: column },
+                     row_direction,
+                     column_direction,
+                     diagonal_indexes,
+                     action)
+  end
+
+  def map_line!(n, other_axis_size, is_row)
+    other_axis_size.times.each do |other_axis|
+      index = is_row ? get_index(n,other_axis) : get_index(other_axis,n)
+      value = @store[index]
+      @store[index] = yield(value,other_axis)
+    end
+    return self
+  end
+
 end

data/lib/grid_struct/version.rb

@@ -1,3 +1,3 @@
 class GridStruct
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'grid_struct'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_struct
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Samuel Molinari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Grid data structure
 email:
 - samuel@molinari.me
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt