efo_nelfo 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cdaf33e1a391067ac19395f549997d497faa45
-  data.tar.gz: 247909b6de770da10400d1ba2ff6ac8ad16b2a2e
+  metadata.gz: 894a44091085c1483965076057f66f3d3a8ed7fe
+  data.tar.gz: 1d26149077017f057cb31df8c8029c7ee226cd26
 SHA512:
-  metadata.gz: d3dbe7d16a9b78ee13b12a6ee47657481376a9bc73017f1d83caa11e22759f6f3e838d9b0878f7615ecd10b9cfe58af7355716863d215a53cdfbe247b82890a4
-  data.tar.gz: 035aaa3183fd806377ccc9ca7bcabb6a6e5fbd0f174d5625ef831ae89fb0e9054b78a5af7c55c58282bf5ff3f41c0d8bdc003bd3432a58d958eb2988f5ad3e2a
+  metadata.gz: dacd19af0a3f6ef369a723820d03c7787ff2989f946e89e3ece4900c97818fd8fa0c485c94b476e92ab3757ebf8d594d2b7c1590de4e4a84249cbb0344129848
+  data.tar.gz: 70e158b44c968e0f2056adfbccf27b1e8e8d6338dc6d1f99e9b9e462a55469ad634a23407896f4f674768e0d65ad9a9f87e72df2d748654f5b8ef16db183566a

data/README.md

@@ -16,7 +16,11 @@ Supported formats:
 
 Importing a CSV file:
 
-    # EfoNelfo.parse_csv "B12345678.332.csv"    # => EfoNelfo::V40::Order
+    # EfoNelfo.load "B12345678.332.csv"          # => EfoNelfo::V40::VH
+    
+Parsing CSV:
+
+    # EfoNelfo.parse "VH;EFONELFO;4.0;foo;bar"   # => EfoNelfo::V40::VH
 
 Exporting CSV:
 

data/Rakefile

@@ -3,6 +3,6 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << 'spec'
-  t.test_files = FileList['spec/*_spec.rb']
+  t.test_files = FileList['spec/**/*_spec.rb']
   t.verbose = false
 end

data/lib/efo_nelfo/property.rb

@@ -50,7 +50,7 @@ module EfoNelfo
         when date?
           new_value.is_a?(Date) ? new_value : Date.parse(new_value) rescue nil
         when integer?
-          new_value.nil? ? nil : new_value.to_i
+          new_value.nil? && !required? ? nil : new_value.to_i
         else
           new_value
       end
@@ -73,13 +73,13 @@ module EfoNelfo
 
     # Returns true if the property is read only
     def readonly?
-      options[:read_only]
+      options[:read_only] == true
     end
 
     # Returns true if the property is required
     # Note: this is not in use yet
     def required?
-      options[:required]
+      options[:required] == true
     end
 
     def boolean?; type == :boolean; end

data/lib/efo_nelfo/property_types.rb

@@ -32,7 +32,7 @@ module EfoNelfo
 
     refine Fixnum do
       def to_csv
-        to_i
+        to_s
       end
     end
 

data/lib/efo_nelfo/v40/va.rb

@@ -6,6 +6,27 @@ module EfoNelfo
       property :product_number, alias: :VareNr,       limit: 14, required: true
       property :type,           alias: :VaType,       limit: 1, required: true
       property :sales_package,  alias: :SalgsPakning, limit: 9, type: :integer
+
+      def nrf_id
+        product_type == 4 && product_number.strip
+      end
+
+      def replacement?
+        type == 'E'
+      end
+
+      def alternative?
+        type == 'A'
+      end
+
+      def alternative_id?
+        type == 'V'
+      end
+
+      def package_size?
+        type == 'P'
+      end
+
     end
   end
 end

data/lib/efo_nelfo/v40/vl.rb

@@ -9,7 +9,7 @@ module EfoNelfo
       property :unit,              alias: :MåleEnhet,     limit: 1,  type: :integer, required: true
       property :price_unit,        alias: :PrisEnhet,     limit: 3,  required: true
       property :price_unit_desc,   alias: :PrisEnhetTxt,  limit: 8
-      property :price,             alias: :Pris,          limit: 10, type: :integer, required: true
+      property :price,             alias: :Pris,          limit: 10, decimals: 2, type: :integer, required: true
       property :amount,            alias: :Mengde,        limit: 9,  type: :integer, required: true
       property :price_date,        alias: :PrisDato,      limit: 8,  type: :date, required: true
       property :status,            alias: :Status,        limit: 1,  type: :integer, required: true
@@ -29,13 +29,29 @@ module EfoNelfo
         product_type == 4 ? product_number : nil
       end
 
+      def gross_price?
+        price_type.nil? || price_type == 'B'
+      end
+
+      def gross_price
+        gross_price? ? properties[:price].to_f : nil
+      end
+
+      def net_price
+        net_price? ? properties[:price].to_f : nil
+      end
+
+      def net_price?
+        price_type == 'N'
+      end
+
       def images
         info.map(&:image).compact
       end
 
       [ :weight, :dimension, :volume, :fdv, :hms ].each do |key|
         define_method key do
-          pick key
+          fetch_from_info key
         end
       end
 
@@ -46,7 +62,7 @@ module EfoNelfo
 
       private
 
-      def pick(method)
+      def fetch_from_info(method)
         vx = info.select(&"#{method}?".to_sym).compact.first
         vx && vx.send(method)
       end

data/lib/efo_nelfo/version.rb

@@ -1,3 +1,3 @@
 module EfoNelfo
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/efo_nelfo_spec.rb

@@ -1,11 +1,6 @@
 # encoding: utf-8
 require 'spec_helper'
 
-# helper method that returns full path to csv files
-def csv(filename)
-  File.expand_path("../samples/#{filename}", __FILE__)
-end
-
 describe EfoNelfo do
 
   describe "properties" do
@@ -72,157 +67,29 @@ describe EfoNelfo do
 
   end
 
-  describe ".parse" do
-
-    it "parses CSV and does the same as .load" do
-      filename = csv('B650517.032.csv')
-      parsed = EfoNelfo.parse File.read(filename)
-      loaded = EfoNelfo.load filename
-      parsed.source.must_equal loaded.source
-    end
-
-  end
-
   describe ".load" do
-
     describe "when passing in invalid file" do
       it "raises an exception" do
         lambda { EfoNelfo.load 'foo' }.must_raise Errno::ENOENT
       end
     end
 
-    describe "passing a Product file" do
-      let(:nelfo) { EfoNelfo.load(csv('varefil_eksempel.csv')) }
-
-      it { nelfo.must_be_instance_of EfoNelfo::V40::VH }
-
-      it "loads the order" do
-        nelfo.format.must_equal "EFONELFO"
-        nelfo.version.must_equal "4.0"
-        nelfo.post_type.must_equal "VH"
-        nelfo.SelgersId.must_equal "NO1234567879MVA"
-        nelfo.KjøpersId.must_be_nil
-        nelfo.KundeNr.must_be_nil
-        nelfo.from_date.must_equal Date.new(2004, 1, 22)
-        nelfo.to_date.must_be_nil
-        nelfo.currency.must_equal "NOK"
-        nelfo.contract_id.must_be_nil
-        nelfo.seller_name.must_equal "ONNINEN A/S"
-        nelfo.seller_address1.must_equal "P.B. 70"
-        nelfo.seller_address2.must_be_nil
-        nelfo.seller_zip.must_equal "1483"
-        nelfo.seller_office.must_equal "SKYTTA"
-        nelfo.seller_country.must_equal "NO"
-      end
-
-      it "adds product lines" do
-        nelfo.lines.count.must_equal 3
-
-        line = nelfo.lines.first
-        line.product_type.must_equal 1
-        line.product_number.must_equal "1006100"
-        line.name.must_equal "MATTE 3MM 100W/M2  100W"
-        line.description.must_equal "1,0 m2 0,5 x 2,0 m"
-        line.unit.must_equal 1
-        line.price_unit.must_equal "EA"
-        line.price_unit_desc.must_equal "STYKK"
-        line.price.must_equal 55300
-        line.amount.must_equal 10000
-        line.price_date.must_equal Date.new(2011,9,1)
-        line.status.must_equal 1
-        line.block_number.must_be_nil
-        line.discount_group.must_equal "1004"
-        line.fabrication.must_be_nil
-        line.type.must_be_nil
-        line.stocked.must_equal true
-        line.stocked?.must_equal true
-        line.sales_package.must_equal 10000
-      end
-
-      it "adds additional information to the product" do
-        line = nelfo.lines.first
-        line.info.first.value.must_equal "http://www.elektroskandia.no/image/products/1221102.gif"
-      end
-    end
-
-    describe "passing a discount file" do
-      let(:nelfo) { EfoNelfo.load csv('rabatt.csv') }
-      it { nelfo.must_be_instance_of EfoNelfo::V40::RH }
-      # RH;EFONELFO;4.0;NO910478656MVA;NO000000000MVA;0;0;20130404;20140404;NOK;H;Alsell Norge AS;Vestre Svanholmen 4;;4313;SANDNES;NO
-      it "assigns attributes" do
-        nelfo.seller_id.must_equal "NO910478656MVA"
-        nelfo.buyer_id.must_equal "NO000000000MVA"
-      end
-
-      it "assigns lines" do
-        nelfo.lines.size.must_equal 4
-        line = nelfo.lines.last
-        line.product_type.must_equal 5
-        line.product_number.must_equal "P10501"
-        line.AvtaltPris.must_be_nil
-      end
-    end
-
-    describe "passing a Order file" do
-
-      it "uses the correct version" do
-        lambda { EfoNelfo.load(csv('B123.v3.csv')) }.must_raise EfoNelfo::UnsupportedPostType
-      end
-
-      it "parses the file and returns an Order" do
-        EfoNelfo.load(csv('B650517.032.csv')).must_be_instance_of EfoNelfo::V40::BH
-      end
-
-      it "the order contains order information" do
-        order = EfoNelfo.load(csv('B650517.032.csv'))
-        order.post_type.must_equal 'BH'
-        order.format.must_equal 'EFONELFO'
-        order.version.must_equal '4.0'
-      end
-
-      it "the order contains orderlines" do
-        order = EfoNelfo.load(csv('B650517.032.csv'))
-
-        line = order.lines.first
-        line.must_be_instance_of EfoNelfo::V40::BL
-
-        line.post_type.must_equal 'BL'
-
-        line.index.must_equal 1
-        line.order_number.must_equal '1465'
-        line.item_count.must_equal 200
-        line.price_unit.must_equal "EA"
-        line.buyer_item_number.must_be_nil
-        line.delivery_date.must_equal Date.new(2010, 6, 1)
-        line.buyer_ref.must_be_nil
-        line.splitable.must_equal true
-        line.replacable.must_equal true
-
-        line.item_type.must_equal 1
-        line.item_number.must_equal '8000502'
-        line.item_name.must_equal '200L OSO STD BEREDER SUPER S'
-        line.item_description.must_be_nil
-      end
-
-      it "adds text to orderline" do
-        order = EfoNelfo.load(csv('B650517.032.csv'))
-        order.lines.first.text.first.to_s.must_equal "Her er litt fritekst"
-      end
-
-      it "stores the contents file in the Order object" do
-        filename = csv('B650517.032.csv')
-        order = EfoNelfo.load(filename)
-        order.source.must_equal File.read(filename)
-      end
-    end
-
     # Loads all files in the samples directory
     %w(B028579.594.csv B028579.596.csv B650517.031.csv B028579.595.csv B028579.597.csv B650517.030.csv B650517.032.csv).each do |file|
       it "can load #{file}" do
         EfoNelfo.load(csv(file)).must_be_instance_of EfoNelfo::V40::BH
       end
     end
+  end
+
 
+  describe ".parse" do
+    it "does the same as .load" do
+      filename = csv('B650517.032.csv')
+      parsed = EfoNelfo.parse File.read(filename)
+      loaded = EfoNelfo.load filename
+      parsed.source.must_equal loaded.source
+    end
   end
 
 end

data/spec/parsing/bh_spec.rb

@@ -0,0 +1,54 @@
+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
+  end
+
+  it "parses the file and returns an Order" do
+    EfoNelfo.load(csv('B650517.032.csv')).must_be_instance_of EfoNelfo::V40::BH
+  end
+
+  it "the order contains order information" do
+    order = EfoNelfo.load(csv('B650517.032.csv'))
+    order.post_type.must_equal 'BH'
+    order.format.must_equal 'EFONELFO'
+    order.version.must_equal '4.0'
+  end
+
+  it "the order contains orderlines" do
+    order = EfoNelfo.load(csv('B650517.032.csv'))
+
+    line = order.lines.first
+    line.must_be_instance_of EfoNelfo::V40::BL
+
+    line.post_type.must_equal 'BL'
+
+    line.index.must_equal 1
+    line.order_number.must_equal '1465'
+    line.item_count.must_equal 200
+    line.price_unit.must_equal "EA"
+    line.buyer_item_number.must_be_nil
+    line.delivery_date.must_equal Date.new(2010, 6, 1)
+    line.buyer_ref.must_be_nil
+    line.splitable.must_equal true
+    line.replacable.must_equal true
+
+    line.item_type.must_equal 1
+    line.item_number.must_equal '8000502'
+    line.item_name.must_equal '200L OSO STD BEREDER SUPER S'
+    line.item_description.must_be_nil
+  end
+
+  it "adds text to orderline" do
+    order = EfoNelfo.load(csv('B650517.032.csv'))
+    order.lines.first.text.first.to_s.must_equal "Her er litt fritekst"
+  end
+
+  it "stores the contents file in the Order object" do
+    filename = csv('B650517.032.csv')
+    order = EfoNelfo.load(filename)
+    order.source.must_equal File.read(filename)
+  end
+end

data/spec/parsing/rh_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "parsing a RH.csv file" do
+  let(:nelfo) { EfoNelfo.load csv('rabatt.csv') }
+  it { nelfo.must_be_instance_of EfoNelfo::V40::RH }
+  # RH;EFONELFO;4.0;NO910478656MVA;NO000000000MVA;0;0;20130404;20140404;NOK;H;Alsell Norge AS;Vestre Svanholmen 4;;4313;SANDNES;NO
+  it "assigns attributes" do
+    nelfo.seller_id.must_equal "NO910478656MVA"
+    nelfo.buyer_id.must_equal "NO000000000MVA"
+  end
+
+  it "assigns lines" do
+    nelfo.lines.size.must_equal 4
+    line = nelfo.lines.last
+    line.product_type.must_equal 5
+    line.product_number.must_equal "P10501"
+    line.AvtaltPris.must_be_nil
+  end
+end

data/spec/parsing/vh_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+
+describe "parsing a VH.csv file" do
+  let(:nelfo) { EfoNelfo.load(csv('varefil_eksempel.csv')) }
+
+  it { nelfo.must_be_instance_of EfoNelfo::V40::VH }
+
+  it "loads the order" do
+    nelfo.format.must_equal "EFONELFO"
+    nelfo.version.must_equal "4.0"
+    nelfo.post_type.must_equal "VH"
+    nelfo.SelgersId.must_equal "NO1234567879MVA"
+    nelfo.KjøpersId.must_be_nil
+    nelfo.KundeNr.must_be_nil
+    nelfo.from_date.must_equal Date.new(2004, 1, 22)
+    nelfo.to_date.must_be_nil
+    nelfo.currency.must_equal "NOK"
+    nelfo.contract_id.must_be_nil
+    nelfo.seller_name.must_equal "ONNINEN A/S"
+    nelfo.seller_address1.must_equal "P.B. 70"
+    nelfo.seller_address2.must_be_nil
+    nelfo.seller_zip.must_equal "1483"
+    nelfo.seller_office.must_equal "SKYTTA"
+    nelfo.seller_country.must_equal "NO"
+  end
+
+  it "adds product lines" do
+    nelfo.lines.count.must_equal 3
+
+    line = nelfo.lines.first
+    line.product_type.must_equal 1
+    line.product_number.must_equal "1006100"
+    line.name.must_equal "MATTE 3MM 100W/M2  100W"
+    line.description.must_equal "1,0 m2 0,5 x 2,0 m"
+    line.unit.must_equal 1
+    line.price_unit.must_equal "EA"
+    line.price_unit_desc.must_equal "STYKK"
+    line.price.must_equal 55300
+    line.amount.must_equal 10000
+    line.price_date.must_equal Date.new(2011,9,1)
+    line.status.must_equal 1
+    line.block_number.must_be_nil
+    line.discount_group.must_equal "1004"
+    line.fabrication.must_be_nil
+    line.type.must_be_nil
+    line.stocked.must_equal true
+    line.stocked?.must_equal true
+    line.sales_package.must_equal 10000
+  end
+
+  it "adds additional information to the product" do
+    line = nelfo.lines.first
+    line.info.first.value.must_equal "http://www.elektroskandia.no/image/products/1221102.gif"
+  end
+
+  it "adds product alternatives" do
+    nelfo.lines.first.alternatives.first.must_be_instance_of EfoNelfo::V40::VA
+    nelfo.lines.first.alternatives.first.product_type.must_equal 1
+    nelfo.lines.first.alternatives.last.replacement?.must_equal true
+  end
+end

data/spec/properties_spec.rb

@@ -142,7 +142,7 @@ describe EfoNelfo::Properties do
       obj.date = Date.new 2012, 5, 30
       obj.number = 3
       obj.doable = true
-      obj.to_a.must_equal ["I am foo", nil, "20120530", 3, "J", "NO"]
+      obj.to_a.must_equal ["I am foo", nil, "20120530", "3", "J", "NO"]
     end
   end
 

data/spec/property_spec.rb

@@ -106,6 +106,10 @@ describe EfoNelfo::Property do
         property.value.must_be_nil
       end
 
+      it "nil becomes 0 when property is required" do
+        property.options[:required] = false
+      end
+
     end
 
   end
@@ -157,9 +161,10 @@ describe EfoNelfo::Property do
 
     describe "type is :integer" do
       let(:type) { :integer }
-      it { make_property(2).must_equal 2 }
-      it { make_property(100, type: :integer, decimals: 4).must_equal 100 }
+      it { make_property(2).must_equal "2" }
+      it { make_property(100, type: :integer, decimals: 4).must_equal "100" }
       it { make_property(nil, type: :integer, decimals: 2).must_equal nil }
+      it { make_property(nil, type: :integer, required: true).must_equal "0" }
     end
 
     describe "type is :boolean" do

data/spec/spec_helper.rb

@@ -6,7 +6,12 @@ require 'minitest/pride'
 require 'awesome_print'
 
 Turn.config do |c|
-  c.format = :cool
+  c.format = :progress
   c.natural = true
   c.loadpath = %w(lib spec)
 end
+
+# helper method that returns full path to csv files
+def csv(filename)
+  File.expand_path("../samples/#{filename}", __FILE__)
+end

data/spec/va_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe EfoNelfo::V40::VA do
+
+  describe "has aliases for various types" do
+
+    it { EfoNelfo::V40::VA.new(type: 'A').alternative?.must_equal true }
+    it { EfoNelfo::V40::VA.new(type: 'E').replacement?.must_equal true }
+    it { EfoNelfo::V40::VA.new(type: 'V').alternative_id?.must_equal true }
+    it { EfoNelfo::V40::VA.new(type: 'P').package_size?.must_equal true }
+
+  end
+
+  it "#nrf_id returns true if product_type is 4" do
+    EfoNelfo::V40::VA.new(product_type: 4, product_number: '1234').nrf_id.must_equal '1234'
+  end
+
+end

data/spec/vl_spec.rb

@@ -33,6 +33,40 @@ describe EfoNelfo::V40::VL do
     vl.volume.must_be_nil
   end
 
+  it "#gross_price? returns true when price type is 'B'" do
+    vl.price_type = 'B'
+    vl.gross_price?.must_equal true
+    vl.net_price?.must_equal false
+  end
+
+  it "#gross_price? returns true when price type is nil" do
+    vl.price_type = nil
+    vl.gross_price?.must_equal true
+    vl.net_price?.must_equal false
+  end
+
+  it "#gross_price returns price when price is gross" do
+    EfoNelfo::V40::VL.new(price: 2050, price_type: 'B').gross_price.must_equal 20.5
+  end
+
+  it "#net_price returns nil when price is gross" do
+    EfoNelfo::V40::VL.new(price: 2050, price_type: 'B').net_price.must_be_nil
+  end
+
+  it "#net_price returns price when price is net" do
+    EfoNelfo::V40::VL.new(price: 2050, price_type: 'N').net_price.must_equal 20.5
+  end
+
+  it "#gross_price returns nil when price is net" do
+    EfoNelfo::V40::VL.new(price: 2050, price_type: 'N').gross_price.must_be_nil
+  end
+
+  it "#net_price? returns true when price type is 'N'" do
+    vl.price_type = 'N'
+    vl.net_price?.must_equal true
+    vl.gross_price?.must_equal false
+  end
+
   it "#urls returns list of vx lines containing a url" do
     vl.info << { field: 'FOO', value: 'http://localhost/one?two'}
     vl.info << { field: 'BAR', value: 'http://foo.example.com/one/two/three'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efo_nelfo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Gudleik Rasch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,9 @@ files:
 - spec/collection_spec.rb
 - spec/csv_writer_spec.rb
 - spec/efo_nelfo_spec.rb
+- spec/parsing/bh_spec.rb
+- spec/parsing/rh_spec.rb
+- spec/parsing/vh_spec.rb
 - spec/post_type_spec.rb
 - spec/properties_spec.rb
 - spec/property_spec.rb
@@ -161,6 +164,7 @@ files:
 - spec/samples/varefil_eksempel.csv
 - spec/samples/varer_small.csv
 - spec/spec_helper.rb
+- spec/va_spec.rb
 - spec/vl_spec.rb
 homepage: http://efo.no
 licenses:
@@ -190,6 +194,9 @@ test_files:
 - spec/collection_spec.rb
 - spec/csv_writer_spec.rb
 - spec/efo_nelfo_spec.rb
+- spec/parsing/bh_spec.rb
+- spec/parsing/rh_spec.rb
+- spec/parsing/vh_spec.rb
 - spec/post_type_spec.rb
 - spec/properties_spec.rb
 - spec/property_spec.rb
@@ -206,4 +213,5 @@ test_files:
 - spec/samples/varefil_eksempel.csv
 - spec/samples/varer_small.csv
 - spec/spec_helper.rb
+- spec/va_spec.rb
 - spec/vl_spec.rb