sycsvpro 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b836321e6ea07a6f95c86d5a0f90b516851a15a
-  data.tar.gz: 79a6f3c56e4aeb83fc5f2a9fa25c7294e96a0086
+  metadata.gz: 7823aeea07dda43deb692fdf13a8f57559bbb917
+  data.tar.gz: 4e3da29ada80c6c4a5eb282facce537e4750f0e3
 SHA512:
-  metadata.gz: 67be18777e87d10a65595f84feaebc1d06697b9350def8646e6638fa98da5915b24a9477ad61b4f7cd5dda1291fadaa8d0c3bc7c02a2b9d988a17c6ca7aee5dc
-  data.tar.gz: bf2ab9a8700ef5c019883f6dff2975a4042bad88cd8a928bcb74cf8516c06be07977f44137845b4787bc29a16ad88c4477ca3b047e13c3f7e6b60538ec591748
+  metadata.gz: 203400b5c9187269c3fe336f940f25427eecfd5fe25a56fbc3fc982f7c47d059a6aefc5eb74b5ab5769d5a0b318ebf2ee72a231db64127cb24ca767ee8f5915f
+  data.tar.gz: deb1cfff428e6e83f1770a2f67a7b4e6fcf5cc642ce6c96cd50ba748ecfb8e44aaa39b53b88bc08083e434857d2ab778a7d086f1e61d9de3b3d7c1568a9ce343

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sycsvpro (0.1.0)
+    sycsvpro (0.1.1)
       gli (= 2.9.0)
 
 GEM

data/bin/sycsvpro

@@ -342,7 +342,12 @@ command :calc do |c|
 
     c.desc 'Column to do calculations on'
     c.arg_name 'COL1:*2,COL2:-C3,COL3:*2+(4+C5),COL6:NEW_COL=C1+5'
-    c.flag [:c, :col], :must_match => /\d+:(?:[\*\/\+\-]|\w+=[\d|(]*)[\*\/\+\-\dc()]*(?:,\d+:(?:[\*\/\+\-]|\w+=[\d|(]*)[\*\/\+\-\dc()]*)*/
+    #c.flag [:c, :col], :must_match => /\d+:(?:[\*\/\+\-]|\w+=[\d|(]*)[\*\/\+\-\dc()]*(?:,\d+:(?:[\*\/\+\-]|\w+=[\d|(]*)[\*\/\+\-\dc()]*)*/
+    c.flag [:c, :col], :must_match => /\d+:(?:[\*\+\-\/\d\w=\[\],\.:()]*)/
+
+    c.desc 'Date format of date columns'
+    c.arg_name '%d.%m.%Y|%Y-%m-%d|...'
+    c.flag [:df]
 
     c.desc 'Indicate to add a sum row'
     c.switch [:s, :sum]
@@ -353,7 +358,7 @@ command :calc do |c|
     print "Calculating..."
     calculator = Sycsvpro::Calculator.new(infile: global_options[:f], outfile: global_options[:o],
                                           header: options[:h], rows: options[:r], cols: options[:c],
-                                          sum: options[:s])
+                                          sum: options[:s], df: options[:df])
     calculator.execute 
     puts "done"
   end

data/html/Object.html

@@ -154,7 +154,7 @@ of the input file</p>
 
           
           <div class="method-source-code" id="set_max_row-source">
-            <pre><span class="ruby-comment"># File bin/sycsvpro, line 454</span>
+            <pre><span class="ruby-comment"># File bin/sycsvpro, line 459</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">set_max_row</span>(<span class="ruby-identifier">options</span>, <span class="ruby-identifier">max_row</span>)
   <span class="ruby-identifier">options</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">option</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
     <span class="ruby-keyword">case</span> <span class="ruby-identifier">option</span>

data/html/Sycsvpro/Allocator.html

@@ -257,7 +257,7 @@ to allocate to key</p>
   <span class="ruby-identifier">allocation</span> = {}
   <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">infile</span>).<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span>, <span class="ruby-identifier">index</span><span class="ruby-operator">|</span>
     <span class="ruby-identifier">row</span> = <span class="ruby-identifier">row_filter</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">line</span>, <span class="ruby-identifier">row</span><span class="ruby-operator">:</span> <span class="ruby-identifier">index</span>)
-    <span class="ruby-keyword">next</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">row</span>.<span class="ruby-identifier">nil?</span>
+    <span class="ruby-keyword">next</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">row</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-keyword">or</span> <span class="ruby-identifier">row</span>.<span class="ruby-identifier">empty?</span>
     <span class="ruby-identifier">key</span> = <span class="ruby-identifier">key_filter</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">row</span>)
     <span class="ruby-identifier">allocation</span>[<span class="ruby-identifier">key</span>] = [] <span class="ruby-keyword">if</span> <span class="ruby-identifier">allocation</span>[<span class="ruby-identifier">key</span>].<span class="ruby-identifier">nil?</span>
     <span class="ruby-identifier">allocation</span>[<span class="ruby-identifier">key</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">col_filter</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">row</span>).<span class="ruby-identifier">split</span>(<span class="ruby-string">&#39;;&#39;</span>) 

data/html/Sycsvpro/Calculator.html

@@ -153,6 +153,19 @@ the value of column 1 with 2.</p>
         </div>
       </div>
       
+      <div id="attribute-i-date_format" class="method-detail">
+        <div class="method-heading attribute-method-heading">
+          <span class="method-name">date_format</span><span
+            class="attribute-access-type">[R]</span>
+        </div>
+
+        <div class="method-description">
+        
+        <p>date format for date operations</p>
+        
+        </div>
+      </div>
+      
       <div id="attribute-i-formulae" class="method-detail">
         <div class="method-heading attribute-method-heading">
           <span class="method-name">formulae</span><span
@@ -250,10 +263,11 @@ generated due to a arithmetic operation that creates new columns</p>
 
           
           <div class="method-source-code" id="new-source">
-            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 33</span>
+            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 36</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">options</span>={})
   <span class="ruby-ivar">@infile</span>      = <span class="ruby-identifier">options</span>[<span class="ruby-value">:infile</span>]
   <span class="ruby-ivar">@outfile</span>     = <span class="ruby-identifier">options</span>[<span class="ruby-value">:outfile</span>]
+  <span class="ruby-ivar">@date_format</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:df</span>] <span class="ruby-operator">||</span> <span class="ruby-string">&quot;%Y-%m-%d&quot;</span>
   <span class="ruby-ivar">@row_filter</span>  = <span class="ruby-constant">RowFilter</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">options</span>[<span class="ruby-value">:rows</span>])
   <span class="ruby-ivar">@header</span>      = <span class="ruby-constant">Header</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">options</span>[<span class="ruby-value">:header</span>])
   <span class="ruby-ivar">@sum_row</span>     = []
@@ -298,7 +312,7 @@ generated due to a arithmetic operation that creates new columns</p>
 
           
           <div class="method-source-code" id="execute-source">
-            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 50</span>
+            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 55</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">execute</span>
   <span class="ruby-identifier">processed_header</span> = <span class="ruby-keyword">false</span>
 
@@ -364,9 +378,10 @@ generated due to a arithmetic operation that creates new columns</p>
 
           
           <div class="method-source-code" id="method_missing-source">
-            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 45</span>
+            <pre><span class="ruby-comment"># File lib/sycsvpro/calculator.rb, line 49</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">method_missing</span>(<span class="ruby-identifier">id</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
-  <span class="ruby-identifier">to_number</span>(<span class="ruby-identifier">columns</span>[<span class="ruby-node">$1</span>.<span class="ruby-identifier">to_i</span>]) <span class="ruby-keyword">if</span> <span class="ruby-identifier">id</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp">/c(\d+)/</span>
+  <span class="ruby-keyword">return</span> <span class="ruby-identifier">to_number</span>(<span class="ruby-identifier">columns</span>[<span class="ruby-node">$1</span>.<span class="ruby-identifier">to_i</span>]) <span class="ruby-keyword">if</span> <span class="ruby-identifier">id</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp">/c(\d+)/</span>
+  <span class="ruby-keyword">return</span> <span class="ruby-identifier">to_date</span>(<span class="ruby-identifier">columns</span>[<span class="ruby-node">$1</span>.<span class="ruby-identifier">to_i</span>])   <span class="ruby-keyword">if</span> <span class="ruby-identifier">id</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp">/d(\d+)/</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
           

data/html/created.rid

@@ -1,10 +1,10 @@
-Thu, 06 Mar 2014 19:02:19 +0100
+Wed, 12 Mar 2014 23:51:45 +0100
 README.rdoc	Thu, 06 Mar 2014 18:59:37 +0100
 lib/sycsvpro.rb	Tue, 04 Mar 2014 21:03:44 +0100
 lib/sycsvpro/aggregator.rb	Tue, 04 Mar 2014 21:40:52 +0100
-lib/sycsvpro/allocator.rb	Wed, 19 Feb 2014 20:34:28 +0100
+lib/sycsvpro/allocator.rb	Fri, 07 Mar 2014 22:30:55 +0100
 lib/sycsvpro/analyzer.rb	Tue, 18 Feb 2014 19:57:28 +0100
-lib/sycsvpro/calculator.rb	Thu, 06 Mar 2014 18:44:54 +0100
+lib/sycsvpro/calculator.rb	Wed, 12 Mar 2014 23:47:35 +0100
 lib/sycsvpro/collector.rb	Sun, 16 Feb 2014 20:59:27 +0100
 lib/sycsvpro/column_filter.rb	Fri, 28 Feb 2014 08:24:47 +0100
 lib/sycsvpro/column_type_filter.rb	Fri, 28 Feb 2014 18:17:46 +0100
@@ -20,5 +20,5 @@ lib/sycsvpro/row_filter.rb	Tue, 18 Feb 2014 19:45:25 +0100
 lib/sycsvpro/script_creator.rb	Sun, 23 Feb 2014 20:35:21 +0100
 lib/sycsvpro/script_list.rb	Sun, 23 Feb 2014 21:03:22 +0100
 lib/sycsvpro/sorter.rb	Sun, 02 Mar 2014 21:07:30 +0100
-lib/sycsvpro/version.rb	Tue, 04 Mar 2014 21:35:59 +0100
-bin/sycsvpro	Thu, 06 Mar 2014 19:02:12 +0100
+lib/sycsvpro/version.rb	Wed, 12 Mar 2014 21:37:56 +0100
+bin/sycsvpro	Wed, 12 Mar 2014 23:41:41 +0100

data/lib/sycsvpro/allocator.rb

@@ -29,7 +29,7 @@ module Sycsvpro
       allocation = {}
       File.open(infile).each_with_index do |line, index|
         row = row_filter.process(line, row: index)
-        next if row.nil?
+        next if row.nil? or row.empty?
         key = key_filter.process(row)
         allocation[key] = [] if allocation[key].nil?
         allocation[key] << col_filter.process(row).split(';') 

data/lib/sycsvpro/calculator.rb

@@ -1,6 +1,7 @@
 require_relative 'row_filter'
 require_relative 'header'
 require_relative 'dsl'
+require 'date'
 
 # Operating csv files
 module Sycsvpro
@@ -18,6 +19,8 @@ module Sycsvpro
     attr_reader :outfile
     # filter that is used for rows
     attr_reader :row_filter
+    # date format for date operations
+    attr_reader :date_format
     # the operations on columns
     attr_reader :formulae
     # header of the outfile
@@ -33,6 +36,7 @@ module Sycsvpro
     def initialize(options={})
       @infile      = options[:infile]
       @outfile     = options[:outfile]
+      @date_format = options[:df] || "%Y-%m-%d"
       @row_filter  = RowFilter.new(options[:rows])
       @header      = Header.new(options[:header])
       @sum_row     = []
@@ -43,7 +47,8 @@ module Sycsvpro
 
     # Retrieves the values from a row as the result of a arithmetic operation
     def method_missing(id, *args, &block)
-      to_number(columns[$1.to_i]) if id =~ /c(\d+)/
+      return to_number(columns[$1.to_i]) if id =~ /c(\d+)/
+      return to_date(columns[$1.to_i])   if id =~ /d(\d+)/
     end
 
     # Executes the calculator
@@ -95,9 +100,9 @@ module Sycsvpro
       # 4:c1+1 means create a new column and assign to it the result of the sum of the value of 
       # column 1 + 1 c[4] = c[1] + 1
       def create_calculator(code)
-        code.split(',').each do |operation|
+        code.split(/,(?=\d+:)/).each do |operation|
           col, term = operation.split(':')
-          term = "c#{col}#{term}" unless term =~ /^c\d+/
+          term = "c#{col}#{term}" unless term =~ /^c\d+|^\[/
           formulae[col] = term
         end
       end
@@ -108,6 +113,15 @@ module Sycsvpro
         return value.to_f if     value =~ /\./ 
       end
 
+      # Casts a string to a date
+      def to_date(value)
+        if value.nil? or value.strip.empty?
+          nil
+        else
+          Date.strptime(value, date_format)
+        end
+      end
+
   end
 
 end

data/lib/sycsvpro/version.rb

@@ -1,5 +1,5 @@
 # Operating csv files
 module Sycsvpro
   # Version number of sycsvpro
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/sycsvpro/calculator_spec.rb

@@ -6,6 +6,8 @@ module Sycsvpro
 
     before do
       @in_file = File.join(File.dirname(__FILE__), "files/machines.csv")
+      @in_date_file = File.join(File.dirname(__FILE__), "files/machine-delivery.csv")
+      @in_number_file = File.join(File.dirname(__FILE__), "files/machine-count.csv")
       @out_file = File.join(File.dirname(__FILE__), "files/machines_out.csv")
     end
 
@@ -62,6 +64,90 @@ module Sycsvpro
       end
     end
 
+    it "should find maximum of specified date rows" do
+      header = "*,Max Date"
+      cols   = "3:[d1,d2].compact.max"
+      rows   = "1-8"
+      df     = "%d.%m.%Y"
+
+      calculator = Calculator.new(infile: @in_date_file, outfile: @out_file, 
+                                  header: header, rows: rows, cols: cols, df: df)
+      calculator.execute
+
+      result = ["customer;delivery;registration;Max Date",
+                "Fink;1.10.2014;30.9.2013;2014-10-01",
+                "Haas;3.3.2012;10.10.2013;2013-10-10",
+                "Gent;8.5.1995;11.2.1999;1999-02-11",
+                "Rank;;1.3.2002;2002-03-01" ]
+
+      File.new(@out_file, 'r').each_with_index do |line, index|
+        expect(line.chomp).to eq result[index]
+      end
+    end
+
+    it "should find minimum of specified date rows" do
+      header = "*,Min_Date"
+      cols   = "3:Min_Date=[d1,d2].compact.min"
+      rows   = "1-8"
+      df     = "%d.%m.%Y"
+
+      calculator = Calculator.new(infile: @in_date_file, outfile: @out_file, 
+                                  header: header, rows: rows, cols: cols, df: df)
+      calculator.execute
+
+      result = ["customer;delivery;registration;Min_Date",
+                "Fink;1.10.2014;30.9.2013;2013-09-30",
+                "Haas;3.3.2012;10.10.2013;2012-03-03",
+                "Gent;8.5.1995;11.2.1999;1995-05-08",
+                "Rank;;1.3.2002;2002-03-01" ]
+
+      File.new(@out_file, 'r').each_with_index do |line, index|
+        expect(line.chomp).to eq result[index]
+      end
+    end
+
+    it "should find maximum of specified number rows" do
+      header = "*,Max Number"
+      cols   = "4:[c1,c2,c3].max"
+      rows   = "1-8"
+      df     = "%d.%m.%Y"
+
+      calculator = Calculator.new(infile: @in_number_file, outfile: @out_file, 
+                                  header: header, rows: rows, cols: cols, df: df)
+      calculator.execute
+
+      result = ["customer;before;between;after;Max Number",
+                "Fink;2;3;1;3",
+                "Haas;3;1;6;6",
+                "Gent;4;4;4;4",
+                "Rank;5;4;1;5"]
+
+      File.new(@out_file, 'r').each_with_index do |line, index|
+        expect(line.chomp).to eq result[index]
+      end
+    end
+
+    it "should find minimum of specified number rows" do
+      header = "*,Min Number"
+      cols   = "4:[c1,c2,c3].min"
+      rows   = "1-8"
+      df     = "%d.%m.%Y"
+
+      calculator = Calculator.new(infile: @in_number_file, outfile: @out_file, 
+                                  header: header, rows: rows, cols: cols, df: df)
+      calculator.execute
+
+      result = ["customer;before;between;after;Min Number",
+                "Fink;2;3;1;1",
+                "Haas;3;1;6;1",
+                "Gent;4;4;4;4",
+                "Rank;5;4;1;1"]
+
+      File.new(@out_file, 'r').each_with_index do |line, index|
+        expect(line.chomp).to eq result[index]
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sycsvpro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pierre Sugar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake