goodsheet 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba007929170fe7d6e80af781d6a20132018238f0
-  data.tar.gz: 97ae8e3fd6e1c83656d138a532cfa8177486da57
+  metadata.gz: aef27ae57a44343de4b43b8118c3a4dba7940021
+  data.tar.gz: ccd478aad49271a61e1e4278cbfd95ea9a226b17
 SHA512:
-  metadata.gz: d10c109430d18557c4fbd823755290ab1fc6361f2e9305de87e10896aa9bda9c5322e954969ec0991243e7921a45dc46d44f34485811ccc87506888921f006fd
-  data.tar.gz: 9ec851827a5c6a67e83dfadeb5036626b4f29aef8e5953a841860f5216275a453e690a81196d37e3dc10fe6eeb26e49a993e71bd43fe02aa0387c67e4a545e47
+  metadata.gz: cf0b9d857e4eb5a66cbf72a6c205e1ab4f517fd93dbd40e42382e1b1f34d0b0e74813bdf8bb5e3e48c554933297ccc31160d39e83e2d4b311825ddf73c32d897
+  data.tar.gz: f866ccb2f33ffa9618f12c597a1ab4c9d88282eaf6ffd0485d0e262f78cc506c424a58cc97f2de569e385aa88e2f517b3ee85fd443a955c35e9fe4c808bd7e6e

data/lib/goodsheet.rb

@@ -1,4 +1,5 @@
 require "goodsheet/version"
+require "goodsheet/aux"
 
 module Goodsheet
   autoload :Row,                'goodsheet/row'

data/lib/goodsheet/read_result.rb

@@ -1,11 +1,30 @@
 module Goodsheet
-  
   class ReadResult
-    attr_reader :vv, :errors
+    attr_reader :errors
 
-    def initialize(errors=ValidationErrors.new)
-      @errors = errors
-      @vv = {}
+    def initialize(row_attributes, max_errors, collector=:a_arr)
+      @row_attributes = row_attributes
+      case collector
+      when :hash
+        @hash = {}
+      when :a_arr
+        @a_arr = []
+      when :h_arr
+        @h_arr = []
+      end
+      @errors = ValidationErrors.new(max_errors)
+    end
+
+
+    def add(row_number, row)
+      if defined? @hash
+        row.to_hash.each_pair do |k, v|
+          (@hash[k]||=[]) << v                  # @hash = {:a => ["dog, "cat", ...], :b => [3, 7, ...]}
+        end
+      end
+      @a_arr << row.to_a if defined? @a_arr     # @a_arr = [["dog", 3], ["cat", 7], ...]
+      @h_arr << row.to_hash if defined? @h_arr  # @h_arr = [{:a => "dog", :b => 3}, {:a => "cat", :b => 7}, ...]
+      @errors.add(row_number, row)
     end
 
     def valid?
@@ -16,33 +35,81 @@ module Goodsheet
       !valid?
     end
 
-    def add(attribute, row)
-      attribute = attribute.to_sym
-      (@vv[attribute] ||= []) << row.send(attribute)
-    end
-
     def values(format=:columns)
-      values_size = 0
-      values_size = @vv.values.first.size if @vv.values.first
+      if defined? @hash
+        return [] if @hash.empty?
+        values_for_hash(format)
+
+      elsif defined? @h_arr
+        return [] if @h_arr.empty?
+        values_for_h_arr(format)
 
+      elsif defined? @a_arr # @a_arr = [["dog", 3], ["cat", 7], ...]
+        return [] if @a_arr.empty?
+        values_for_a_arr(format)
+      end
+    end  
+
+    def values_for_hash(format)
       case format
       when :columns
-        @vv
+        @hash
 
       when :rows_array
-        Array.new(values_size) do |i1|
-          Array.new(@vv.size) do |i2|
-            @vv[@vv.keys[i2]][i1]
-          end
+        a1 = []
+        @hash.values.first.size.times do |i|
+          a1 << @row_attributes.collect{|a| @hash[a][i]}
+        end
+        a1
+
+      when :rows_hash
+        a1 = []
+        @hash.values.first.size.times do |i|
+          a2 = {}
+          @row_attributes.each{|a| a2[a] = @hash[a][i]}
+          a1 << a2
+        end
+        a1
+      end
+    end
+
+    def values_for_a_arr(format)
+      case format
+      when :columns
+        h = {}
+        @row_attributes.each_with_index do |attrib, i|
+          h[attrib] = @a_arr.map{|e| e[i]}
         end
+        h
+
+      when :rows_array
+        @a_arr
 
       when :rows_hash
-        Array.new(values_size) do |i1|
-          hh = {}
-          @vv.keys.each{|k| hh[k] = @vv[k][i1] }
-          hh
+        @a_arr.map do |arr|
+          Hash[@row_attributes.map.with_index{|attrib,i| [attrib, arr[i]]}]
         end
       end
     end
+
+    def values_for_h_arr(format)
+      case format
+      when :columns
+        keys = @h_arr.first.keys
+        h = {}
+        @h_arr.each do |e|
+          keys.each do |key|
+            (h[key] ||= []) << e[key] 
+          end
+        end
+        h
+
+      when :rows_array
+        @h_arr.map(&:values)
+
+      when :rows_hash
+        @h_arr
+      end
+    end
   end
 end

data/lib/goodsheet/row.rb

@@ -4,18 +4,21 @@ module Goodsheet
   
   class Row
     include ActiveModel::Validations
-    include ActiveModel::Conversion
-    extend ActiveModel::Naming
 
     class << self
-      attr_accessor :keys
+      attr_accessor :keys, :defaults
     end
-    @keys = {} # idx => key
+    # @keys = {} # idx => key: {0=>:name, 1=>:quantity, 2=>:price, 3=>:total, 6=>:password}
+    # @defaults = {} # name => default_value
 
     def initialize(arr, nil_value=nil)
+      # puts "--- arr: #{arr.inspect}"
+      if (diff=self.class.keys.size-arr.size)>0
+        arr = arr + Array.new(diff, nil)
+      end
       arr.each_with_index do |v, idx|
         if k = self.class.keys[idx]
-          send("#{k}=", v || nil_value)       
+          send "#{k}=", v || self.class.defaults[k] || nil_value     
         end
       end
       super()
@@ -23,12 +26,30 @@ module Goodsheet
 
     def self.inherit(block)
       c = Class.new(self) do
-        @keys = {} # idx => key
+        @keys = {} # idx => key: {0=>:name, 1=>:quantity, 2=>:price, 3=>:total, 6=>:password}
+        @defaults = {} # name => default_value
       end
       c.class_eval(&block)
       c
     end
 
+    # using indexes: defaults 1 => 0.0, 2 => ""
+    # using names:   defaults :qty => 0.0, :name => ""
+
+    def self.column_defaults(*attr)
+      raise ArgumentError, 'You have to pass at least one attribute' if attr.empty?
+      if attr[0].is_a? Array
+        @defaults = Hash[attr[0].map.with_index{|v, i| [self.keys[i], v]}]
+
+      elsif attr[0].is_a? Hash
+        @defaults = Hash[attr[0].to_a.collect{|a| [(a[0].is_a?(Fixnum)) ? (self.keys[a[0]]) : a[0], a[1]]}]
+
+      else
+        @defaults = Hash[attr.map.with_index{|v, i| [self.keys[i], v]}]
+      end
+    end
+
+
     # Define the position (or index) and the name of columns.
     # You have four ways to define them: 
     # using an hash index-to-name (like { 0 => :year, 2 => :day }) 
@@ -42,22 +63,25 @@ module Goodsheet
       raise ArgumentError, 'You have to pass at least one attribute' if attr.empty?
       if attr[0].is_a? Array
         attr[0].each_with_index do |name, idx|
-          if name
-            self.keys[idx] = name
-            attr_accessor name        
-          end
+          self.set_key_pair(idx, name) if name
+          # if name
+          #   self.keys[idx] = name
+          #   attr_accessor name        
+          # end
         end
         
       elsif attr[0].is_a? Hash
         if attr[0].first[0].is_a? Integer
           attr[0].each do |idx, name|
-            self.keys[idx] = name
-            attr_accessor name
+            self.set_key_pair(idx, name)
+            # self.keys[idx] = name
+            # attr_accessor name
           end
         else
           attr[0].each do |name, idx|
-            self.keys[idx] = name
-            attr_accessor name
+            self.set_key_pair(idx, name)
+            # self.keys[idx] = name
+            # attr_accessor name
           end
         end
 
@@ -65,8 +89,9 @@ module Goodsheet
         attr.each_with_index do |name, idx|
           if name
             name = name.to_s.gsub(" ", "_").to_sym unless name.is_a? Symbol
-            self.keys[idx] = name
-            attr_accessor name        
+            self.set_key_pair(idx, name)
+            # self.keys[idx] = name
+            # attr_accessor name        
           end
         end
       end
@@ -74,13 +99,47 @@ module Goodsheet
     end
 
 
-    def persisted?
-      false
+    def self.set_key_pair(idx, name)
+      self.keys[idx] = name
+      attr_accessor name        
     end
 
+
+    # def persisted?
+    #   false
+    # end
+
     # Get the list of attributes (the columns to import)
-    def self.row_attributes
+    def Row.attributes
       @keys.values
     end
+
+    def attributes
+      self.class.attributes
+    end
+
+    def Row.extend_with(block)
+      class_name = "CustRow_#{(Time.now.to_f*(10**10)).to_i}"
+      Object.const_set class_name, Row.inherit(block)
+    end
+
+    def to_hash
+      Hash[self.class.attributes.map{|a| [a, self.send(a)]}]
+    end
+
+    def to_a
+      self.class.attributes.map{|a| self.send(a)}
+    end
   end
 end
+
+# class Row01 < Goodsheet::Row
+#   column_names :filename => 0, :size => 1
+#   validates :size, :numericality => true
+# end
+
+# r = Row01.new(["pippo", "e"])
+# p r.valid?
+# puts r.class.attributes.inspect
+# puts r.to_hash.inspect
+# puts r.to_a.inspect

data/lib/goodsheet/spreadsheet.rb

@@ -110,23 +110,15 @@ module Goodsheet
     # @yield Column settings and validation rules
     # @return [ValidationErrors] Validation errors
     def validate(options={}, &block)
-      skip = options[:skip] || @s_opts[index][:skip]
-      header_row = options[:header_row] || @s_opts[index][:header_row]
-      max_errors = options[:max_errors] || @s_opts[index][:max_errors]
-      row_limit = options[:row_limit] || @s_opts[index][:row_limit]
-      force_nil = options[:force_nil] || @s_opts[index][:force_nil]
-      validation_errors = ValidationErrors.new
-
-      my_class = options[:my_custom_row_class] || build_my_class(block)
-
-      line = @s_opts[index][:skip] # 0-based, from the top
-      @ss.parse[@s_opts[index][:skip]..-1].each do |row| # row is an array of elements
-        validation_errors.add(line, my_class.new(row, force_nil))
-        break if max_errors>0 && validation_errors.size >= max_errors
-        break if row_limit && row_limit>0 && line>=(row_limit+@s_opts[index][:skip]-1)
-        line +=1
+      set_variables(options)
+      errors = ValidationErrors.new(@max_errors)
+      row_class = Row.extend_with(block)
+
+      last_row = @row_limit.zero? ? @ss.last_row : min(@ss.last_row, @row_limit+@skip)
+      (@skip+1).upto(last_row) do |r|
+        break unless errors.add(r, row_class.new(@ss.row(r), @force_nil))
       end
-      validation_errors
+      errors
     end
 
 
@@ -141,24 +133,13 @@ module Goodsheet
     # @yield Column settings and validation rules
     # @return [ReadResult] The result
     def read(options={}, &block)
-      skip = options[:skip] || @s_opts[index][:skip]
-      header_row = options[:header_row] || @s_opts[index][:header_row]
-      max_errors = options[:max_errors] || @s_opts[index][:max_errors]
-      row_limit = options[:row_limit] || @s_opts[index][:row_limit]
-      force_nil = options[:force_nil] || @s_opts[index][:force_nil]
-
-      my_class = build_my_class(block)
-      options[:my_custom_row_class] = my_class
-      read_result = ReadResult.new(validate(options){ block })
-      return read_result if read_result.invalid?
-        
-      line = skip # 0-based, from the top
-      @ss.parse[skip..-1].each do |row| # row is an array of elements
-        my_class.row_attributes.each do |attribute|
-          read_result.add(attribute, my_class.new(row, force_nil))
-        end
-        break if row_limit && row_limit>0 && line>=(row_limit + skip - 1)
-        line +=1
+      set_variables(options)
+      row_class = Row.extend_with(block)
+      read_result = ReadResult.new(row_class.attributes, @max_errors, options[:collector]||:a_arr)
+
+      last_row = @row_limit.zero? ? @ss.last_row : min(@ss.last_row, @row_limit+@skip)
+      (@skip+1).upto(last_row) do |r|
+        break unless read_result.add(r, row_class.new(@ss.row(r), @force_nil))
       end
       read_result
     end   
@@ -166,9 +147,14 @@ module Goodsheet
 
     private
 
-    def build_my_class(block)
-      n = get_custom_row_class_name
-      Object.const_set n, Row.inherit(block)
+
+
+    def set_variables(options)
+      @skip = options[:skip] || @s_opts[index][:skip]
+      @header_row = options[:header_row] || @s_opts[index][:header_row]
+      @max_errors = options[:max_errors] || @s_opts[index][:max_errors]
+      @row_limit = options[:row_limit] || @s_opts[index][:row_limit] || 0
+      @force_nil = options[:force_nil] || @s_opts[index][:force_nil]
     end
 
     def select_sheet_options(idx)
@@ -189,9 +175,6 @@ module Goodsheet
       end
     end
 
-    def get_custom_row_class_name
-      "CustRow_#{(Time.now.to_f*(10**10)).to_i}"
-    end
 
     def set_sheet_options(idx, options)
       i = idx.is_a?(Integer) ? idx : @ss.sheets.index(idx)
@@ -203,6 +186,10 @@ module Goodsheet
         :force_nil => options[:force_nil] || @s_opts[i][:force_nil] || nil
       }
     end
+
+    def min(a,b)
+      a<b ? a : b
+    end
   end
 end
 

data/lib/goodsheet/validation_error.rb

@@ -1,14 +1,14 @@
 module Goodsheet
 
   class ValidationError
+    
     def initialize(line, val_err)
       @line = line
-      @val_err = val_err
+      @val_err = val_err.full_messages.join(', ')
     end
     
     def to_s
-      # "Row #{@line} is invalid for the following reason(s): #{@val_err.full_messages.join(', ')}"
-      "Row #{@line} is invalid: #{@val_err.full_messages.join(', ')}"
+      "Row #{@line} is not valid: #{@val_err}"
     end
   end
 end

data/lib/goodsheet/validation_errors.rb

@@ -1,40 +1,18 @@
 module Goodsheet
 
-  class ValidationErrors
-    attr_reader :array
+  class ValidationErrors < Array
 
-    def initialize
-      @array = []
+    def initialize(limit=0)
+      @max_size = (limit==0 || limit.nil?) ? Float::INFINITY : limit
     end
 
+    # Add a potential error (will be added only if the row is not valid)
+    #
+    # @param line_number [Fixnum] Line number (0-based). 
+    # @return [boolean] Return false if the limit has been reached, true otherwise.
     def add(line_number, row)
-      @array << ValidationError.new(line_number+1, row.errors) if row.invalid?
-    end
-
-    def empty?
-      @array.empty?
-    end
-
-    def size
-      @array.size
-    end
-
-    def to_s
-      @array.to_s
-    end
-
-    def [](i)
-      @array[i]
-    end
-    
-    def to_a
-      @array
-    end
-
-    def each(&block)
-      @array.each do |i|
-        yield(i)
-      end
+      self << ValidationError.new(line_number+1, row.errors) if row.invalid?
+      self.size < @max_size
     end
 
     def valid?

data/lib/goodsheet/version.rb

@@ -1,3 +1,3 @@
 module Goodsheet
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/notes.txt

@@ -66,3 +66,16 @@ values = @ss.read(:force_nil => 0.0, :skip => 6) do |row|
   MyRow.new(:year => row[0])
 end
 
+
+Test a single test file:
+rake test TEST=test/test_defaults.rb
+L3lIrj
+
+
+Tests:
+rake test TEST=test/test_defaults.rb   # OOOKK! committa
+rake test TEST=test/test_enel.rb       # OOOKK!
+rake test TEST=test/test_example_2.rb  # OOOKK!
+rake test TEST=test/test_roo.rb        # OOOKK!
+
+

data/test/test_row.rb

@@ -3,6 +3,7 @@ require 'goodsheet'
 
 class TestRow < Test::Unit::TestCase
 
+  # Test various style of column_names option
   def test_column_names
     assert_raise ArgumentError do
       Goodsheet::Row.column_names
@@ -11,17 +12,18 @@ class TestRow < Test::Unit::TestCase
       Goodsheet::Row.column_names(6)
     end
 
+    result = {0 => :a, 2 => :b, 3 => :c}
     Goodsheet::Row.column_names(:a, nil, :b, :c)
-    assert_equal(Goodsheet::Row.keys, {0 => :a, 2 => :b, 3 => :c})
+    assert_equal(Goodsheet::Row.keys, result)
 
     Goodsheet::Row.column_names([:a, nil, :b, :c])
-    assert_equal(Goodsheet::Row.keys, {0 => :a, 2 => :b, 3 => :c})
+    assert_equal(Goodsheet::Row.keys, result)
 
     Goodsheet::Row.column_names(:a => 0, :b => 2, :c => 3)
-    assert_equal(Goodsheet::Row.keys, {0 => :a, 2 => :b, 3 => :c})
+    assert_equal(Goodsheet::Row.keys, result)
 
     Goodsheet::Row.column_names(0 => :a, 2 => :b, 3 => :c)
-    assert_equal(Goodsheet::Row.keys, {0 => :a, 2 => :b, 3 => :c})
+    assert_equal(Goodsheet::Row.keys, result)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodsheet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Iwan Buetti