fixy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920d1f790730e2a1fab764c52a27a6296c1864b0
-  data.tar.gz: 2d41058beac14b76f575244fce378390ccdb153e
+  metadata.gz: 9262fa93a8633148f73159bacbbcb4d21ed4b408
+  data.tar.gz: 8994b5cd70ce533762cab617358e21f69cf12547
 SHA512:
-  metadata.gz: 3f88596d4ae34bad598b91b943dd7a57015374a1069ed4a06be59084c7409b0e52378a12557eebeaf1a2702c98c6fff38f73f9f7d397c637a7b16e508478d173
-  data.tar.gz: 612e1d75d45282c9a252e6ebadaf3d1c3a6e914e401d9975e13a786f3b21454f7c28d2d5b1080e94376ac725a8e0caebe2958512ebc0f6026f07625e3575364d
+  metadata.gz: ff5b8c0e48810b780fa12ef0eaa2c64c4ca4c7a3a36790808cc31b09d260149e83158eaab624231311e368842b4192d550b1ba176be6fb7e87141faaedaf14d4
+  data.tar.gz: 17ed2f4d5c446805a342181736bcf4e6c1f672b20e8b16b3f184d1c66f6fc4bde028e85ce7e4e439251162ef7931c5f907908799d31fc49c5054061f34a363d6

data/.gitignore

@@ -16,4 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-/pmip
+/pmip
+.ruby-version
+

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.3
+
+* Allow passing block to field to define field_value
+* Update handling of multi-byte characters
+
 ## v0.0.2
 
 * Fixed typos in README
@@ -6,4 +11,4 @@
 
 ## v0.0.1
 
-* Initial release
+* Initial release

data/lib/fixy/formatter/alphanumeric.rb

@@ -9,15 +9,22 @@ module Fixy
       # left-justified and filled with spaces.
       #
 
-      def format_alphanumeric(input, bytes)
-        input_string = String.new(input.to_s)
-        truncated_bytesize = [input_string.bytesize, bytes].min
-        if truncated_bytesize < bytes
-          input_string << " " * (bytes - truncated_bytesize)
-          input_string
+      def format_alphanumeric(input, byte_width)
+        result = ''
+
+        if input.bytesize <= byte_width
+          result = input.dup
         else
-          input_string.byteslice(0..(truncated_bytesize - 1))
+          input.each_char do |char|
+            if result.bytesize + char.bytesize <= byte_width
+              result << char
+            else
+              break
+            end
+          end
         end
+
+        result << " " * (byte_width - result.bytesize)
       end
     end
   end

data/lib/fixy/record.rb

@@ -32,6 +32,8 @@ module Fixy
 
         # We're good to go :)
         @record_fields[range_from] = { name: name, from: range_from, to: range_to, size: size, type: type}
+
+        field_value(name, Proc.new) if block_given?
       end
 
       # Convenience method for creating field methods

data/lib/fixy/version.rb

@@ -1,3 +1,3 @@
 module Fixy
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end

data/spec/fixy/record_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe 'Defining a Record' do
@@ -56,24 +57,47 @@ end
 
 describe 'Generating a Record' do
   context 'when properly defined' do
-    it 'should generate fixed width record' do
-      class PersonRecordE < Fixy::Record
-        include Fixy::Formatter::Alphanumeric
+    class PersonRecordE < Fixy::Record
+      include Fixy::Formatter::Alphanumeric
 
-        set_record_length 20
+      set_record_length 20
 
-        field :first_name, 10, '1-10' , :alphanumeric
-        field :last_name , 10, '11-20', :alphanumeric
+      field :first_name, 10, '1-10' , :alphanumeric
+      field :last_name , 10, '11-20', :alphanumeric
 
-        field_value :first_name, -> { 'Sarah' }
+      field_value :first_name, -> { 'Sarah' }
 
-        def last_name
-          'Kerrigan'
-        end
+      def last_name
+        'Kerrigan'
       end
+    end
 
+    it 'should generate fixed width record' do
       PersonRecordE.new.generate.should eq "Sarah     Kerrigan  \n"
-      PersonRecordE.new.generate(true).should eq File.read('spec/fixtures/debug_record.txt')
+    end
+
+    context 'when using the debug flag' do
+      it 'should produce a debug log' do
+        PersonRecordE.new.generate(true).should eq File.read('spec/fixtures/debug_record.txt')
+      end
+    end
+  end
+
+  context 'when dealing with multi-byte characters' do
+    it 'should generate fixed width record' do
+      class PersonRecordMultibyte < Fixy::Record
+        include Fixy::Formatter::Alphanumeric
+
+        set_record_length 9
+
+        field :name, 9, '1-9' , :alphanumeric
+
+        field_value :name, -> { "12345678И" }
+      end
+
+      value = PersonRecordMultibyte.new.generate
+      value.should be_valid_encoding
+      value.should == "12345678 \n"
     end
   end
 
@@ -132,4 +156,16 @@ describe 'Generating a Record' do
       end
     end
   end
-end
+
+  context 'when a block is passed to field' do
+    class PersonRecordJ < Fixy::Record
+      include Fixy::Formatter::Alphanumeric
+      set_record_length 20
+      field(:description , 20, '1-20', :alphanumeric) { 'Use My Value' }
+    end
+
+    it 'uses the proc conversion as the field value' do
+      PersonRecordJ.new.generate.should eq('Use My Value'.ljust(20) << "\n")
+    end
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fixy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Omar Skalli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Library for generating fixed width flat files.
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -88,12 +88,12 @@ 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: []