eatr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32f86bc2140f39a18bd20b0c53bcbb45a9f34e9
-  data.tar.gz: 00d35b0e2087df6c1d6bd9fdaaf55d9a9c149a5f
+  metadata.gz: 13a331caaeeed805384451146acaa5d9423db764
+  data.tar.gz: b0efdfd06adafa8ab7fa27316c3e0beef410318e
 SHA512:
-  metadata.gz: c5e27d470fb3803f3a28e782aff7566eab6b839e357115191989fa8514b0f926bc620edf286dd05d1d6c68b5748071b012df96157d9713e25ee79bf3eebc8834
-  data.tar.gz: 430e84bb49d454e3e844b820dbd6549112c5c76b3968e5ecd77fb7cd3d46679c7b59e9fb5185fc46b586aa1aef102c54f1dd0a1c0abd9a4c72384674ab667490
+  metadata.gz: 970c056f28a680aeadea3c7d1d61e654896cf9d8239c5e826b5219d24222c70a621bf5889380ec47dbc8e839b8478f7d0430616de53468a1536df9a2e994954a
+  data.tar.gz: f753ed345ccc4f30586a1037bd443cee8bfa588e16612a80e953097236e66bab43e535f7e41ba2bebb425aee4715875aa1061a7bc58f34cecb7b4e77c923f72d

data/.travis.yml

@@ -1,5 +1,4 @@
-sudo: false
 language: ruby
 rvm:
   - 2.3.0
-before_install: gem install bundler -v 1.13.1
+  - 2.4.0

data/README.md

@@ -125,9 +125,8 @@ Here is an example from the test suite of using this XML and schema defintion:
 - `required`
   - optional -- defaults to `true`
   - If a node cannot be found at the given `xpath`, an `Eatr::NodeNotFound` error is raised.
-- `value`
-  - optional -- superceeds `xpath` or `csv_header` values
-  - If set, this value will be used as the attribute's value
+- `value` or `default`
+  - optional -- used if a value at `xpath` or `csv_header` isn't found.
 - `strptime`
   - optional -- only applicable if `type` is `timestamp`
   - Format string used to parse the string into a `DateTime` object

data/lib/eatr/csv/document.rb

@@ -36,10 +36,10 @@ module Eatr
       private
 
       def value_at(row, field)
-        if field.value
-          field.value
-        elsif text = row[field.csv_header]
+        if text = row[field.csv_header]
           parse_value(field, text)
+        elsif field.value
+          parse_value(field, field.value)
         elsif field.required?
           raise ValueNotFound, "Unable to find '#{field.name}' with header '#{field.csv_header}'"
         end

data/lib/eatr/schema.rb

@@ -11,7 +11,6 @@ module Eatr
         xpath
         csv_header
         strptime
-        value
         max_length
         length
         belongs_to_one
@@ -37,6 +36,11 @@ module Eatr
       def children
         Array[*@field_attributes['children']].map { |f| Field.new(f) }
       end
+
+      def value
+        @field_attributes['value'] ||
+          @field_attributes['default']
+      end
     end
 
     def initialize(schema_hash)

data/lib/eatr/version.rb

@@ -1,3 +1,3 @@
 module Eatr
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/eatr/xml/document.rb

@@ -21,15 +21,16 @@ module Eatr
       def parse(xml_document_path)
         @namespaces = {}
 
+        parse_document = ->(f) do
+          Nokogiri::XML(f) { |config| config.strict.nonet }
+        end
+
         if File.exists?(xml_document_path)
-          file = File.open(xml_document_path)
+          doc = File.open(xml_document_path, &parse_document)
         else
-          file = StringIO.new(xml_document_path)
+          doc = StringIO.open(xml_document_path, &parse_document)
         end
 
-        doc = Nokogiri::XML(file) do |config|
-          config.strict.nonet
-        end
 
         if @schema.remove_namespaces?
           doc.remove_namespaces!
@@ -78,14 +79,16 @@ module Eatr
       end
 
       def value_at(doc, field)
-        if field.value
-          field.value
-        elsif field.xpath
+        if field.xpath
           if node = doc.at_xpath(field.xpath, @namespaces)
             parse_value(field, node.content)
+          elsif field.value
+            parse_value(field, field.value)
           elsif field.required?
             raise NodeNotFound, "Unable to find '#{field.name}' using xpath '#{field.xpath}'"
           end
+        elsif field.value
+          field.value
         end
       end
     end

data/lib/eatr/xml/schema_generator.rb

@@ -6,8 +6,10 @@ module Eatr
       end
 
       def schema(starting_point)
-        doc = Nokogiri::XML(File.open(@xml_path)) do |config|
-          config.strict.nonet
+        doc = File.open(@xml_path) do |f|
+          Nokogiri::XML(f) do |config|
+            config.strict.nonet
+          end
         end
 
         doc.remove_namespaces!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eatr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Greggory Rothmeier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -105,7 +105,6 @@ files:
 - lib/eatr/dot_template.dot
 - lib/eatr/parse_value.rb
 - lib/eatr/pipeline.rb
-- lib/eatr/pipeline_spec.rb
 - lib/eatr/schema.rb
 - lib/eatr/sql/table_generator.rb
 - lib/eatr/transformation/add_date_id.rb
@@ -139,4 +138,3 @@ signing_key:
 specification_version: 4
 summary: Configuration-based document parsing and transformation framework.
 test_files: []
-has_rdoc: 

data/lib/eatr/pipeline_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-require './lib/eatr/pipeline'
-
-describe Eatr::Pipeline do
-  it 'performs each action on an object' do
-    pipeline = described_class.new([
-      ->(str) { str.upcase },
-      ->(str) { str[1..3] },
-    ])
-
-    expect(pipeline.call("hello")).to eq("ELL")
-  end
-end