efo_nelfo 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f9ae41470f7ec5868f8fd94fd888c0d4169b41
-  data.tar.gz: 14d7f5c2ea9b10a8125b3e89aad2b08d92794041
+  metadata.gz: 339fc7d74621d26713c98008d2060452753e3998
+  data.tar.gz: 0020dbe4e5129c8890165cf01bae901bcd1373ee
 SHA512:
-  metadata.gz: 2c9aa39390094e1565b171f2fb8a42367fe7eec2233e390a75b3804f76e5d0949333e4e43a31ad70347ae19f3b581bbdf7797ea3c8174f7c835da9b41ff1921d
-  data.tar.gz: 083a82ef15c19943d31594efe997c6e68b07e48e066570d94ed136baefca287485eda6a91041eac4b6540c5936b24084af7058c01ddb15630416e86ffa6e675e
+  metadata.gz: 058e13eeccaaf4657c8f58711c3d278ef5190afb1a96b470ed3e38df8242e1b80ddc9ef8482be084012f2e758e1bf27e8270d044808e7c1761cb5b0de20ed873
+  data.tar.gz: 2a755cf54f5d2481297513748eb14a944412364ecc2274ff4be40a75b2ed564fa522baff9753045fc27b1f566a7a5265c02e0b65819671796919b9c699579d09

data/lib/efo_nelfo/property.rb

@@ -44,14 +44,17 @@ module EfoNelfo
       end
     end
 
+    # Format value for given attribute
     def formatted_for_csv(attr)
+
       if respond_to?("format_#{attr}")
         value = send "format_#{attr}"
       else
         value = send attr
 
         type  = properties[attr][:type]
-        case type
+
+        value = case type
         when :date
           value ? value.strftime("%Y%m%d") : nil
         when :boolean
@@ -60,6 +63,7 @@ module EfoNelfo
           value
         end
       end
+      value.respond_to?(:encode) ? value.encode(Encoding::ISO_8859_1) : value
     end
 
     module ClassMethods
@@ -106,8 +110,7 @@ module EfoNelfo
       # Creates an attribute setter for name
       def create_setter_for(name, options)
         define_method "#{name}=" do |value|
-          encoded_value = value.respond_to?(:encode) ? value.encode(Encoding::ISO_8859_1) : value
-          attributes[name] = format_value(encoded_value, options[:type])
+          attributes[name] = format_value(value, options[:type])
         end
       end
 

data/lib/efo_nelfo/reader/csv.rb

@@ -8,7 +8,6 @@ module EfoNelfo
         col_sep: ';',
         headers: false,
         row_sep: "\r\n",
-        encoding: "iso-8859-1",
         quote_char: "\x00",
         force_quotes: false,
         skip_blanks: true
@@ -18,7 +17,7 @@ module EfoNelfo
 
       def initialize(options)
         if options[:filename]
-          @data = File.read(options[:filename], encoding: CSV_OPTIONS[:encoding])
+          @data = File.read(options[:filename], encoding: Encoding::ISO_8859_1)
         else
           @data = options[:data]
         end

data/lib/efo_nelfo/version.rb

@@ -1,3 +1,3 @@
 module EfoNelfo
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/property_spec.rb

@@ -30,9 +30,9 @@ describe EfoNelfo::Property do
     obj.foo.must_equal 'Test'
   end
 
-  it "converts encoding to ISO-8859-1" do
+  it "won't do any encoding conversions" do
     obj.foo = 'Sjøhest'
-    obj.foo.encoding.name.must_equal 'ISO-8859-1'
+    obj.foo.encoding.name.must_equal 'UTF-8'
   end
 
   it "adds an alias getter and setter for foo" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efo_nelfo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Gudleik Rasch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,4 +170,3 @@ test_files:
 - spec/samples/B650517.032.csv
 - spec/samples/V4_varefil.csv
 - spec/spec_helper.rb
-has_rdoc: