efo_nelfo 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ab950b02b7049200da1e0e5de3b2e652dafd54
-  data.tar.gz: 179c82aa18e4812ac7850cdcf368bad9dfa66b43
+  metadata.gz: 7cd36136a8426da58c3b6c2ce3c4bf4c877d8909
+  data.tar.gz: a4d291f32bd8dcf424ee8838210c4630fa2f6d03
 SHA512:
-  metadata.gz: a0d8371775eed749b0f1ee7351f4cdb03fffa79d4d9bc806394e034e9f7b623d980aa535b37c55aa21472743915b73e34b65c14023d94f3518de6d0699b40f31
-  data.tar.gz: d18f93c56c3b188942a84ee39a6b5b7269f38fe732c53f799f0c00c2fe6463d8bc828e646afa30fe4a5241bf05c6b42a2f3dab6d5b1d4d2b8a96b520025d8487
+  metadata.gz: 4058a0deb87c886511770d283a52117bac37400d939b5cb93b9a3e26c98fe1904f183b785e64b14ceba37facfea22f5ef7dbe543e2413979d5ba22c6cdc8d2ce
+  data.tar.gz: 94e3115db5dece52aa977f7b9338dc78f4e52fdefcdba0fcd411af77287177d6f6a5b27747e870f9ca579a1af18c068f4a18a4b79a2c9eab93955c3165b523ea

data/lib/efo_nelfo/post_head_type.rb

@@ -1,6 +1,5 @@
 module EfoNelfo
   module PostHeadType
-    attr_accessor :source
 
     def self.included(base)
       base.send :property, :post_type,  alias: :PostType,      limit: 2, default: base.post_type

data/lib/efo_nelfo/reader/csv.rb

@@ -27,12 +27,8 @@ module EfoNelfo
         @csv = ::CSV.new @data, CSV_OPTIONS
       end
 
+      # Parses the data and returns an EfoNelfo object of some kind
       def parse
-        # Create the head object based on the first row
-        head = parse_head first
-        head.source = @data
-
-        # 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], head.version
@@ -46,15 +42,16 @@ module EfoNelfo
 
       # Returns the first row of the csv file
       def first
-        csv.first
+        return @first if @first
+        csv.rewind
+        @first = csv.first
       end
 
-      private
-
-      def parse_head(row)
-        klass = EfoNelfo::PostType.for row[0], row[2]
-        raise EfoNelfo::UnsupportedPostType.new("Don't know how to handle v#{row[2]} of #{row[0]}") if klass.nil?
-        klass.new row
+      def head
+        return @head if @head
+        klass = EfoNelfo::PostType.for first[0], first[2]
+        raise EfoNelfo::UnsupportedPostType.new("Don't know how to handle v#{first[2]} of #{first[0]}") if klass.nil?
+        @head = klass.new first
       end
 
     end

data/lib/efo_nelfo/version.rb

@@ -1,3 +1,3 @@
 module EfoNelfo
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/spec/efo_nelfo_spec.rb

@@ -84,11 +84,10 @@ describe EfoNelfo do
 
 
   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
+    it "uses the CSV reader to parse the input" do
+      input  = File.read csv('B650517.032.csv')
+      result = EfoNelfo.parse(input)
+      result.must_be_instance_of EfoNelfo::V40::BH
     end
   end
 

data/spec/parsing/bh_spec.rb

@@ -46,9 +46,4 @@ describe "parsing a BH.csv file" do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efo_nelfo
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Gudleik Rasch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler