efo_nelfo 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f389f65b4a9eb9dd8dc8c08c7a35d503681d80c
-  data.tar.gz: 49a45cedbc30524de77097fdcd8e404417358333
+  metadata.gz: 64cdaf33e1a391067ac19395f549997d497faa45
+  data.tar.gz: 247909b6de770da10400d1ba2ff6ac8ad16b2a2e
 SHA512:
-  metadata.gz: f976078206c2b97b86a93919996ba2ba1986120b0ed844833dda3b326947bbef7fd73315f5fd94c2c775160dac8e7f3fc46e7e41bd01980d4e3fa5b5b6351b28
-  data.tar.gz: e0fecdcd62acf5815e5c6271977948857059fda3bfdcacdc58df828842d2cc2ddc04070bba59f3339ec64bbb6d5dca1e090cf261202325edf15a4b4537ce72af
+  metadata.gz: d3dbe7d16a9b78ee13b12a6ee47657481376a9bc73017f1d83caa11e22759f6f3e838d9b0878f7615ecd10b9cfe58af7355716863d215a53cdfbe247b82890a4
+  data.tar.gz: 035aaa3183fd806377ccc9ca7bcabb6a6e5fbd0f174d5625ef831ae89fb0e9054b78a5af7c55c58282bf5ff3f41c0d8bdc003bd3432a58d958eb2988f5ad3e2a

data/README.md

@@ -2,14 +2,15 @@
 
 Gem for parsing and writing EfoNelfo documents.
 
-Supported versions:
+Supported EfoNelfo versions:
 
 * 4.0
 
 Supported formats:
 
-* Bestilling
-
+* Bestilling (BH, BL, BT)
+* Vareformat (VH, VL, VX, VA)
+* Rabatt (RH, RL)
 
 ## Usage
 
@@ -19,8 +20,8 @@ Importing a CSV file:
 
 Exporting CSV:
 
-    # order = EfoNelfo::V40::Order.new
-    # order.add EfoNelfo::V40::Order::Line.new item_number: '442', order_number: 'abc'
+    # order = EfoNelfo::V40::VH.new
+    # order.add EfoNelfo::V40::VL.new item_number: '442', order_number: 'abc'
     # order.to_csv
 
 
@@ -31,7 +32,6 @@ Exporting CSV:
 * Support more versions
 * Support XML
 
-
 ## Resources
 
 * http://www.efo.no/Portals/5/docs/ImplementasjonsGuide%20EFONELFO%204.0.pdf

data/lib/efo_nelfo/errors.rb

@@ -3,4 +3,5 @@ module EfoNelfo
   UnsupportedPostType   = Class.new(StandardError)
   DuplicateProperty     = Class.new(StandardError)
   UnknownPropertyOption = Class.new(StandardError)
+  InvalidPropertyType   = Class.new(StandardError)
 end

data/lib/efo_nelfo/post_head_type.rb

@@ -8,6 +8,10 @@ module EfoNelfo
       base.send :property, :version,    alias: :Versjon,       limit: 3, default: base.version
     end
 
+    def [](index)
+      lines[index]
+    end
+
     def add(post_type)
       if has_association? post_type
         find_association(post_type) << post_type
@@ -18,13 +22,5 @@ module EfoNelfo
       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

@@ -1,7 +1,7 @@
 module EfoNelfo
 
   class PostType
-    include EfoNelfo::Property
+    include EfoNelfo::Properties
     include EfoNelfo::HasMany
 
     class << self
@@ -49,6 +49,14 @@ module EfoNelfo
       self.class.version
     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/properties.rb

@@ -0,0 +1,121 @@
+module EfoNelfo
+
+  module Properties
+
+    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
+
+    # Returns all properties
+    def properties
+      @properties ||= initialize_properties
+    end
+    alias :attributes :properties
+
+    # Returns true if the given property exists
+    def has_property?(name)
+      properties.include? name
+    end
+
+    # Returns all property values as array formatted for csv
+    def to_a
+      properties.values.map &:to_csv
+    end
+
+    private
+
+    def initialize_properties
+      self.class.properties.inject({}) do |hash,(name,options)|
+        hash[name] = EfoNelfo::Property.new(name, options)
+        hash
+      end
+    end
+
+    module ClassMethods
+      # Creates an attribute with given name.
+      #
+      # Options
+      #   - type      String, Integer etc. Default is String
+      #   - required  whether attribute is required. Default is false
+      #   - limit     Length the attribute can be. Default is nil
+      #   - alias     Norwegian alias name for the attribute
+      #
+      def property(name, options={})
+        options = {
+          type: :string,
+          required: false,
+        }.update options
+
+        name       = name.to_sym
+        alias_name = options.delete(:alias)
+
+        # ensure all options are valid
+        EfoNelfo::Property.validate_options! options
+
+        # ensure property is unique
+        raise EfoNelfo::DuplicateProperty if properties.has_key?(name)
+
+        # setup getters and setters
+        create_reader_for(name, options)
+        create_setter_for(name, options) unless options[:read_only]
+        create_question_for(name)        if options[:type] == :boolean
+        create_alias_for(name, alias_name, options)  if alias_name
+
+        properties[name] = options
+      end
+
+      # Returns all properties defined for the class
+      def properties
+        @_properties ||= {}
+      end
+
+      private
+
+      # Creates an attribute accessor for the property
+      def create_reader_for(name, options)
+        define_method name do
+          attributes[name].value
+        end
+      end
+
+      # Creates an attribute setter for the property
+      def create_setter_for(name, options)
+        define_method "#{name}=" do |value|
+          attributes[name].value = value
+        end
+      end
+
+      # Creates a name? accessor for the property
+      # Only applies to boolean types
+      def create_question_for(name)
+        define_method "#{name}?" do
+          attributes[name].value == true
+        end
+      end
+
+      # Create an alias getter/setter for the property
+      def create_alias_for(name, alias_name, options)
+        define_method(alias_name) do
+          send name
+        end
+
+        unless options[:read_only]
+          define_method("#{alias_name}=") do |val|
+            send "#{name}=", val
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/efo_nelfo/property.rb

@@ -1,155 +1,94 @@
-module EfoNelfo
+using EfoNelfo::PropertyTypes
 
-  module Property
+module EfoNelfo
 
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
+  class Property
+    VALID_OPTIONS = [:type, :required, :limit, :read_only, :default, :decimals]
+    VALID_TYPES   = [:string, :integer, :boolean, :date]
 
-    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
+    attr_reader :name, :options, :value
 
-    def properties
-      self.class.properties
+    def self.validate_options!(options)
+      invalid_options = options.keys - VALID_OPTIONS
+      raise EfoNelfo::UnknownPropertyOption.new("Invalid options: #{invalid_options.join(',')}") if invalid_options.any?
+      raise EfoNelfo::InvalidPropertyType.new("Valid types are #{VALID_TYPES.join(',')}") unless VALID_TYPES.include?(options[:type])
     end
 
-    def has_property?(property)
-      properties.include? property
-    end
+    def initialize(name, defaults={})
 
-    def to_a
-      properties.keys.map { |prop| formatted_for_csv(prop) }
-    end
+      options = {
+        type:      :string,
+        required:  false,
+        default:   nil,
+        read_only: false,
+        decimals:  nil,
+        limit:     100
+      }
+      options.update(defaults) if defaults.is_a?(Hash)
 
-    private
+      self.class.validate_options! options
 
-    def initialize_default_attributes
-      properties.inject({}) { |h,(name,options)| h[name] = options[:default]; h }
+      @name      = name
+      @options   = options
+      @value     = options[:default]
     end
 
-    def format_value(value, type)
-      case type
-      when :integer
-        value.nil? ? nil : value.to_i
-      when :date
-        if value.nil?
-          nil
-        elsif value.kind_of? String
-          Date.parse value
+    # Assign a value to the property
+    # The value is converted to whatever specified by options[:type]
+    # Examples:
+    #   (boolean) value = 'J'         # => true
+    #   (boolean) value = false       # => false
+    #   (date)    value = '20120101'  # => Date.new(2012,1,1)
+    #   (integer) value = '2'         # => 2
+    #   (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? ? nil : new_value.to_i
         else
-          value
-        end
-      when :boolean
-        value.nil? || value == true || value == 'J' || value == '' ? true : false
-      else
-        value
+          new_value
       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]
-
-        value = case type
-        when :date
-          value ? value.strftime("%Y%m%d") : nil
-        when :boolean
-          value == true ? "J" : nil
-        else
-          value
-        end
-      end
-      value.respond_to?(:encode) ? value.encode(Encoding::ISO_8859_1) : value
+    # returns formatted value suitable for csv output
+    def to_csv
+      output = value.to_csv
     end
 
-    module ClassMethods
-      # Creates an attribute with given name.
-      #
-      # Options
-      #   - type      String, Integer etc. Default is String
-      #   - required  whether attribute is required. Default is false
-      #   - limit     Length the attribute can be. Default is nil
-      #   - alias     Norwegian alias name for the attribute
-      #
-      def property(name, options={})
-
-        options = {
-          type: :string,
-          required: false,
-        }.update options
-
-        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
-
-        create_reader_for(name, options)
-        create_setter_for(name, options) unless options[:read_only]
-        create_question_for(name)        if options[:type] == :boolean
-        create_alias_for(name, options)  if options[:alias]
-      end
-
-      # Returns all properties
-      def properties
-        @_properties ||= {}
-      end
-
-      private
-
-      # Creates an attribute accessor for name
-      def create_reader_for(name, options)
-        define_method name do
-          attributes[name]
-        end
-      end
-
-      # Creates an attribute setter for name
-      def create_setter_for(name, options)
-        define_method "#{name}=" do |value|
-          attributes[name] = format_value(value, options[:type])
-        end
-      end
+    # Returns integer to floating point based on specified decimals
+    # Example:
+    #   If decimal is set to 4, and the value is 4000
+    #   then to_f returns 0.4
+    def to_f
+      return nil if value.nil?
+      value.to_f.with_decimals decimals
+    end
+    alias :to_decimal :to_f
 
-      # Creates a name? accessor
-      def create_question_for(name)
-        define_method "#{name}?" do
-          attributes[name] == true
-        end
-      end
+    # Returns true if the property is read only
+    def readonly?
+      options[:read_only]
+    end
 
-      def create_alias_for(name, options)
-        define_method(options[:alias]) do
-          send name
-        end
+    # Returns true if the property is required
+    # Note: this is not in use yet
+    def required?
+      options[:required]
+    end
 
-        unless options[:read_only]
-          define_method("#{options[:alias]}=") do |val|
-            send "#{name}=", val
-          end
-        end
-      end
+    def boolean?; type == :boolean; end
+    def date?;    type == :date;    end
+    def integer?; type == :integer; end
+    def string?;  type == :string;  end
 
+    def method_missing(*args)
+      options.has_key?(args.first) ? options[args.first] : super
     end
 
   end

data/lib/efo_nelfo/property_types.rb

@@ -0,0 +1,47 @@
+module EfoNelfo
+  module PropertyTypes
+    refine NilClass do
+      def to_csv
+        nil
+      end
+    end
+
+    refine TrueClass do
+      def to_csv
+        'J'
+      end
+    end
+
+    refine FalseClass do
+      def to_csv
+        'N'
+      end
+    end
+
+    refine String do
+      def to_csv
+        to_s.encode EfoNelfo::Reader::CSV::ENCODING
+      end
+    end
+
+    refine Date do
+      def to_csv
+        strftime("%Y%m%d")
+      end
+    end
+
+    refine Fixnum do
+      def to_csv
+        to_i
+      end
+    end
+
+    refine Float do
+      def with_decimals(decimals)
+        decimals.nil? ? self : self * (1.0/10**decimals.to_i)
+      end
+    end
+
+  end
+
+end

data/lib/efo_nelfo/reader/csv.rb

@@ -4,6 +4,8 @@ module EfoNelfo
   module Reader
 
     class CSV
+      ENCODING = Encoding::ISO_8859_1
+
       CSV_OPTIONS = {
         col_sep: ';',
         headers: false,
@@ -17,7 +19,7 @@ module EfoNelfo
 
       def initialize(options)
         if options[:filename]
-          @data = File.read(options[:filename], encoding: Encoding::ISO_8859_1)
+          @data = File.read(options[:filename], encoding: ENCODING)
         else
           @data = options[:data]
         end

data/lib/efo_nelfo/v40/vl.rb

@@ -33,6 +33,23 @@ module EfoNelfo
         info.map(&:image).compact
       end
 
+      [ :weight, :dimension, :volume, :fdv, :hms ].each do |key|
+        define_method key do
+          pick key
+        end
+      end
+
+      # Returns array of urls extracted from VX lines
+      def urls
+        info.map(&:value).select { |u| u.match %r{\Ahttps?://} }
+      end
+
+      private
+
+      def pick(method)
+        vx = info.select(&"#{method}?".to_sym).compact.first
+        vx && vx.send(method)
+      end
     end
   end
 end

data/lib/efo_nelfo/v40/vx.rb

@@ -5,12 +5,25 @@ module EfoNelfo
       property :field,      alias: :FeltId,   limit: 10, required: true
       property :value,      alias: :Verdi,    limit: 70, required: true
 
-      def image?
-        field == 'BILDE'
-      end
+      FIELD_MAPPINGS = {
+        image:     "BILDE",
+        weight:    "VEKT",
+        dimension: "DIMENSJON",
+        fdv:       "FDV",
+        hms:       "HMS",
+        volume:    "VOLUM"
+      }
+
+      FIELD_MAPPINGS.each do |key, field_value|
+        # Add methods like def image?; field == 'BILDE'; end
+        define_method "#{key}?" do
+          field == field_value
+        end
 
-      def image
-        value if image?
+        # Add methods like: def image; value if image?; end
+        define_method "#{key}" do
+          self.value if send("#{key}?")
+        end
       end
 
     end

data/lib/efo_nelfo/version.rb

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

data/lib/efo_nelfo.rb

@@ -3,7 +3,9 @@
 # Common stuff
 require 'efo_nelfo/version'
 require 'efo_nelfo/errors'
+require 'efo_nelfo/property_types'
 require 'efo_nelfo/property'
+require 'efo_nelfo/properties'
 require 'efo_nelfo/collection'
 require 'efo_nelfo/has_many'
 require 'efo_nelfo/post_type'

data/spec/csv_writer_spec.rb

@@ -29,7 +29,7 @@ describe EfoNelfo::V40::BH do
       csv.must_match /;EFONELFO;/
       csv.must_match /;4.0;/
       csv.must_match /;123;/
-      csv.must_match /;600;/
+      csv.must_match /;456;/
       csv.must_match /;J;/              # for fixing sublime syntax highlighting: /
     end
 

data/spec/post_type_spec.rb

@@ -4,15 +4,15 @@ describe EfoNelfo::PostType do
 
   module EfoNelfo
     module V21
-      class Foo < EfoNelfo::PostType
-        property :post_type
-        property :version
+      class AB < EfoNelfo::PostType
+        property :post_type, default: 'AB'
+        property :version, default: '21'
         property :seller_id
-        has_many :lines, :post_type => "Bar"
+        has_many :lines, :post_type => "XY"
       end
 
-      class Bar < EfoNelfo::PostType
-        property :post_type
+      class XY < EfoNelfo::PostType
+        property :post_type, default: 'XY'
         property :order_number
       end
     end
@@ -21,27 +21,35 @@ describe EfoNelfo::PostType do
   describe "versioning" do
 
     it ".version_from_class returns the version" do
-      EfoNelfo::V21::Foo.version_from_class.must_equal "21"
+      EfoNelfo::V21::AB.version_from_class.must_equal "21"
     end
 
     it ".version returns the version as a number" do
-      EfoNelfo::V21::Foo.version.must_equal "2.1"
+      EfoNelfo::V21::AB.version.must_equal "2.1"
     end
 
     it ".version_to_namespace converts version to module name" do
-      EfoNelfo::V21::Foo.version_to_namespace("2.1").must_equal "21"
+      EfoNelfo::V21::AB.version_to_namespace("2.1").must_equal "21"
     end
 
   end
 
+  describe "to_csv" 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
+    end
+  end
+
   describe ".from" do
     let(:hash) {
       {
-        post_type: "Foo",
+        post_type: "AB",
         version: "2.1",
         seller_id: "123",
         lines: [
-          { post_type: "Bar", order_number: "666-2" }
+          { post_type: "XY", order_number: "666-2" }
         ]
       }
     }
@@ -49,7 +57,7 @@ describe EfoNelfo::PostType do
     let(:pt) { EfoNelfo::PostType.from hash }
 
     it "converts the hash into a valid posttype" do
-      pt.must_be_instance_of EfoNelfo::V21::Foo
+      pt.must_be_instance_of EfoNelfo::V21::AB
       pt.seller_id.must_equal "123"
     end
 

data/spec/properties_spec.rb

@@ -0,0 +1,149 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe EfoNelfo::Properties do
+
+  class Foo
+    include EfoNelfo::Properties
+    property :foo, alias: "Føbar", limit: 3, default: 'I am foo'
+    property :bar
+    property :date, type: :date
+    property :number, type: :integer
+    property :doable, type: :boolean, default: false
+    property :immutable, read_only: true, default: 'NO'
+  end
+
+  let(:obj) { Foo.new }
+
+  it "raises an error if trying to add duplicate property" do
+    lambda {
+      class Bar
+        include EfoNelfo::Properties
+        property :foo
+        property :foo
+      end
+    }.must_raise EfoNelfo::DuplicateProperty
+  end
+
+  it "raises an error if trying to assign an unsupported option" do
+    lambda {
+      class Bar
+        include EfoNelfo::Properties
+        property :lame, funny: true
+      end
+    }.must_raise EfoNelfo::UnknownPropertyOption
+  end
+
+  it "adds a getter method for :foo" do
+    obj.foo.must_equal 'I am foo'
+  end
+
+  it "adds a setter method for :foo" do
+    obj.foo = 'Test'
+    obj.foo.must_equal 'Test'
+  end
+
+  it "adds a question method for boolean types" do
+    obj.doable?.must_equal false
+    obj.doable = true
+    obj.doable?.must_equal true
+  end
+
+  it "won't do any encoding conversions" do
+    obj.foo = 'Sjøhest'
+    obj.foo.encoding.name.must_equal 'UTF-8'
+  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'
+  end
+
+  it "assigns default values" do
+    obj.bar.must_be_nil
+    obj.foo.must_equal 'I am foo'
+  end
+
+  it "can be assigned nil values" do
+    obj.number = nil
+    obj.number.must_be_nil
+  end
+
+  it "readonly attributes cannot be changed" do
+    lambda { obj.immutable = 'test' }.must_raise NoMethodError
+    obj.immutable.must_equal 'NO'
+  end
+
+  describe "property types" do
+    describe ":date" do
+      it "converts strings to dates" do
+        obj.date = "20100504"
+        obj.date.must_be_kind_of Date
+      end
+
+      it "accepts a Date" do
+        obj.date = Date.new 2010, 5, 4
+        obj.date.must_be_kind_of Date
+      end
+
+    end
+
+    it "handles :integer" do
+      obj.number = "2"
+      obj.number.must_equal 2
+    end
+
+    describe ":boolean" do
+      it "returns true when assigning blank string" do
+        obj.doable = ''
+        obj.doable?.must_equal true
+      end
+
+      it "returns true when assigning nil" do
+        obj.doable = nil
+        obj.doable?.must_equal true
+      end
+
+      it "returns true when assigning 'J'" do
+        obj.doable = 'J'
+        obj.doable?.must_equal true
+      end
+
+      it "returns false" do
+        obj.doable = false
+        obj.doable?.must_equal false
+
+        obj.doable = 'N'
+        obj.doable?.must_equal false
+      end
+
+    end
+
+  end
+
+  it ".properties contains hash of options" do
+    Foo.properties[:foo].must_be_kind_of Hash
+  end
+
+  it "#properties contains hash of EfoNelfo::Property objects" do
+    Foo.new.properties[:foo].must_be_kind_of EfoNelfo::Property
+  end
+
+  it "#has_property? returns true when property exists" do
+    obj.has_property?(:foo).must_equal true
+    obj.has_property?(:bullshit).must_equal false
+  end
+
+  describe "#to_a" do
+    it "returns array of all attributes in correct order" 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"]
+    end
+  end
+
+end

data/spec/property_spec.rb

@@ -1,144 +1,193 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe EfoNelfo::Property do
-
-  class Foo
-    include EfoNelfo::Property
-    property :foo, alias: "Føbar", limit: 3, default: 'I am foo'
-    property :bar
-    property :date, type: :date
-    property :number, type: :integer
-    property :doable, type: :boolean, default: false
-    property :immutable, read_only: true, default: 'NO'
+  subject { EfoNelfo::Property.new :foo, options }
+  let(:options) { nil }
+
+  describe "initializing with options" do
+    let(:options) { { type: :integer, limit: 15, decimals: 4, default: 5, required: true } }
+
+    it { subject.name.must_equal :foo }
+    it { subject.default.must_equal 5 }
+    it { subject.limit.must_equal 15 }
+    it { subject.type.must_equal :integer }
+    it { subject.required.must_equal true }
+    it { subject.decimals.must_equal 4 }
+    it { subject.value.must_equal 5 }
+
+    it "raises an error when assigning to unknown type" do
+      lambda {
+        EfoNelfo::Property.new :name, type: :get_lost
+      }.must_raise EfoNelfo::InvalidPropertyType
+    end
   end
 
-  let(:obj) { Foo.new }
+  describe "initializing without options" do
+    let(:options) { nil }
 
-  it "raises an error if trying to add duplicate property" do
-    lambda {
-      class Bar
-        include EfoNelfo::Property
-        property :foo
-        property :foo
-      end
-    }.must_raise EfoNelfo::DuplicateProperty
+    it { subject.name.must_equal :foo }
+    it { subject.default.must_be_nil }
+    it { subject.limit.must_equal 100 }
+    it { subject.type.must_equal :string }
+    it { subject.required.must_equal false }
+    it { subject.decimals.must_be_nil }
+    it { subject.value.must_be_nil }
   end
 
-  it "raises an error if trying to assign an unsupported option" do
-    lambda {
-      class Bar
-        include EfoNelfo::Property
-        property :lame, funny: true
-      end
-    }.must_raise EfoNelfo::UnknownPropertyOption
-  end
+  describe "setter" do
+    let(:property) { EfoNelfo::Property.new :name, type: type }
 
-  it "adds a getter and setter for foo" do
-    obj.foo = 'Test'
-    obj.foo.must_equal 'Test'
-  end
+    describe "when type is string" do
+      let(:type) { :string }
+      it "is just a string" do
+        property.value = 'New value'
+        property.value.must_equal 'New value'
+      end
+    end
 
-  it "won't do any encoding conversions" do
-    obj.foo = 'Sjøhest'
-    obj.foo.encoding.name.must_equal 'UTF-8'
-  end
+    describe "when type is boolean" do
+      let(:type) { :boolean }
 
-  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'
-  end
+      it "accepts boolean" do
+        property.value = true
+        property.value.must_equal true
 
-  it "assigns default values" do
-    obj.bar.must_be_nil
-    obj.foo.must_equal 'I am foo'
-  end
+        property.value = false
+        property.value.must_equal false
+      end
 
-  it "can be assigned nil values" do
-    obj.number = nil
-    obj.number.must_be_nil
-  end
+      it "accepts J/N" do
+        property.value = 'J'
+        property.value.must_equal true
 
-  it "readonly attributes cannot be changed" do
-    lambda { obj.immutable = 'test' }.must_raise NoMethodError
-    obj.immutable.must_equal 'NO'
-  end
+        property.value = 'j'
+        property.value.must_equal true
 
-  describe "property types" do
-    describe ":date" do
-      it "converts strings to dates" do
-        obj.date = "20100504"
-        obj.date.must_be_kind_of Date
+        property.value = 'N'
+        property.value.must_equal false
       end
+    end
+
+    describe "when type is date" do
+      let(:type) { :date }
 
       it "accepts a Date" do
-        obj.date = Date.new 2010, 5, 4
-        obj.date.must_be_kind_of Date
+        property.value = Date.new(2013, 11, 21)
+        property.value.must_equal Date.new(2013, 11, 21)
       end
 
-    end
+      it "accepts a string" do
+        property.value = "20131121"
+        property.value.must_equal Date.new(2013, 11, 21)
+      end
+
+      it "invalid dates becomes nil" do
+        property.value = 'invalid date'
+        property.value.must_be_nil
+      end
 
-    it "handles :integer" do
-      obj.number = "2"
-      obj.number.must_equal 2
     end
 
-    describe ":boolean" do
-      it "returns true when assigning blank string" do
-        obj.doable = ''
-        obj.doable?.must_equal true
-      end
+    describe "when type is integer" do
+      let(:type) { :integer }
 
-      it "returns true when assigning nil" do
-        obj.doable = nil
-        obj.doable?.must_equal true
+      it "accepts a number" do
+        property.value = '2'
+        property.value.must_equal 2
       end
 
-      it "returns true when assigning 'J'" do
-        obj.doable = 'J'
-        obj.doable?.must_equal true
+      it "floats are rounded" do
+        property.value = 200.5
+        property.value.must_equal 200
       end
 
-      it "returns false" do
-        obj.doable = false
-        obj.doable?.must_equal false
-
-        obj.doable = 'N'
-        obj.doable?.must_equal false
+      it "nil becomes nil" do
+        property.value = nil
+        property.value.must_be_nil
       end
 
     end
 
+  end
 
+  it "#value= is ignored if the property is readonly" do
+    prop = EfoNelfo::Property.new(:name, read_only: true, default: 'untouchable')
+    prop.value = 'hey'
+    prop.value.must_equal 'untouchable'
   end
 
-  describe ".properties" do
-    let(:props) { Foo.properties }
+  it "#value= converts booleans to proper value" do
+    prop = EfoNelfo::Property.new(:name, type: :boolean)
+    prop.value = 'J'
+    prop.value.must_equal true
 
-    it "includes the properties" do
-      props[:foo].must_be_kind_of Hash
-    end
+    prop.value = 'N'
+    prop.value.must_equal false
+  end
 
-    it "includes the property options" do
-      props[:foo][:limit].must_equal 3
-    end
+  it "#to_f returns the value with decimals" do
+    prop = EfoNelfo::Property.new(:name, decimals: 4)
+    prop.value = 4000
+    prop.to_f.must_equal 0.4
+  end
+
+  it "#to_f doesn't fail when decimals is nil" do
+    subject.value = "100"
+    subject.to_f.must_equal 100.0
   end
 
-  it "#has_property? returns true when property exists" do
-    obj.has_property?(:foo).must_equal true
-    obj.has_property?(:bullshit).must_equal false
+  it "#to_f returns nil when value is NaN" do
+    subject.value = nil
+    subject.to_f.must_be_nil
   end
 
-  describe "#to_a" do
-    it "returns array of all attributes in correct order" 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"]
+  describe "#to_csv" do
+    def make_property(value, options={})
+      p = EfoNelfo::Property.new :name, options.merge(type: type)
+      p.value = value
+      p.to_csv
+    end
+
+    describe "type is :string" do
+      let(:type) { :string }
+      it { make_property("A string").must_equal "A string" }
+      it { make_property(nil).must_equal nil }
+      it { make_property("Sjøhest").encoding.must_equal Encoding::ISO_8859_1 }
     end
+
+    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(nil, type: :integer, decimals: 2).must_equal nil }
+    end
+
+    describe "type is :boolean" do
+      let(:type) { :boolean }
+      it { make_property(true).must_equal 'J' }
+      it { make_property(false).must_equal 'N' }
+      it { make_property(nil).must_equal 'J' }
+    end
+
+    describe "type is :date" do
+      let(:type) { :date }
+      it { make_property(Date.new(2013, 11, 21)).must_equal '20131121' }
+      it { make_property("20131121").must_equal "20131121" }
+      it { make_property("not a date").must_be_nil }
+      it { make_property(nil).must_be_nil }
+    end
+
   end
 
+  it "raises error when initializing with unknown make_property" do
+    lambda {
+      EfoNelfo::Property.new :name, { foo: 'illegal' }
+    }.must_raise EfoNelfo::UnknownPropertyOption
+  end
+
+  it ".validate_options! raises error when passing invalid options" do
+    lambda {
+      EfoNelfo::Property.validate_options! foo: 'bar'
+    }.must_raise EfoNelfo::UnknownPropertyOption
+  end
 end

data/spec/vl_spec.rb

@@ -4,6 +4,42 @@ describe EfoNelfo::V40::VL do
 
   let(:vl) { EfoNelfo::V40::VL.new }
 
+  it "#weight returns the weight in gram" do
+    vl.info << { field: 'VEKT', value: 250 }
+    vl.weight.must_equal 250
+  end
+
+  it "#weight returns nil when weight is not present" do
+    vl.weight.must_be_nil
+  end
+
+  it "#dimension returns nil when dimension isn't present" do
+    vl.dimension.must_be_nil
+  end
+
+  it "#dimension returns the dimension of the object" do
+    vl.info << { field: 'VEKT', value: '10' }
+    vl.info << { field: 'DIMENSJON', value: '2x10x20' }
+    vl.dimension.must_equal '2x10x20'
+  end
+
+  it "#volume returns the volume" do
+    vl.info << { field: 'VOLUM', value: '1'}
+    vl.info << { field: 'DIMENSJON', value: '2x10x20' }
+    vl.volume.must_equal '1'
+  end
+
+  it "#volume returns nil when object doesn't have volume" do
+    vl.volume.must_be_nil
+  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'}
+    vl.info << { field: 'FOO', value: 'http-not-a-url' }
+    vl.urls.must_equal [ 'http://localhost/one?two', 'http://foo.example.com/one/two/three']
+  end
+
   describe "#images" do
     it "returns nil when there are no images available" do
       vl.images.must_be_empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efo_nelfo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gudleik Rasch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,9 @@ files:
 - lib/efo_nelfo/has_many.rb
 - lib/efo_nelfo/post_head_type.rb
 - lib/efo_nelfo/post_type.rb
+- lib/efo_nelfo/properties.rb
 - lib/efo_nelfo/property.rb
+- lib/efo_nelfo/property_types.rb
 - lib/efo_nelfo/reader/csv.rb
 - lib/efo_nelfo/v40/bh.rb
 - lib/efo_nelfo/v40/bl.rb
@@ -144,6 +146,7 @@ files:
 - spec/csv_writer_spec.rb
 - spec/efo_nelfo_spec.rb
 - spec/post_type_spec.rb
+- spec/properties_spec.rb
 - spec/property_spec.rb
 - spec/samples/B028579.594.csv
 - spec/samples/B028579.595.csv
@@ -179,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Parser for EFONELFO format
@@ -188,6 +191,7 @@ test_files:
 - spec/csv_writer_spec.rb
 - spec/efo_nelfo_spec.rb
 - spec/post_type_spec.rb
+- spec/properties_spec.rb
 - spec/property_spec.rb
 - spec/samples/B028579.594.csv
 - spec/samples/B028579.595.csv