dimus-biodiversity 0.5.3 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/biodiversity/parser.rb +2 -1
  2. data/lib/biodiversity/parser/scientific_name_clean.rb +52 -52
  3. data/spec/parser/scientific_name.spec.rb +12 -12
  4. metadata +1 -1
data/lib/biodiversity/parser.rb CHANGED
@@ -29,7 +29,8 @@ class ScientificNameParser
29
29
  :normalized => self.value,
30
30
  :canonical => self.canonical,
31
31
  :hybrid => hybrid,
32
- :details => self.details
32
+ :details => self.details,
33
+ :positions => self.pos
33
34
  })
34
35
  else
35
36
  res.merge!(self)
data/lib/biodiversity/parser/scientific_name_clean.rb CHANGED
@@ -1591,8 +1591,8 @@ module ScientificNameClean
1591
1591
  r1.extend(Rank0)
1592
1592
  else
1593
1593
  if input.index("α", index) == index
1594
- r18 = instantiate_node(SyntaxNode,input, index...(index + 2))
1595
- @index += 2
1594
+ r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
1595
+ @index += 1
1596
1596
  else
1597
1597
  terminal_parse_failure("α")
1598
1598
  r18 = nil
@@ -1602,8 +1602,8 @@ module ScientificNameClean
1602
1602
  r1.extend(Rank0)
1603
1603
  else
1604
1604
  if input.index("ββ", index) == index
1605
- r19 = instantiate_node(SyntaxNode,input, index...(index + 4))
1606
- @index += 4
1605
+ r19 = instantiate_node(SyntaxNode,input, index...(index + 2))
1606
+ @index += 2
1607
1607
  else
1608
1608
  terminal_parse_failure("ββ")
1609
1609
  r19 = nil
@@ -1613,8 +1613,8 @@ module ScientificNameClean
1613
1613
  r1.extend(Rank0)
1614
1614
  else
1615
1615
  if input.index("β", index) == index
1616
- r20 = instantiate_node(SyntaxNode,input, index...(index + 2))
1617
- @index += 2
1616
+ r20 = instantiate_node(SyntaxNode,input, index...(index + 1))
1617
+ @index += 1
1618
1618
  else
1619
1619
  terminal_parse_failure("β")
1620
1620
  r20 = nil
@@ -1624,8 +1624,8 @@ module ScientificNameClean
1624
1624
  r1.extend(Rank0)
1625
1625
  else
1626
1626
  if input.index("γ", index) == index
1627
- r21 = instantiate_node(SyntaxNode,input, index...(index + 2))
1628
- @index += 2
1627
+ r21 = instantiate_node(SyntaxNode,input, index...(index + 1))
1628
+ @index += 1
1629
1629
  else
1630
1630
  terminal_parse_failure("γ")
1631
1631
  r21 = nil
@@ -1635,8 +1635,8 @@ module ScientificNameClean
1635
1635
  r1.extend(Rank0)
1636
1636
  else
1637
1637
  if input.index("δ", index) == index
1638
- r22 = instantiate_node(SyntaxNode,input, index...(index + 2))
1639
- @index += 2
1638
+ r22 = instantiate_node(SyntaxNode,input, index...(index + 1))
1639
+ @index += 1
1640
1640
  else
1641
1641
  terminal_parse_failure("δ")
1642
1642
  r22 = nil
@@ -1646,8 +1646,8 @@ module ScientificNameClean
1646
1646
  r1.extend(Rank0)
1647
1647
  else
1648
1648
  if input.index("ε", index) == index
1649
- r23 = instantiate_node(SyntaxNode,input, index...(index + 2))
1650
- @index += 2
1649
+ r23 = instantiate_node(SyntaxNode,input, index...(index + 1))
1650
+ @index += 1
1651
1651
  else
1652
1652
  terminal_parse_failure("ε")
1653
1653
  r23 = nil
@@ -1657,8 +1657,8 @@ module ScientificNameClean
1657
1657
  r1.extend(Rank0)
1658
1658
  else
1659
1659
  if input.index("φ", index) == index
1660
- r24 = instantiate_node(SyntaxNode,input, index...(index + 2))
1661
- @index += 2
1660
+ r24 = instantiate_node(SyntaxNode,input, index...(index + 1))
1661
+ @index += 1
1662
1662
  else
1663
1663
  terminal_parse_failure("φ")
1664
1664
  r24 = nil
@@ -1668,8 +1668,8 @@ module ScientificNameClean
1668
1668
  r1.extend(Rank0)
1669
1669
  else
1670
1670
  if input.index("θ", index) == index
1671
- r25 = instantiate_node(SyntaxNode,input, index...(index + 2))
1672
- @index += 2
1671
+ r25 = instantiate_node(SyntaxNode,input, index...(index + 1))
1672
+ @index += 1
1673
1673
  else
1674
1674
  terminal_parse_failure("θ")
1675
1675
  r25 = nil
@@ -1679,8 +1679,8 @@ module ScientificNameClean
1679
1679
  r1.extend(Rank0)
1680
1680
  else
1681
1681
  if input.index("μ", index) == index
1682
- r26 = instantiate_node(SyntaxNode,input, index...(index + 2))
1683
- @index += 2
1682
+ r26 = instantiate_node(SyntaxNode,input, index...(index + 1))
1683
+ @index += 1
1684
1684
  else
1685
1685
  terminal_parse_failure("μ")
1686
1686
  r26 = nil
@@ -3999,8 +3999,8 @@ module ScientificNameClean
3999
3999
  i6, s6 = index, []
4000
4000
  i7 = index
4001
4001
  if input.index("Å", index) == index
4002
- r8 = instantiate_node(SyntaxNode,input, index...(index + 2))
4003
- @index += 2
4002
+ r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
4003
+ @index += 1
4004
4004
  else
4005
4005
  terminal_parse_failure("Å")
4006
4006
  r8 = nil
@@ -4009,8 +4009,8 @@ module ScientificNameClean
4009
4009
  r7 = r8
4010
4010
  else
4011
4011
  if input.index("Ö", index) == index
4012
- r9 = instantiate_node(SyntaxNode,input, index...(index + 2))
4013
- @index += 2
4012
+ r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
4013
+ @index += 1
4014
4014
  else
4015
4015
  terminal_parse_failure("Ö")
4016
4016
  r9 = nil
@@ -4019,8 +4019,8 @@ module ScientificNameClean
4019
4019
  r7 = r9
4020
4020
  else
4021
4021
  if input.index("Á", index) == index
4022
- r10 = instantiate_node(SyntaxNode,input, index...(index + 2))
4023
- @index += 2
4022
+ r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
4023
+ @index += 1
4024
4024
  else
4025
4025
  terminal_parse_failure("Á")
4026
4026
  r10 = nil
@@ -4029,8 +4029,8 @@ module ScientificNameClean
4029
4029
  r7 = r10
4030
4030
  else
4031
4031
  if input.index("Ø", index) == index
4032
- r11 = instantiate_node(SyntaxNode,input, index...(index + 2))
4033
- @index += 2
4032
+ r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
4033
+ @index += 1
4034
4034
  else
4035
4035
  terminal_parse_failure("Ø")
4036
4036
  r11 = nil
@@ -4039,8 +4039,8 @@ module ScientificNameClean
4039
4039
  r7 = r11
4040
4040
  else
4041
4041
  if input.index("Ô", index) == index
4042
- r12 = instantiate_node(SyntaxNode,input, index...(index + 2))
4043
- @index += 2
4042
+ r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
4043
+ @index += 1
4044
4044
  else
4045
4045
  terminal_parse_failure("Ô")
4046
4046
  r12 = nil
@@ -4049,8 +4049,8 @@ module ScientificNameClean
4049
4049
  r7 = r12
4050
4050
  else
4051
4051
  if input.index("Š", index) == index
4052
- r13 = instantiate_node(SyntaxNode,input, index...(index + 2))
4053
- @index += 2
4052
+ r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
4053
+ @index += 1
4054
4054
  else
4055
4055
  terminal_parse_failure("Š")
4056
4056
  r13 = nil
@@ -4059,8 +4059,8 @@ module ScientificNameClean
4059
4059
  r7 = r13
4060
4060
  else
4061
4061
  if input.index("Ś", index) == index
4062
- r14 = instantiate_node(SyntaxNode,input, index...(index + 2))
4063
- @index += 2
4062
+ r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
4063
+ @index += 1
4064
4064
  else
4065
4065
  terminal_parse_failure("Ś")
4066
4066
  r14 = nil
@@ -4069,8 +4069,8 @@ module ScientificNameClean
4069
4069
  r7 = r14
4070
4070
  else
4071
4071
  if input.index("Č", index) == index
4072
- r15 = instantiate_node(SyntaxNode,input, index...(index + 2))
4073
- @index += 2
4072
+ r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
4073
+ @index += 1
4074
4074
  else
4075
4075
  terminal_parse_failure("Č")
4076
4076
  r15 = nil
@@ -4079,8 +4079,8 @@ module ScientificNameClean
4079
4079
  r7 = r15
4080
4080
  else
4081
4081
  if input.index("Ķ", index) == index
4082
- r16 = instantiate_node(SyntaxNode,input, index...(index + 2))
4083
- @index += 2
4082
+ r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
4083
+ @index += 1
4084
4084
  else
4085
4085
  terminal_parse_failure("Ķ")
4086
4086
  r16 = nil
@@ -4089,8 +4089,8 @@ module ScientificNameClean
4089
4089
  r7 = r16
4090
4090
  else
4091
4091
  if input.index("Ł", index) == index
4092
- r17 = instantiate_node(SyntaxNode,input, index...(index + 2))
4093
- @index += 2
4092
+ r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
4093
+ @index += 1
4094
4094
  else
4095
4095
  terminal_parse_failure("Ł")
4096
4096
  r17 = nil
@@ -4099,8 +4099,8 @@ module ScientificNameClean
4099
4099
  r7 = r17
4100
4100
  else
4101
4101
  if input.index("É", index) == index
4102
- r18 = instantiate_node(SyntaxNode,input, index...(index + 2))
4103
- @index += 2
4102
+ r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
4103
+ @index += 1
4104
4104
  else
4105
4105
  terminal_parse_failure("É")
4106
4106
  r18 = nil
@@ -4109,8 +4109,8 @@ module ScientificNameClean
4109
4109
  r7 = r18
4110
4110
  else
4111
4111
  if input.index("Ž", index) == index
4112
- r19 = instantiate_node(SyntaxNode,input, index...(index + 2))
4113
- @index += 2
4112
+ r19 = instantiate_node(SyntaxNode,input, index...(index + 1))
4113
+ @index += 1
4114
4114
  else
4115
4115
  terminal_parse_failure("Ž")
4116
4116
  r19 = nil
@@ -5454,9 +5454,9 @@ module ScientificNameClean
5454
5454
 
5455
5455
  i0 = index
5456
5456
  if input.index("Æ", index) == index
5457
- r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
5457
+ r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
5458
5458
  r1.extend(CapDigraph0)
5459
- @index += 2
5459
+ @index += 1
5460
5460
  else
5461
5461
  terminal_parse_failure("Æ")
5462
5462
  r1 = nil
@@ -5465,9 +5465,9 @@ module ScientificNameClean
5465
5465
  r0 = r1
5466
5466
  else
5467
5467
  if input.index("Œ", index) == index
5468
- r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
5468
+ r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
5469
5469
  r2.extend(CapDigraph1)
5470
- @index += 2
5470
+ @index += 1
5471
5471
  else
5472
5472
  terminal_parse_failure("Œ")
5473
5473
  r2 = nil
@@ -5507,9 +5507,9 @@ module ScientificNameClean
5507
5507
 
5508
5508
  i0 = index
5509
5509
  if input.index("æ", index) == index
5510
- r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
5510
+ r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
5511
5511
  r1.extend(Digraph0)
5512
- @index += 2
5512
+ @index += 1
5513
5513
  else
5514
5514
  terminal_parse_failure("æ")
5515
5515
  r1 = nil
@@ -5518,9 +5518,9 @@ module ScientificNameClean
5518
5518
  r0 = r1
5519
5519
  else
5520
5520
  if input.index("œ", index) == index
5521
- r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
5521
+ r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
5522
5522
  r2.extend(Digraph1)
5523
- @index += 2
5523
+ @index += 1
5524
5524
  else
5525
5525
  terminal_parse_failure("œ")
5526
5526
  r2 = nil
@@ -5908,9 +5908,9 @@ module ScientificNameClean
5908
5908
  end
5909
5909
 
5910
5910
  if input.index("×", index) == index
5911
- r0 = instantiate_node(SyntaxNode,input, index...(index + 2))
5911
+ r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
5912
5912
  r0.extend(MultiplicationSign0)
5913
- @index += 2
5913
+ @index += 1
5914
5914
  else
5915
5915
  terminal_parse_failure("×")
5916
5916
  r0 = nil
data/spec/parser/scientific_name.spec.rb CHANGED
@@ -14,18 +14,18 @@ describe ScientificNameClean do
14
14
  end
15
15
  end
16
16
 
17
- # it 'should generate new test_file' do
18
- # new_test = open(File.expand_path(dir + "../../spec/parser/test_data_new.txt"),'w')
19
- # read_test_file do |y|
20
- # if y[:comment]
21
- # new_test.write y[:comment]
22
- # else
23
- # name = y[:name]
24
- # jsn = json(y[:name])# rescue puts(y[:name])
25
- # new_test.write("#{name}|#{jsn}\n")
26
- # end
27
- # end
28
- # end
17
+ it 'should generate new test_file' do
18
+ new_test = open(File.expand_path(dir + "../../spec/parser/test_data_new.txt"),'w')
19
+ read_test_file do |y|
20
+ if y[:comment]
21
+ new_test.write y[:comment]
22
+ else
23
+ name = y[:name]
24
+ jsn = json(y[:name])# rescue puts(y[:name])
25
+ new_test.write("#{name}|#{jsn}\n")
26
+ end
27
+ end
28
+ end
29
29
 
30
30
  it 'should generate reasonable output if parser failed' do
31
31
  sn = 'ddd sljlkj 3223452432'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dimus-biodiversity
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Mozzherin