efo_nelfo 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987087ce328532ef45bd6b3cb8f037b654b5d54a
-  data.tar.gz: 68e4084d01fcbc30ec678b812a7b1d372d333bd6
+  metadata.gz: fd81f9243df3f59ad32b14865d2da1e63c37d0e4
+  data.tar.gz: dd5f165f594e2dfcdbaef5fb7b458be314e11972
 SHA512:
-  metadata.gz: ce3f9f28374eb3c9f45efa5323e8380442c1eee93bd8480d06a5b9d207a30545cc048d0db26b56853bc374b408867c0e9ca31086519a699ef03092631d57ef53
-  data.tar.gz: a61783e854102ca0ac932ea442fe964a75f1373893a38a1e75399c98c9b770783d5155e2e172597334385ff020a45c8aa5e9d27b462206232fc51f5847f5319b
+  metadata.gz: 288548f3e56f2726b62e50f5a285831f486c90f778605f237b4ad17b2904169d00163c488d202db5ddca3caceb63a8cf971a9b4d90afc72df30f3482cb588a62
+  data.tar.gz: 51d44365d5bcbadf58235ba70e3b8614ea518d6d650c8cdfb672b9e7145eb4d1dbad3cc90cc06c6006b6362cb1587e1daab36addab0957537e71f5f3e6a69c77

data/README.md

@@ -1,5 +1,8 @@
 # EfoNelfo
 
+[![Codeship Status for rorkjop/efonelfo](https://codeship.com/projects/2f24e110-26db-0133-3264-3e76e843c90e/status?branch=master)](https://codeship.com/projects/97199)
+[![Code Climate](https://codeclimate.com/github/rorkjop/efonelfo/badges/gpa.svg)](https://codeclimate.com/github/rorkjop/efonelfo)
+
 Gem for parsing and writing EfoNelfo documents.
 
 Supported EfoNelfo versions:
@@ -17,7 +20,7 @@ Supported formats:
 Importing a CSV file:
 
     # EfoNelfo.load "B12345678.332.csv"          # => EfoNelfo::V40::VH
-    
+
 Parsing CSV:
 
     # EfoNelfo.parse "VH;EFONELFO;4.0;foo;bar"   # => EfoNelfo::V40::VH
@@ -25,8 +28,9 @@ Parsing CSV:
 Exporting CSV:
 
     # order = EfoNelfo::V40::VH.new
-    # order.add EfoNelfo::V40::VL.new item_number: '442', order_number: 'abc'
+    # order.add EfoNelfo::V40::VL.new name: 'Something', price: 10
     # order.to_csv
+    # => "VH;EFONELFO;4.0;;;;;;;;;;;;;;\r\nVL;;;Something;;;;;10;;;;;;;;;;;\r\n"
 
 
 ## TODO

data/efo_nelfo.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "rb-fsevent"
   spec.add_development_dependency "terminal-notifier"
   spec.add_development_dependency "terminal-notifier-guard"
-  spec.add_development_dependency "turn"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/efo_nelfo.rb

@@ -23,6 +23,14 @@ module EfoNelfo
 
   class << self
 
+    def strict_mode?
+      @strict_mode || false
+    end
+
+    def strict_mode=(mode)
+      @strict_mode = mode
+    end
+
     def load(filename)
       Reader::CSV.new(filename: filename).parse
     end

data/lib/efo_nelfo/properties.rb

@@ -27,7 +27,7 @@ module EfoNelfo
 
     # Returns all property values as array formatted for csv
     def to_a
-      properties.values.map &:to_csv
+      properties.values.map(&:to_csv)
     end
 
     private

data/lib/efo_nelfo/property.rb

@@ -43,17 +43,7 @@ module EfoNelfo
     #   (string)  value = 'foo'       # => 'foo'
     def value=(new_value)
       return nil if readonly?
-
-      @value = case
-        when boolean?
-          new_value.nil? || new_value == true || new_value == 'J' || new_value == 'j' || new_value == '' ? true : false
-        when date?
-          new_value.is_a?(Date) ? new_value : Date.parse(new_value) rescue nil
-        when integer?
-          new_value.nil? && !required? ? nil : new_value.to_i
-        else
-          new_value
-      end
+      @value = send("sanitize_#{options[:type]}", new_value)
     end
 
     # returns formatted value suitable for csv output
@@ -91,6 +81,34 @@ module EfoNelfo
       options.has_key?(args.first) ? options[args.first] : super
     end
 
+    private
+
+    def sanitize_integer(value)
+      value.nil? && !required? ? nil : value.to_i
+    end
+
+    def sanitize_boolean(value)
+      value.nil? || value == true || value == 'J' || value == 'j' || value == '' ? true : false
+    end
+
+    def sanitize_date(value)
+      value.is_a?(Date) ? value : Date.parse(value) rescue nil
+    end
+
+    def sanitize_string(value)
+      return nil if value.nil?
+      return value unless value.is_a?(String)
+
+      string = value.to_s
+
+      if EfoNelfo.strict_mode? && (options[:limit] && string.length > options[:limit])
+        raise ArgumentError.new("Value exceeds limit")
+      else
+        string.slice(0, options[:limit])
+      end
+
+    end
+
   end
 
 end

data/lib/efo_nelfo/v40/bh.rb

@@ -56,17 +56,6 @@ module EfoNelfo
 
       has_many :lines, post_type: "BL"
 
-      # def add(post_type)
-      #   case
-      #   when post_type.is_a?(BL)
-      #     add_order_line(post_type)
-      #   when post_type.is_a?(BT)
-      #     add_text_to_order_line(post_type)
-      #   when post_type.is_a?(Hash)
-      #     add_order_line(EfoNelfo::V40::BL.new(post_type))
-      #   end
-      # end
-
       private
 
       # Appends a order line to the order

data/lib/efo_nelfo/v40/bl.rb

@@ -20,10 +20,6 @@ module EfoNelfo
 
       has_many :text, post_type: "BT"
 
-      def format_item_count
-        item_count ? item_count * 100 : nil
-      end
-
     end
 
   end

data/lib/efo_nelfo/version.rb

@@ -1,3 +1,3 @@
 module EfoNelfo
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/collection_spec.rb

@@ -39,17 +39,17 @@ describe EfoNelfo::Collection do
   describe "<<" do
 
     describe "passing a hash" do
-      let(:hash) {
+      let(:a_hash) {
         { post_type: "BT", version: "2.1", whatever: 'blah' }
       }
 
       it "accepts a valid hash" do
-        array << hash
+        array << a_hash
         array.size.must_equal 1
       end
 
       it "converts the hash into a post type" do
-        array << hash
+        array << a_hash
         array[0].must_be_instance_of EfoNelfo::V21::BT
         array[0].whatever.must_equal 'blah'
       end

data/spec/csv_writer_spec.rb

@@ -26,11 +26,11 @@ describe EfoNelfo::V40::BH do
     end
 
     it "includes standard fields" do
-      csv.must_match /;EFONELFO;/
-      csv.must_match /;4.0;/
-      csv.must_match /;123;/
-      csv.must_match /;456;/
-      csv.must_match /;J;/              # for fixing sublime syntax highlighting: /
+      csv.must_match(/;EFONELFO;/)
+      csv.must_match(/;4.0;/)
+      csv.must_match(/;123;/)
+      csv.must_match(/;456;/)
+      csv.must_match(/;J;/)
     end
 
     it "can be parsed" do
@@ -41,11 +41,11 @@ describe EfoNelfo::V40::BH do
 
     it "adds order lines" do
       order.add EfoNelfo::V40::BL.new(order_number: 'foo', item_name: 'Ware')
-      csv.must_match /Ware/
+      csv.must_match(/Ware/)
     end
 
     it "adds text to order line" do
-      csv.must_match /BT;haha/
+      csv.must_match(/BT;haha/)
     end
 
   end

data/spec/efo_nelfo_spec.rb

@@ -25,7 +25,7 @@ describe EfoNelfo do
   describe "assign via hash" do
     let(:json) {
       { customer_id: "123",
-        order_number: "abc-123-efg",
+        order_number: "abc-123-ef",
         seller_warehouse: "Somewhere",
         label: "Some label",
         lines: [
@@ -43,7 +43,7 @@ describe EfoNelfo do
     end
 
     it "assigns attributes" do
-      order.order_number.must_equal "abc-123-efg"
+      order.order_number.must_equal "abc-123-ef"
       order.seller_warehouse.must_equal "Somewhere"
     end
 

data/spec/parsing/bh_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "parsing a BH.csv file" do
 
   it "uses the correct version" do
-    lambda { EfoNelfo.load(csv('B123.v3.csv')) }.must_raise EfoNelfo::UnsupportedPostType
+    lambda { EfoNelfo.load(csv('B123.V3.csv')) }.must_raise EfoNelfo::UnsupportedPostType
   end
 
   it "parses the file and returns an Order" do

data/spec/parsing/vh_spec.rb

@@ -10,7 +10,7 @@ describe "parsing a VH.csv file" do
     nelfo.format.must_equal "EFONELFO"
     nelfo.version.must_equal "4.0"
     nelfo.post_type.must_equal "VH"
-    nelfo.SelgersId.must_equal "NO1234567879MVA"
+    nelfo.SelgersId.must_equal "NO123456787MVA"
     nelfo.KjøpersId.must_be_nil
     nelfo.KundeNr.must_be_nil
     nelfo.from_date.must_equal Date.new(2004, 1, 22)

data/spec/post_type_spec.rb

@@ -38,12 +38,12 @@ describe EfoNelfo::PostType do
     it "converts the posttype to csv" do
       pt = EfoNelfo::V21::AB.new seller_id: '123'
       pt.lines << EfoNelfo::V21::XY.new(order_number: '41')
-      pt.to_csv.must_match /AB;21;123.+XY;41/m
+      pt.to_csv.must_match(/AB;21;123.+XY;41/m)
     end
   end
 
   describe ".from" do
-    let(:hash) {
+    let(:a_hash) {
       {
         post_type: "AB",
         version: "2.1",
@@ -54,7 +54,7 @@ describe EfoNelfo::PostType do
       }
     }
 
-    let(:pt) { EfoNelfo::PostType.from hash }
+    let(:pt) { EfoNelfo::PostType.from a_hash }
 
     it "converts the hash into a valid posttype" do
       pt.must_be_instance_of EfoNelfo::V21::AB

data/spec/properties_spec.rb

@@ -39,8 +39,37 @@ describe EfoNelfo::Properties do
   end
 
   it "adds a setter method for :foo" do
-    obj.foo = 'Test'
-    obj.foo.must_equal 'Test'
+    obj.foo = 'abc'
+    obj.foo.must_equal 'abc'
+  end
+
+  it "cuts off strings longer than the limit" do
+    obj.foo = "Long string"
+    obj.foo.must_equal "Lon"
+  end
+
+  it "won't cut off strings" do
+    # bar has no limit specified, uses defaults
+    obj.bar = "hahaha"
+    obj.bar.must_equal "hahaha"
+
+    # numbers are ignored, even if specified type is string
+    obj.bar = 123
+    obj.bar.must_equal 123
+
+    obj.foo = 123456
+    obj.foo.must_equal 123456
+
+    obj.foo = "123456"
+    obj.foo.must_equal "123"
+  end
+
+  it "raises exception if string is longer than limit and strict_mode is enabled" do
+    EfoNelfo.strict_mode = true
+    lambda {
+      obj.foo = "Long"
+    }.must_raise ArgumentError
+    EfoNelfo.strict_mode = false
   end
 
   it "adds a question method for boolean types" do
@@ -55,11 +84,11 @@ describe EfoNelfo::Properties do
   end
 
   it "adds an alias getter and setter for foo" do
-    obj.foo = 'Test'
-    obj.Føbar.must_equal 'Test'
-    obj.Føbar = 'Hacked'
-    obj.Føbar.must_equal 'Hacked'
-    obj.foo.must_equal 'Hacked'
+    obj.foo = 'ABC'
+    obj.Føbar.must_equal 'ABC'
+    obj.Føbar = 'CDE'
+    obj.Føbar.must_equal 'CDE'
+    obj.foo.must_equal 'CDE'
   end
 
   it "assigns default values" do

data/spec/samples/varefil_eksempel.csv

@@ -1,4 +1,4 @@
-VH;EFONELFO;4.0;NO1234567879MVA;;;20040122;;NOK;;ONNINEN A/S;P.B. 70;;1483;SKYTTA;NO;;
+VH;EFONELFO;4.0;NO123456787MVA;;;20040122;;NOK;;ONNINEN A/S;P.B. 70;;1483;SKYTTA;NO;;
 VL;1;1006100;MATTE 3MM 100W/M2  100W;1,0 m2 0,5 x 2,0 m;1;EA;STYKK;55300;10000;20110901;1;;1004;;;J;10000;0;
 VA;1;;P;5000000;;;;;;;;;;;;;
 VA;1;1016099;A;;;;;;;;;;;;;;

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
-require 'efo_nelfo'
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
-require 'turn/autorun'
+require 'efo_nelfo'
+require 'minitest/autorun'
 require 'minitest/spec'
-require 'minitest/pride'
+require 'minitest/reporters'
 require 'awesome_print'
 
-Turn.config do |c|
-  c.format = :progress
-  c.natural = true
-  c.loadpath = %w(lib spec)
-end
+Minitest::Reporters.use!(
+  Minitest::Reporters::SpecReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)
 
 # helper method that returns full path to csv files
 def csv(filename)
@@ -23,7 +25,7 @@ class MiniTest::Spec
       let(:inner_subject) { subject.send(attribute) }
 
       it "verify subject.#{attribute} for" do
-        inner_subject.instance_eval &block
+        inner_subject.instance_eval(&block)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efo_nelfo
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Gudleik Rasch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="