tablestakes 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f8bcf6867af660a8a70c778e6b99c58d87d34b
-  data.tar.gz: 1be6354ea8b90fb237e3006d9fa75654a9608222
+  metadata.gz: 712201016806acdde2ba71077b3b9d22adbb2901
+  data.tar.gz: b3a10d461c4676c63ca3913f54785dd1333cf0fe
 SHA512:
-  metadata.gz: 4db9e294efa043aac351ae261d8f54bd6f60d2c52985c5c3aa35582c2737aa59ce9d36033ea5cb2b2a19d93ab9b3f7195b5ecbdc47eeef0c67d7cb6714e5128f
-  data.tar.gz: a0e06d3114a5d7264a140e92aebad9e6de4ebe362fa2dcd22c855302ba5dd114cf2eab26cd53a17fd07540f5911740a7f8e7ef2e7133a75d9eac5b4bc437d64b
+  metadata.gz: bb5e169a7636d4b01236b28944b0f07c6f4576615dc587026d5f4e25316f8934e0f172e6393517dc2777537b966cbaa1789fa4304542105e177255f3fb3ea96b
+  data.tar.gz: d79187e12a20e858dc1416f65231d3413f31b26285ac17177d850245747fa929c785e57001e44e5204c337a90bf5e6c3977116b75b6cddcb9c7adc06d864046f

data/README.md

@@ -2,31 +2,13 @@ Tablestakes
 ===========
 
 [![Gem Version][GV img]][Gem Version]
-[![Build Status][BS img]][Build Status]
 [![Dependency Status][DS img]][Dependency Status]
-[![Code Climate][CC img]][Code Climate]
-[![Coverage Status][CS img]][Coverage Status]
 
 [Gem Version]: https://rubygems.org/gems/tablestakes
-<<<<<<< HEAD
 [Dependency Status]: https://gemnasium.com/jbfolkerts/tablestakes
-[Coverage Status]: https://coveralls.io/r/jbfolkerts/tablestakes
 
 [GV img]: https://badge.fury.io/rb/tablestakes.png
 [DS img]: https://gemnasium.com/jbfolkerts/tablestakes.png
-=======
-[Build Status]: https://travis-ci.org/jbfolkerts/tablestakes
-[travis pull requests]: https://travis-ci.org/jbfolkerts/tablestakes/pull_requests
-[Dependency Status]: https://gemnasium.com/jbfolkerts/tablestakes
-[Code Climate]: https://codeclimate.com/github/jbfolkerts/tablestakes
-[Coverage Status]: https://coveralls.io/r/jbfolkerts/tablestakes
-
-[GV img]: https://badge.fury.io/rb/tablestakes.png
-[BS img]: https://travis-ci.org/jbfolkerts/tablestakes.png
-[DS img]: https://gemnasium.com/jbfolkerts/tablestakes.png
-[CC img]: https://codeclimate.com/github/jbfolkerts/tablestakes.png
->>>>>>> 12f008f26e005a9519dc7cc6664c218fca72a01c
-[CS img]: https://coveralls.io/repos/jbfolkerts/tablestakes/badge.png?branch=master
 
 Tablestakes is a gem for processing tabular data.  It is for people who would rather not meddle with
 a spreadsheet, or load their data into a SQL database.  You get the instant gratification of being

data/lib/tablestakes.rb

@@ -172,6 +172,8 @@ class Table
     return self
   end
 
+  alias :<< :add_row
+
   # Delete a column from the Table. Raises ArgumentError if the column name does not exist. 
   #
   # ==== Attributes
@@ -447,30 +449,53 @@ class Table
   
 
   # Given a field/column, and a regular expression to match against, and a replacement string,
-  # update the table such that it substitutes the column data with the replacement string.
-  # Returns +nil+ if the column is not found.
+  # create a new table which performs a substitute operation on column data.  In the case that the
+  # given replacement is a +String+, a direct substitute is performed. In the case that it is a +Hash+
+  # and the matched text is one of its keys, the corresponding +Hash+ value will be substituted.
+  #
+  # Optionally takes a block containing an operation to perform on all matching data elements 
+  # in the given column. Raises ArgumentError if the column is not found.
   # 
   # ==== Attributes
   # +colname+:: +String+ to identify the column to join on
   # +re+:: +Regexp+ to match the value in the selected column
-  # +replace+:: +String+ to specify the replacement text for the given +Regexp+
+  # +replace+:: OPTIONAL +String+ or +Hash+ to specify the replacement text for the given +Regexp+
+  # +&block+:: OPTIONAL block to execute against matching values
   #
   # ==== Examples
   #     cities.sub("Population", /(.*?),(.*?)/, '\1\2')  # eliminate commas
   #     capitals.sub("State", /NY/, "New York")  # replace acronym with full name
+  #     capitals.sub("State") { |state| state.downcase } # Lowercase for all values
   #
-  def sub(colname, re, replace)
+  def sub(colname, re=nil, replace=nil, &block)
     # check arguments
     raise ArgumentError, "No regular expression to match against" unless re
-    raise ArgumentError, "No replacement string specified" unless replace
     raise ArgumentError, "Invalid column name" unless @table.has_key?(colname)
-    
-    @table[colname].each do |item|
-      item.sub!(re, replace)
+    replace_str = ""
+    if replace.respond_to?(:fetch)
+      replace_str = replace.fetch(re)
+    elsif replace.respond_to?(:to_str)
+      replace_str = replace.to_str
+    else
+      raise ArgumentError, "Replacement must be String or Hash"
     end
-    return self
+
+    result = Table.new([@headers])
+    col_index = @headers.index(colname)
+
+    self.each do |row|
+      if block_given?
+        row[col_index] = block.call row[col_index]
+      else
+        row[col_index] = row[col_index].sub(re, replace_str)
+      end  
+      result.add_row(row)
+    end
+    return result
   end
 
+  # alias :sub! :sub  
+
   # Return Array with the union of elements columns in the given tables, eliminating duplicates.
   # Raises an ArgumentError if a column is not found.
   #
@@ -511,8 +536,6 @@ class Table
     return self.column(colname) & table2.column(col2name)
   end
 
-  alias :sub! :sub  
-
   # Sort the table based on given column. Uses precedence as defined in the 
   # column. By default will sort by the value in the first column.
   #

data/spec/table_spec.rb

@@ -2,6 +2,7 @@
 #
 #
 require 'spec_helper'
+require 'rspec/its'
 require_relative '../lib/tablestakes'
 
 
@@ -205,7 +206,7 @@ describe "Table" do
       expect((t.select("Name","Address","Records")).headers).to eq(["Name","Address","Records"])
     end
     it "does not select columns that are not given as arguments" do
-      expect((t.select("Name","Address","Records")).headers.include?("Phone")).to be_false
+      expect((t.select("Name","Address","Records")).headers.include?("Phone")).to eq(false)
     end
     it "raise ArgumentError when the given arguments don't match a column" do
       expect { t.select("Silly") }.to raise_error(ArgumentError)
@@ -243,11 +244,20 @@ describe "Table" do
       expect(cities.sub("State", /Jersey/, "York")).to be_a(Table)
     end
     it "substitutes the values in a given field" do
-      expect((cities.sub("State", /Jersey/, "York")).count("State", "New York")).to eq(9)
+      expect(cities.sub("State", /Jersey/, "York").column("State")).to include("New York")
     end
     it "raises ArgumentError when the given arguments don't match a column" do
       expect {cities.sub("Silly", /NJ/, "NY") }.to raise_error(ArgumentError)
     end
+    it "raises ArgumentError when not given a Match string" do
+      expect {cities.sub("State") }.to raise_error(ArgumentError)
+    end
+    it "raises ArgumentError when replacement is not a String or Hash" do
+      expect {cities.sub("State", /New/, 9)}.to raise_error(ArgumentError)
+    end
+    it "does not modify the given table" do
+      expect(cities.sub("State", /New/, "Old") && cities.column("State")).to include("New York")
+    end
   end
   
   describe ".union" do

metadata

@@ -1,71 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: tablestakes
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - J.B. Folkerts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 description: A simple implementation of Tables, for use in summing, joining, slicing
   and dicing data tables
 email: jbf@pentambic.com
@@ -73,7 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tablestakes.rb
+- README.md
+- capitals.sorted
+- capitals.txt
+- cities.txt
+- doc/OrderedRow.html
+- doc/Table.html
 - doc/created.rid
 - doc/images/add.png
 - doc/images/arrow_up.png
@@ -105,20 +152,15 @@ files:
 - doc/js/jquery.js
 - doc/js/navigation.js
 - doc/js/search.js
-- doc/js/searcher.js
 - doc/js/search_index.js
-- doc/OrderedRow.html
+- doc/js/searcher.js
 - doc/rdoc.css
-- doc/Table.html
 - doc/table_of_contents.html
-- README.md
-- test.tab
-- cities.txt
-- capitals.txt
-- capitals.sorted
+- lib/tablestakes.rb
 - spec/factories.rb
-- spec/table_spec.rb
 - spec/spec_helper.rb
+- spec/table_spec.rb
+- test.tab
 homepage: http://rubygems.org/gems/tablestakes
 licenses:
 - MIT
@@ -129,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Implementation of in-memory Tables
@@ -151,3 +193,4 @@ test_files:
 - spec/factories.rb
 - spec/table_spec.rb
 - spec/spec_helper.rb
+has_rdoc: