anixe_csv 0.0.1 → 0.3.0

data/lib/anixe_csv.rb

@@ -1,3 +1 @@
-module AnixeCsv
-  # Your code goes here...
-end
+require 'anixe_csv/formatter'

data/lib/anixe_csv/formatter.rb

@@ -59,25 +59,31 @@ module AnixeCsv
 			def create_accessor(name)
 				self.module_eval <<-end_eval
 					def #{name}
-						fields[:#{name}].value
+            data[:#{name}]
 					end
+          def #{name}!
+            fields[:#{name}].to_s(data[:#{name}])
+          end
 					def #{name}= (value)
-						fields[:#{name}].value = value
+            data[:#{name}] = value
 					end
 					end_eval
 			end
 		end
 
 		module InstanceMethods  # visible in the including class
-
 			# returns the value of the field by name or index
 			def [](arg)
-				return self.send(arg) if arg.kind_of? String
-				return fields.values[arg.to_i] if arg.kind_of? Fixnum
+				return data[arg.to_sym] if arg.kind_of? String
+				return data.values[arg.to_i] if arg.kind_of? Fixnum
 
 				nil
 			end
 
+      def []=(key, value)
+        data[key.to_sym] = value
+      end
+
 			# Reset all fields to nil or their default value
 			def clear!
 				set_field_values([])
@@ -93,86 +99,100 @@ module AnixeCsv
 			end
 
 			alias kernel_to_s to_s # candy - otherwise formatting definition in field blocks would be called e.g. in irb
-			def inspect
-				to_hash
-			end
-
-			def to_hash
-				ary = fields.values.collect {|field| [field.name, field.value]}
-				Hash[ary]
-			end
-
-			# outputs all fields in one line and formats each field with a block if given
-			def to_s
-				values = fields.values.collect do |field|
-					value = field.to_s.to_s
-					value = value.tr(*singleton.get_escape)
-					validate_field(field, value) if validate?
-
-					value
-				end
-
-				singleton.rules.each do |rule|
-					rule.call(self)
-				end
-
-				values.join(delimiter)
-			end
-
-			def validate?
-				@validate
-			end
-
-			def validate=(value=true)
-				@validate = value
-			end
-
-			def values=(ary)
-				set_field_values(ary)
-			end
-
-			def values
-				fields.values.collect(&:value)
-			end
-		end
-
-		private
-		def singleton
-			self.class
-		end
-
-		def validate_field(field, value)
-			raise RegexpError, "Field '#{field.name}' contains an invalid value '#{value}' it should match #{field.regexp}" if  field.regexp && value !~ field.regexp
-		end
-
-		# assign all the fields their values from an array, if nil is passed the default value is used
-		def set_field_values(array)
-			fields.values.each_index do |idx|
-				value = array[idx]
-				field = fields.values[idx]
-				value = field.default if value.nil?
-				field.value = value
-			end
-		end
 
-		class Field
-			attr_accessor :name, :value, :block, :default, :regexp
+      def data
+        @data ||= set_field_values([])
+      end
 
-			def initialize(*args)
-				@name = args[0]
-				@value = @default = args[1] unless args[1].nil?
-			end
+      alias_method :to_hash, :data
+      alias_method :inspect, :data
 
-			def to_s
-				unless block.nil?
-					block.call(self.value, self)
-				else
-					value
-				end
-			end
-		end
-
-		class RuleError < StandardError
-		end
-	end
+			# outputs all fields in one line and formats each field with a block if given
+      def to_s
+        values = fields.values.collect do |field|
+          value = field.to_s(data[field.name]).to_s
+          value = value.tr(*singleton.get_escape)
+          validate_field(field, value) if validate?
+
+          value
+        end
+
+        singleton.rules.each do |rule|
+          rule.call(self)
+        end
+
+        values.join(delimiter)
+      end
+
+      def validate?
+        @validate
+      end
+
+      def validate=(value=true)
+        @validate = value
+      end
+
+      def values=(ary)
+        set_field_values(ary)
+      end
+
+      def values
+        data.values
+      end
+    end
+
+    private
+    def singleton
+      self.class
+    end
+
+    def validate_field(field, value)
+      raise RegexpError, "Field '#{field.name}' contains an invalid value '#{value}' it should match #{field.regexp}" if  field.regexp && value !~ field.regexp
+    end
+
+    # assign all the fields their values from an array, if nil is passed the default value is used
+    def set_field_values(array)
+      @data = {}
+      fields.values.each_index do |idx|
+        value = array[idx]
+        field = fields.values[idx]
+        value = field.default if value.nil?
+        @data[field.name] = value
+      end
+      @data
+    end
+
+    class Field
+      attr_accessor :name, :block, :default, :regexp
+
+      def value
+        raise "The use of value is deprecated, use the instance methods instead"
+      end
+
+      def initialize(*args)
+        @name = args[0]
+        @default = args[1] unless args[1].nil?
+        @opts = args[2] || {}
+      end
+
+      def to_s(s=nil)
+        return prepare_value(s) if @opts.empty?
+
+        pad = @opts[:pad] || ' '
+        return prepare_value(s).ljust(@opts[:ljust], pad) if @opts[:ljust]
+        return prepare_value(s).rjust(@opts[:rjust], pad) if @opts[:rjust]
+      end
+
+      def prepare_value(s)
+        unless block.nil?
+          block.call(s, self)
+        else
+          s
+        end
+      end
+    end
+
+    class RuleError < StandardError
+    end
+  end
 end

data/lib/anixe_csv/version.rb

@@ -1,3 +1,3 @@
 module AnixeCsv
-  VERSION = "0.0.1"
+  VERSION = "0.3.0"
 end

data/test/formatter_index_assignment_test.rb

@@ -0,0 +1,14 @@
+require 'test_config'
+require 'anixe_csv/formatter'
+
+context  'Formatter should allow to assign values by index operator' do
+  class IndexAssignmentTest
+    include AnixeCsv::Formatter
+    field :one
+  end
+
+  setup { IndexAssignmentTest.new }
+
+  should('assign with symbol') { topic[:one] = 1; topic.one }.equals 1
+  should('assign with string') { topic['one'] = 2; topic.one }.equals 2
+end

data/test/formatter_len_test.rb

@@ -0,0 +1,27 @@
+require 'test_config'
+require 'anixe_csv/formatter'
+
+context  'Formatter - lest and right justification' do
+  DEFAULT_TWO = "DefaultTwo"
+  VALUES = [1, nil, 3, 4, ';', nil]
+
+  class CsvWriterLenTest
+    include AnixeCsv::Formatter
+
+    delimiter ''                                           # field delimiter
+    escape ";&", "_"                                        # escapes characters using string.tr
+
+    field :one, '.', :ljust => 5
+    field :two, '.', :rjust => 5
+    field :three, '.', :ljust => 5, :pad => '0'
+    field :four, '.', :rjust => 5, :pad => '0'
+
+  end
+
+  setup { CsvWriterLenTest.new }
+  should('left justify') { topic.one! == '.    ' }
+  should('right justify') { topic.two! == '    .' }
+  should('left justify with a padding string: ') { topic.three! }.equals '.0000'
+  should('right justify with a padding string: ') { topic.four! }.equals '0000.'
+  should('format the whole thing correctly: ') { topic.to_s }.equals '.        ..00000000.'
+end

data/test/formatter_multi_instance_test.rb

@@ -0,0 +1,22 @@
+require 'test_config'
+require 'anixe_csv/formatter'
+
+context  'Formatter should return different values for two instances' do
+  class MultiInstanceFormatter
+    include AnixeCsv::Formatter
+    field :one
+    field :two, '--'
+  end
+
+  setup {
+    instances = [MultiInstanceFormatter.new, MultiInstanceFormatter.new]
+    instances[0].one = "01"
+    instances[1].one = "11"
+    instances
+  }
+
+  should('01 = 01') { topic[0].one }.equals('01')
+  should('11 = 11') { topic[1].one }.equals('11')
+  should('first.to_s') { topic[0].to_s }.equals('01,--')
+  should('second.to_s') { topic[1].to_s }.equals('11,--')
+end

data/test/formatter_test.rb

@@ -51,7 +51,7 @@ context  'Formatter' do
     asserts(:to_s).equals("one;DefaultTwo;3;4k;_;;bread _ butter")
     asserts(:to_hash).equals({:one => 1, :two => DEFAULT_TWO, :three => 3, :four => 4, :five => ";", :six => nil, :seven => "bread & butter"})
 	end
-		
+
   context "#clear!" do
     setup do
       CsvWriterTest.new.tap do |writer|
@@ -63,4 +63,5 @@ context  'Formatter' do
 		asserts(:values).equals([nil, DEFAULT_TWO, nil, nil, nil, nil, nil])
 		asserts(:to_s).raises(RegexpError)
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: anixe_csv
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Piotr Zolnierek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,9 @@ files:
 - lib/anixe_csv/reader.rb
 - lib/anixe_csv/row.rb
 - lib/anixe_csv/version.rb
+- test/formatter_index_assignment_test.rb
+- test/formatter_len_test.rb
+- test/formatter_multi_instance_test.rb
 - test/formatter_rule_test.rb
 - test/formatter_test.rb
 - test/gzip_reader_test.rb
@@ -67,11 +70,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: anixe_csv
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Read and write Csv files, easily
 test_files: 
+- test/formatter_index_assignment_test.rb
+- test/formatter_len_test.rb
+- test/formatter_multi_instance_test.rb
 - test/formatter_rule_test.rb
 - test/formatter_test.rb
 - test/gzip_reader_test.rb