efo_nelfo 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 339fc7d74621d26713c98008d2060452753e3998
-  data.tar.gz: 0020dbe4e5129c8890165cf01bae901bcd1373ee
+  metadata.gz: 5c4b4dce00c7c566c8cf0866f02cc7560a5bd3c4
+  data.tar.gz: 1e1bcc1e132c347c94d82ccc265bedc4cb8b4407
 SHA512:
-  metadata.gz: 058e13eeccaaf4657c8f58711c3d278ef5190afb1a96b470ed3e38df8242e1b80ddc9ef8482be084012f2e758e1bf27e8270d044808e7c1761cb5b0de20ed873
-  data.tar.gz: 2a755cf54f5d2481297513748eb14a944412364ecc2274ff4be40a75b2ed564fa522baff9753045fc27b1f566a7a5265c02e0b65819671796919b9c699579d09
+  metadata.gz: fe36c958173bbfc4ac87379b730d73c12721af0d0663f5bffdf527ac6b7aeffa2740eb78fa066764a62d60d89a23d3a933abf98f1d07f1496234fc6465a25cee
+  data.tar.gz: 96743647440ed7561e5b9df4670a50fa98e8e7a78c00cf9c452a25200c4f6e5880e5cf0adfd17c237d43f8a1455174a109ae4d591816817ea01270d4ab571298

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/bin/

data/Guardfile

@@ -3,6 +3,7 @@
 
 guard 'minitest' do
   watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^lib/(.*)\.rb})            { "spec" }
+  #watch(%r|^lib/(.*)([^/]+)\.rb|)    { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end

data/efo_nelfo.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "rb-fsevent"
   spec.add_development_dependency "terminal-notifier-guard"
+  spec.add_development_dependency "turn"
 end

data/lib/efo_nelfo/collection.rb

@@ -0,0 +1,44 @@
+require 'forwardable'
+
+module EfoNelfo
+
+  class Collection
+    include Enumerable
+    extend Forwardable
+
+    attr_reader :owner, :post_type
+
+    def_delegators :@list, :[], :each, :last, :size, :empty?
+
+    def initialize(owner, post_type)
+      @owner     = owner
+      @post_type = post_type
+      @list      = []
+    end
+
+    def <<(obj)
+      obj = post_type_class.new(obj) if obj.is_a? Hash
+      raise EfoNelfo::InvalidPostType if obj.nil? || (obj.is_a?(EfoNelfo::PostType) && obj.post_type != post_type)
+
+      # Set the index if the post has an index property
+      obj.index = size + 1 if obj.has_property?(:index)
+
+      @list << obj
+    end
+
+    def to_a
+      map(&:to_a).flatten(1)
+    end
+
+    private
+    attr_reader :list
+
+    def post_type_class
+      Kernel.const_get("EfoNelfo::V#{owner.class.version_from_class}::#{post_type}")
+    end
+
+
+  end
+
+end
+

data/lib/efo_nelfo/errors.rb

@@ -1,4 +1,6 @@
 module EfoNelfo
-  class UnsupportedPostType < StandardError; end
-  class DuplicateProperty < StandardError; end
+  InvalidPostType       = Class.new(StandardError)
+  UnsupportedPostType   = Class.new(StandardError)
+  DuplicateProperty     = Class.new(StandardError)
+  UnknownPropertyOption = Class.new(StandardError)
 end

data/lib/efo_nelfo/has_many.rb

@@ -0,0 +1,70 @@
+module EfoNelfo
+
+  module HasMany
+
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    def find_association(post_type)
+      send self.class.association(post_type) if has_association?(post_type)
+    end
+
+    def has_association?(post_type)
+      !self.class.association(post_type).nil?
+    end
+
+    def associations
+      self.class.associations
+    end
+
+    def add(post)
+      find_association(post) << post
+    end
+
+    def to_a
+      [ super ] + associations_array
+    end
+
+    protected
+
+    def associations_array
+      if associations
+        associations.keys.map { |name| find_association(name).to_a }.reject(&:empty?).flatten(1)
+      else
+        []
+      end
+    end
+
+    module ClassMethods
+
+      def has_many(name, options)
+        post_type = options[:post_type]
+
+        @associations ||= {}
+        @associations[post_type] = name
+
+        define_method name do
+          instance_variable_get("@#{name}") || instance_variable_set("@#{name}", EfoNelfo::Collection.new(self, post_type))
+        end
+
+        define_method "#{name}=" do |values|
+          instance_variable_set "@#{name}", EfoNelfo::Collection.new(self, post_type)
+          values.each { |item| instance_variable_get("@#{name}") << item } if values
+        end
+
+      end
+
+      def associations
+        @associations
+      end
+
+      def association(post_type)
+        type = post_type.is_a?(EfoNelfo::PostType) ? post_type.post_type : post_type.to_s.upcase
+        @associations[type]
+      end
+    end
+
+  end
+
+end

data/lib/efo_nelfo/post_head_type.rb

@@ -0,0 +1,30 @@
+module EfoNelfo
+  module PostHeadType
+    attr_accessor :source
+
+    def self.included(base)
+      base.send :property, :post_type,  alias: :PostType,      limit: 2, default: base.post_type
+      base.send :property, :format,     alias: :Format,        limit: 8, default: 'EFONELFO'
+      base.send :property, :version,    alias: :Versjon,       limit: 3, default: base.version
+    end
+
+    def add(post_type)
+      if has_association? post_type
+        find_association(post_type) << post_type
+      else
+        if lines.any?
+          lines.last.find_association(post_type) << post_type
+        end
+      end
+    end
+
+    def to_csv
+      CSV.generate EfoNelfo::Reader::CSV::CSV_OPTIONS do |csv|
+        to_a.each do |row|
+          csv << row unless row.empty?
+        end
+      end
+    end
+
+  end
+end

data/lib/efo_nelfo/post_type.rb

@@ -2,48 +2,51 @@ module EfoNelfo
 
   class PostType
     include EfoNelfo::Property
-
-    attr_reader :post_type
-
-    @modules = []
+    include EfoNelfo::HasMany
 
     class << self
-      def inherited(klass)
-        @modules << klass
-      end
 
-      def for(type, version=nil)
-        @modules.select { |mod| mod.can_parse?(type, version) }.first
+      def for(type, version)
+        klass = "EfoNelfo::V#{version_to_namespace(version)}::#{type}"
+        const_get(klass) rescue nil
       end
 
-      def can_parse?(post_type, check_version=nil)
-        if check_version
-          self::POST_TYPES.keys.include?(post_type) && check_version == version
-        else
-          self::POST_TYPES.keys.include?(post_type)
-        end
+      # Converts version to module version name
+      # Example: version_to_namespace("4.2")   # => "42"
+      def version_to_namespace(version)
+        version.gsub('.', '')
       end
 
       # Extracts version number from class namespace.
       # Example: EfoNelfo::V41::Some::Class.version  # => "4.1"
       def version
-        (self.to_s.match(/::V(?<version>\d+)::/)[:version].to_f / 10).to_s
+        (version_from_class.to_f / 10).to_s
+      end
+
+      def version_from_class
+        self.to_s.match(/::V(?<version>\d+)::/)[:version]
+      end
+
+      def post_type
+        name.split(/::/).last
+      end
+
+      def from(hash)
+        self.for(hash[:post_type], hash[:version]).new(hash)
       end
 
     end
 
     def initialize(*args)
-      initialize_attributes *args
-      @post_type = self.class::POST_TYPES.keys.first
-      @version   = self.class.version
+      initialize_attributes(*args)
     end
 
-    # This is for adding posttypes
-    def add(something)
+    def post_type
+      self.class.post_type
     end
 
-    def post_type_human
-      self.class::POST_TYPES[post_type]
+    def version
+      self.class.version
     end
 
   end

data/lib/efo_nelfo/property.rb

@@ -1,12 +1,19 @@
 module EfoNelfo
 
   module Property
-    include EfoNelfo::AttributeAssignment
 
     def self.included(base)
       base.send :extend, ClassMethods
     end
 
+    def initialize_attributes(*args)
+      if args && args.first.is_a?(Hash)
+        args.first.each do |attr, value|
+          send "#{attr}=", value
+        end
+      end
+    end
+
     def attributes
       @attributes ||= initialize_default_attributes
     end
@@ -15,6 +22,10 @@ module EfoNelfo
       self.class.properties
     end
 
+    def has_property?(property)
+      properties.include? property
+    end
+
     def to_a
       properties.keys.map { |prop| formatted_for_csv(prop) }
     end
@@ -76,6 +87,7 @@ module EfoNelfo
       #   - alias     Norwegian alias name for the attribute
       #
       def property(name, options={})
+
         options = {
           type: :string,
           required: false,
@@ -83,6 +95,11 @@ module EfoNelfo
 
         name = name.to_sym
 
+        # ensure all options are valid
+        valid_options   = [:type, :required, :limit, :read_only, :alias, :default]
+        invalid_options = options.keys - valid_options
+        raise EfoNelfo::UnknownPropertyOption.new("Invalid option for #{name}: #{invalid_options.join(',')}") if invalid_options.any?
+
         # Store property info in @properties
         raise EfoNelfo::DuplicateProperty if properties.has_key?(name)
         properties[name] = options

data/lib/efo_nelfo/reader/csv.rb

@@ -33,7 +33,7 @@ module EfoNelfo
         # Read rest of the file and add them to the head
         csv.each do |row|
           # Find the correct posttype module for given posttype and version
-          klass = EfoNelfo::PostType.for row[0]
+          klass = EfoNelfo::PostType.for row[0], head.version
           next if klass.nil?
 
           line = initialize_object_with_properties klass, row

data/lib/efo_nelfo/v40/{order/order.rb → bh.rb}

@@ -1,19 +1,9 @@
-# encoding: utf-8
 module EfoNelfo
   module V40
-    class Order < EfoNelfo::PostType
-      POST_TYPES = {
-        'BH' => 'Bestilling Hodepost',
-        'IH' => 'Forespørsel Hodepost'
-      }
-
-      attr_reader   :lines
-      attr_accessor :source
+    class BH < EfoNelfo::PostType
+      include PostHeadType
 
       # It's important to list the property in the same order as specified in the specs
-      property :post_type,                   alias: :PostType,      limit: 2, default: 'BH'
-      property :format,                      alias: :Format,        limit: 8, default: 'EFONELFO'
-      property :version,                     alias: :Versjon,       limit: 3, default: version
       property :seller_id,                   alias: :SelgersId,     limit: 14
       property :buyer_id,                    alias: :KjøpersId,     limit: 14, required: true
       property :order_number,                alias: :BestNr,        limit: 10, required: true
@@ -60,40 +50,18 @@ module EfoNelfo
       property :seller_office,               alias: :SPostSted,     limit: 35
       property :seller_country,              alias: :SLandK,        limit: 2
 
-      def initialize(*args)
-        @lines = EfoNelfo::Array.new
-        super
-      end
+      has_many :lines, post_type: "BL"
 
-      def add(post_type)
-        case
-        when post_type.is_a?(Order::Line)
-          add_order_line(post_type)
-        when post_type.is_a?(Order::Text)
-          add_text_to_order_line(post_type)
-        when post_type.is_a?(Hash)
-          add_order_line(EfoNelfo::V40::Order::Line.new(post_type))
-        end
-      end
-
-      def lines=(values)
-        @lines = EfoNelfo::Array.new
-        values.each do |item|
-          add item
-        end
-      end
-
-      def to_a
-        [ super ] + lines.to_a
-      end
-
-      def to_csv
-        CSV.generate EfoNelfo::Reader::CSV::CSV_OPTIONS do |csv|
-          to_a.each do |row|
-            csv << row unless row.empty?
-          end
-        end
-      end
+      # 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
 

data/lib/efo_nelfo/v40/bl.rb

@@ -0,0 +1,30 @@
+module EfoNelfo
+  module V40
+    class BL < EfoNelfo::PostType
+
+      # It's important to list the property in the same order as specified in the specs
+      property :post_type,         alias: :PostType,   limit: 2,   default: post_type, required: true
+      property :index,             alias: :LinjeNr,    limit: 4,   type: :integer
+      property :order_number,      alias: :BestNr,     limit: 10,  required: true
+      property :item_type,         alias: :VareMrk,    limit: 1,   required: true, type: :integer
+      property :item_number,       alias: :VareNr,     limit: 14,  required: true
+      property :item_name,         alias: :VaBetg,     limit: 30,  required: true
+      property :item_description,  alias: :VaBetg2,    limit: 30
+      property :item_count,        alias: :Ant,        limit: 9,   required: true, type: :integer
+      property :price_unit,        alias: :PrisEnhet,  limit: 3,   required: true
+      property :buyer_item_number, alias: :KVareNr,    limit: 25
+      property :delivery_date,     alias: :LevDato,    type: :date
+      property :buyer_ref,         alias: :KjøpersRef, limit: 25
+      property :splitable,         alias: :DelLev,     type: :boolean, default: true
+      property :replacable,        alias: :AltKode,    type: :boolean, default: true
+
+      has_many :text, post_type: "BT"
+
+      def format_item_count
+        item_count ? item_count * 100 : nil
+      end
+
+    end
+
+  end
+end

data/lib/efo_nelfo/v40/bt.rb

@@ -0,0 +1,15 @@
+module EfoNelfo
+  module V40
+    class BT < EfoNelfo::PostType
+
+      # It's important to list the property in the same order as specified in the specs
+      property :post_type, alias: :PostType, limit: 2, default: post_type, required: true
+      property :text,      alias: :FriTekst, limit: 30
+
+      def to_s
+        text
+      end
+
+    end
+  end
+end

data/lib/efo_nelfo/v40/va.rb

@@ -0,0 +1,11 @@
+module EfoNelfo
+  module V40
+    class VA < PostType
+      property :post_type,      alias: :PostType,     limit: 2, required: true, default: post_type
+      property :product_type,   alias: :VareMrk,      limit: 1, type: :integer, required: true
+      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
+    end
+  end
+end

data/lib/efo_nelfo/v40/vh.rb

@@ -0,0 +1,24 @@
+module EfoNelfo
+  module V40
+    class VH < EfoNelfo::PostType
+      include PostHeadType
+
+      property :seller_id,          alias: :SelgersId,     limit: 14, required: true
+      property :buyer_id,           alias: :KjøpersId,     limit: 14
+      property :customer_id,        alias: :KundeNr,       limit: 10
+      property :from_date,          alias: :FraDato,       limit: 8, type: :date
+      property :to_date,            alias: :TilDato,       limit: 8, type: :date
+      property :currency,           alias: :Valuta,        limit: 3, required: true
+      property :contract_id,        alias: :AvtaleId,      limit: 10
+      property :seller_name,        alias: :SFirmaNavn,    limit: 35, required: true
+      property :seller_address1,    alias: :SAdr1,         limit: 35
+      property :seller_address2,    alias: :SAdr2,         limit: 35
+      property :seller_zip,         alias: :SPostNr,       limit: 9, required: true
+      property :seller_office,      alias: :SPostSted,     limit: 35, required: true
+      property :seller_country,     alias: :SLandK,        limit: 2
+      property :price_type,         alias: :PrisType,      limit: 1
+
+      has_many :lines, post_type: 'VL'
+    end
+  end
+end

data/lib/efo_nelfo/v40/vl.rb

@@ -0,0 +1,34 @@
+module EfoNelfo
+  module V40
+    class VL < EfoNelfo::PostType
+      property :post_type,         alias: :PostType,      limit: 2,  default: post_type, required: true
+      property :product_type,      alias: :VareMrk,       limit: 1,  type: :integer, required: true
+      property :product_number,    alias: :VareNr,        limit: 14, required: true
+      property :name,              alias: :VaBetg,        limit: 30, required: true
+      property :description,       alias: :VaBetg2,       limit: 30
+      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 :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
+      property :block_number,      alias: :BlokkNummer,   limit: 6,  type: :integer
+      property :discount_group,    alias: :RabattGruppe,  limit: 14
+      property :fabrication,       alias: :Fabrikat,      limit: 10
+      property :type,              alias: :Type,          limit: 10
+      property :stocked,           alias: :Lagerført,     type: :boolean
+      property :sales_package,     alias: :SalgsPakning,  limit: 9,  type: :integer
+      property :discount,          alias: :Rabatt,        limit: 4,  type: :integer
+      property :price_type,        alias: :Pristype,      limit: 1
+
+      has_many :info, post_type: "VX"
+      has_many :alternatives, post_type: "VA"
+
+      def nrf_id
+        product_type == 4 ? product_number : nil
+      end
+
+    end
+  end
+end

data/lib/efo_nelfo/v40/vx.rb

@@ -0,0 +1,9 @@
+module EfoNelfo
+  module V40
+    class VX < EfoNelfo::PostType
+      property :post_type,  alias: :PostType, limit: 2,  default: post_type
+      property :field,      alias: :FeltId,   limit: 10, required: true
+      property :value,      alias: :Verdi,    limit: 70, required: true
+    end
+  end
+end

data/lib/efo_nelfo/version.rb

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

data/lib/efo_nelfo.rb

@@ -3,15 +3,20 @@
 # Common stuff
 require 'efo_nelfo/version'
 require 'efo_nelfo/errors'
-require 'efo_nelfo/array'
-require 'efo_nelfo/attribute_assignment'
 require 'efo_nelfo/property'
+require 'efo_nelfo/collection'
+require 'efo_nelfo/has_many'
 require 'efo_nelfo/post_type'
+require 'efo_nelfo/post_head_type'
 
 # EfoNelfo v4.0 modules
-require 'efo_nelfo/v40/order/order'
-require 'efo_nelfo/v40/order/line'
-require 'efo_nelfo/v40/order/text'
+require 'efo_nelfo/v40/bh'
+require 'efo_nelfo/v40/bl'
+require 'efo_nelfo/v40/bt'
+require 'efo_nelfo/v40/vh'
+require 'efo_nelfo/v40/vl'
+require 'efo_nelfo/v40/vx'
+require 'efo_nelfo/v40/va'
 
 # Reader modules (import)
 require 'efo_nelfo/reader/csv'
@@ -30,6 +35,4 @@ module EfoNelfo
 
   end
 
-
 end
-

data/spec/collection_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe EfoNelfo::Collection do
+  Owner = Class.new do
+    def self.version_from_class
+      '21'
+    end
+  end
+
+  let(:owner) { Owner.new }
+  let(:array) { EfoNelfo::Collection.new owner, "BT" }
+
+  it "accepts owner and post_type arguments" do
+    array.owner.must_equal owner
+    array.post_type.must_equal "BT"
+  end
+
+  describe "<<" do
+    module EfoNelfo
+      module V21
+        class MyType < EfoNelfo::PostType
+          property :whatever
+          property :version
+        end
+
+        class BT < EfoNelfo::PostType
+          property :post_type
+          property :whatever
+          property :version
+        end
+      end
+    end
+
+    describe "passing a hash" do
+      let(:hash) {
+        { post_type: "BT", version: "2.1", whatever: 'blah' }
+      }
+
+      it "accepts a valid hash" do
+        array << hash
+        array.size.must_equal 1
+      end
+
+      it "converts the hash into a post type" do
+        array << hash
+        array[0].must_be_instance_of EfoNelfo::V21::BT
+        array[0].whatever.must_equal 'blah'
+      end
+
+    end
+
+    describe "passing a PostType object" do
+      let(:obj) { EfoNelfo::V21::MyType.new }
+
+      it "accepts a valid posttype" do
+        def obj.post_type; 'BT'; end
+        array << obj
+        array.must_include obj
+      end
+
+      it "raises an error if the object being added is of wrong type" do
+        def obj.post_type; 'BH'; end
+        lambda { array << obj }.must_raise(EfoNelfo::InvalidPostType)
+      end
+    end
+  end
+
+end