anvl-converter 0.1.2 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf8bbf0e6c172752c80233d8ecf8f85ac5c25b446f8cb45745f2996ee2b3f40
-  data.tar.gz: ce6748afb060292d02f4fca230ffdaf1e80a24e14b0466c848d33cc46d962622
+  metadata.gz: 22a4b5e253e8fa85cdafb97ee6a4221623c24fc96d2d8f521d2ebd0fdcb21968
+  data.tar.gz: 82b46195ae8f25b11279d81d793e913ca212566330cf4a494c3c7a522c9c817a
 SHA512:
-  metadata.gz: a035d6c8b29e41540049ec74ec89126a3d4aab9f330e5587ff1b8aeefb9e6eb7981cef7783f0664cde4a4ab185507787732558621ac6fbdd68896a9213523a4d
-  data.tar.gz: 496d5390b3231f236107e014dde5082e7b590bcbf1b3b9e27c9c305eaacc8c7c1d557c224c475152ef20f4b8d2acf620a49780cc6ee1b04b0d099f018f1b4aad
+  metadata.gz: 1b373884813705be4265fb7017cac11bc48b1c7fc73bcab7ce59d8ab58739e3ddf43ad923ee4192d493a1227423cdb22e71399ddb7eda5bfb494f78db1675efe
+  data.tar.gz: 799abda97fc24c972a563ee7c0a70c92e3fc60a9b4cc544892923accd91acf88e2dd64d66e2e4d433cb62c28de7b724777402d99fe845c3dc23a7e7548641f18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    anvl-converter (0.1.2)
+    anvl-converter (0.2)
       activesupport (>= 4.2.5, < 6)
 
 GEM
@@ -17,10 +17,10 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.1.5)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     rake (12.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -34,7 +34,7 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)

data/lib/anvl/core_ext/ruby/hash.rb

@@ -1,6 +1,6 @@
 class Hash
   def to_anvl
-    lines = self.map { |k, v| [k.to_s.kanvlesc, v.to_s.anvlesc].join(": ") }
+    lines = self.map { |k, v| [k.to_s.anvlesc, v.to_s.anvlesc].join(": ") }
     lines.join("\n").force_encoding(Encoding::UTF_8)
   end
 end

data/lib/anvl/core_ext/ruby/string.rb

@@ -5,7 +5,7 @@ class String
         # ignore
       elsif line.include?(":")
         k, v = line.split(":", 2)
-        sum[k.to_s.strip.kanvlunesc] = v.to_s.strip.anvlunesc
+        sum[k.to_s.strip.anvlunesc] = v.to_s.strip.anvlunesc
       elsif line.start_with?(" ")
         sum[sum.keys.last] += " " + line.strip
       end
@@ -17,19 +17,11 @@ class String
     HashWithIndifferentAccess.new(hsh)
   end
 
-  def kanvlesc
-    self.anvlesc.gsub(/:/, "%3A")
-  end
-
   def anvlesc
     self.gsub(/%/, "%25").gsub(/\n/, "%0A").gsub(/\r/, "%0D")
   end
 
-  def kanvlunesc
-    self.gsub(/%3A/, ":").anvlunesc
-  end
-
   def anvlunesc
-    self.gsub(/%25/, "%").gsub(/%0A/, "\n").gsub(/%0D/, "\r")
+    self.gsub(/%25/, "%").gsub(/%0A/, "\n").gsub(/%0D/, "\r").gsub(/%3A/, ":")
   end
 end

data/lib/anvl/version.rb

@@ -1,3 +1,3 @@
 module Anvl
-  VERSION = "0.1.2"
+  VERSION = "0.2"
 end

data/spec/fixtures/datacite.txt

@@ -0,0 +1,2 @@
+datacite: <?xml version="1.0" encoding="UTF-8"?>%0A<resource xmlns="http%3A//datacite.org/schema/kernel-3" xmlns%3Axsi="http%3A//www.w3.org/2001/XMLSchema-instance" xsi%3AschemaLocation="http%3A//datacite.org/schema/kernel-3 http%3A//schema.datacite.org/meta/kernel-3/metadata.xsd">%0A	<identifier identifierType="DOI">10.5072/FK2/sbdbtest/501</identifier> %0A	<creators>%0A		%0A	%0A		%0A			%0A		<creator> %0A			<creatorName>Meyer, Pete</creatorName>  %0A			<affiliation>HMS</affiliation> %0A		</creator>%0A			%0A		%0A			%0A		%0A	%0A		%0A			%0A		%0A	%0A	</creators>%0A	<titles>%0A		<title>X-Ray Diffraction data from demoglobin, source of 193L structure</title> %0A	</titles>%0A	<publisher> %0A		SBGrid Data Bank%0A	</publisher>%0A	<publicationYear> %0A		2017%0A	</publicationYear>%0A	<subjects>%0A		<subject> %0A			demoglobin%0A		</subject>%0A	</subjects>%0A	<contributors>%0A	%0A		%0A			%0A		<contributor contributorType="DataCollector">%0A			%0A			<contributorName>Meyer, Pete</contributorName> %0A			<affiliation>HMS</affiliation> %0A		</contributor>%0A		%0A			%0A		<contributor contributorType="Distributor">%0A			%0A			<contributorName>Meyer, Pete</contributorName> %0A			<affiliation>HMS</affiliation> %0A		</contributor>%0A		%0A	%0A		%0A			%0A		<contributor contributorType="ProjectLeader"> %0A			%0A			<contributorName>Sliz, Piotr</contributorName> %0A			<affiliation>Harvard Medical School</affiliation> %0A		</contributor>%0A		%0A	%0A	</contributors>%0A	<dates> %0A		<date dateType="Collected">  %0A			2017-11-26%0A		</date>%0A		<date dateType="Submitted">%0A			2017-11-27%0A		</date>%0A	</dates>%0A	<resourceType resourceTypeGeneral="Dataset">X-Ray Diffraction</resourceType> %0A	<relatedIdentifiers>%0A		%0A		<relatedIdentifier relatedIdentifierType="DOI" relationType="IsSourceOf" > %0A			10.2210/pdb193L/pdb%0A		</relatedIdentifier> %0A		%0A		%0A	</relatedIdentifiers>%0A	<descriptions>%0A		<description descriptionType="Abstract"> %0A			anomalous%0A		</description>%0A		%0A	</descriptions>%0A</resource>%0A
+_target: http%3A//data.sbgrid.org/dataset/501

data/spec/spec_helper.rb

@@ -7,6 +7,10 @@ SimpleCov.start
 require 'anvl'
 require 'rspec'
 
+def fixture_path
+  File.expand_path("../fixtures", __FILE__) + '/'
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/string_spec.rb

@@ -48,5 +48,12 @@ when/created: 1888
       expect(anvl[:what]).to eq("The Yeomen of the Guard")
       expect(anvl[:"when/created"]).to eq("1888")
     end
+
+    it "datacite example" do
+      str = File.read(fixture_path + 'datacite.txt')
+      anvl = str.from_anvl
+      expect(anvl[:datacite].split("\n")[2].strip).to eq("<identifier identifierType=\"DOI\">10.5072/FK2/sbdbtest/501</identifier>")
+      expect(anvl[:_target]).to eq("http://data.sbgrid.org/dataset/501")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anvl-converter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/anvl/core_ext/ruby/hash.rb
 - lib/anvl/core_ext/ruby/string.rb
 - lib/anvl/version.rb
+- spec/fixtures/datacite.txt
 - spec/hash_spec.rb
 - spec/spec_helper.rb
 - spec/string_spec.rb