wikipedia-client 1.7.0 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/Gemfile.lock +1 -1
- data/README.textile +4 -0
- data/lib/wikipedia/client.rb +1 -1
- data/lib/wikipedia/page.rb +45 -10
- data/lib/wikipedia/version.rb +1 -1
- data/spec/fixtures/Sealand_Dynasty.json +1 -0
- data/spec/fixtures/sanitization_samples/J_S_Bach-raw.txt +26 -0
- data/spec/fixtures/sanitization_samples/J_S_Bach-sanitized.txt +4 -0
- data/spec/fixtures/sanitization_samples/Metro_Goldwyn_Mayer-sanitized.txt +1 -1
- data/spec/fixtures/sanitization_samples/Middle_Ages-raw.txt +2 -2
- data/spec/fixtures/sanitization_samples/SMS_Elbing-sanitized.txt +1 -1
- data/spec/fixtures/sanitization_samples/Sashimi-sanitized.txt +2 -3
- data/spec/fixtures/sanitization_samples/Velociraptor-sanitized.txt +1 -1
- data/spec/lib/client_spec.rb +13 -0
- metadata +9 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d8024a11ef6429ca95c92e25f64702723e4ef490
|
4
|
+
data.tar.gz: aefa68138e1a5f9bd4b764628c51577f2d82e887
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fe5bc76004bc8dca7530f87ac9b2c719c14bf45e81b9285da6e6f08c2b894c2e24e6baf8a5242a46611ec6e359c16c9be87088420e4da24077dc0e6dce04dca4
|
7
|
+
data.tar.gz: 951a31d710ac2e3a69c10b37bb4e07a456e5bf6a77e5607f06f5eb46ccaf7bbaaf13612d34d5169119cebcd60dfde8cf036448311e0228bb92b203c4809c9730
|
data/.rubocop.yml
CHANGED
data/Gemfile.lock
CHANGED
data/README.textile
CHANGED
@@ -64,6 +64,10 @@ page.image_descriptionurls
|
|
64
64
|
|
65
65
|
=> ["http://en.wikipedia.org/wiki/File:Getting_Things_Done.jpg"]
|
66
66
|
|
67
|
+
page.main_image_url
|
68
|
+
|
69
|
+
=> "https://upload.wikimedia.org/wikipedia/en/e/e1/Getting_Things_Done.jpg"
|
70
|
+
|
67
71
|
page.coordinates
|
68
72
|
|
69
73
|
=> [48.853, 2.3498, "", "earth"]
|
data/lib/wikipedia/client.rb
CHANGED
@@ -34,7 +34,7 @@ module Wikipedia
|
|
34
34
|
def request_page( title, options = {} )
|
35
35
|
request( {
|
36
36
|
action: 'query',
|
37
|
-
prop: %w[ info revisions links extlinks images categories coordinates templates extracts ],
|
37
|
+
prop: %w[ info revisions links extlinks images categories coordinates templates extracts pageimages],
|
38
38
|
rvprop: 'content',
|
39
39
|
inprop: 'url',
|
40
40
|
explaintext: '',
|
data/lib/wikipedia/page.rb
CHANGED
@@ -73,11 +73,15 @@ module Wikipedia
|
|
73
73
|
end
|
74
74
|
|
75
75
|
def image_urls
|
76
|
-
image_metadata.map(&:image_url)
|
76
|
+
image_metadata.map(&:image_url) unless image_metadata.nil?
|
77
77
|
end
|
78
78
|
|
79
79
|
def image_descriptionurls
|
80
|
-
image_metadata.map(&:image_descriptionurl)
|
80
|
+
image_metadata.map(&:image_descriptionurl) unless image_metadata.nil?
|
81
|
+
end
|
82
|
+
|
83
|
+
def main_image_url
|
84
|
+
page['thumbnail']['source'].sub(/\/thumb/, '').sub(/\/[^\/]*$/, '') if page['thumbnail']
|
81
85
|
end
|
82
86
|
|
83
87
|
def coordinates
|
@@ -103,11 +107,36 @@ module Wikipedia
|
|
103
107
|
|
104
108
|
# rubocop:disable Metrics/MethodLength
|
105
109
|
# rubocop:disable Metrics/AbcSize
|
106
|
-
def self.sanitize(
|
110
|
+
def self.sanitize(s)
|
107
111
|
return unless s
|
108
112
|
|
109
|
-
#
|
110
|
-
|
113
|
+
# Transform punctuation templates
|
114
|
+
# Em dash (https://en.wikipedia.org/wiki/Template:Em_dash)
|
115
|
+
s.gsub!(/\{\{(em dash|emdash)\}\}/i, '—')
|
116
|
+
# En dash (https://en.wikipedia.org/wiki/Template:En_dash)
|
117
|
+
s.gsub!(/\{\{(en dash|ndash|nsndns)\}\}/i, '–')
|
118
|
+
# Spaced en dashes (https://en.wikipedia.org/wiki/Template:Spaced_en_dash_space)
|
119
|
+
s.gsub!(/\{\{(spaced e?n\s?dash( space)?|snds?|spndsp|sndashs|spndashsp)\}\}/i, ' – ')
|
120
|
+
# Bold middot
|
121
|
+
s.gsub!(/\{\{(·|dot|middot|\,)\}\}/i, ' <b>·</b>')
|
122
|
+
# Bullets
|
123
|
+
s.gsub!(/\{\{(•|bull(et)?)\}\}/i, ' •')
|
124
|
+
# Forward Slashes (https://en.wikipedia.org/wiki/Template:%5C)
|
125
|
+
s.gsub!(/\{\{\\\}\}/i, ' /')
|
126
|
+
|
127
|
+
# Transform language specific blocks
|
128
|
+
s.gsub!(/\{\{lang[\-\|]([a-z]+)\|([^\|\{\}]+)(\|[^\{\}]+)?\}\}/i, '<span lang="\1">\2</span>')
|
129
|
+
|
130
|
+
# Parse Old Style Date template blocks
|
131
|
+
# Old Style Dates (https://en.wikipedia.org/wiki/Template:OldStyleDate)
|
132
|
+
s.gsub!(/\{\{OldStyleDate\|([^\|]*)\|([^\|]*)\|([^\|]*)\}\}/i, '\1 [<abbr title="Old Style">O.S.</abbr> \3] \2')
|
133
|
+
# Old Style Dates with different years (https://en.wikipedia.org/wiki/Template:OldStyleDateDY)
|
134
|
+
s.gsub!(/\{\{OldStyleDateDY\|([^\|]*)\|([^\|]*)\|([^\|]*)\}\}/i, '\1 \2 [<abbr title="Old Style">O.S.</abbr> \3]')
|
135
|
+
# Old Style Dates with no year (https://en.wikipedia.org/wiki/Template:OldStyleDateNY)
|
136
|
+
s.gsub!(/\{\{OldStyleDateNY\|([^\|]*)\|([^\|]*)\}\}/i, '\1 [<abbr title="Old Style">O.S.</abbr> \2]')
|
137
|
+
|
138
|
+
# strip anything else inside curly braces!
|
139
|
+
s.gsub!(/\{\{[^\{\}]+?\}\}[\;\,]?/, '') while s =~ /\{\{[^\{\}]+?\}\}[\;\,]?/
|
111
140
|
|
112
141
|
# strip info box
|
113
142
|
s.sub!(/^\{\|[^\{\}]+?\n\|\}\n/, '')
|
@@ -117,8 +146,8 @@ module Wikipedia
|
|
117
146
|
s.gsub!(/\[\[([^\]\|]+?)\]\]/, '\1')
|
118
147
|
|
119
148
|
# strip images and file links
|
120
|
-
s.gsub!(/\[\[Image:
|
121
|
-
s.gsub!(/\[\[File:
|
149
|
+
s.gsub!(/\[\[Image:(.*?(?=\]\]))??\]\]/, '')
|
150
|
+
s.gsub!(/\[\[File:(.*?(?=\]\]))??\]\]/, '')
|
122
151
|
|
123
152
|
# convert bold/italic to html
|
124
153
|
s.gsub!(/'''''(.+?)'''''/, '<b><i>\1</i></b>')
|
@@ -126,16 +155,22 @@ module Wikipedia
|
|
126
155
|
s.gsub!(/''(.+?)''/, '<i>\1</i>')
|
127
156
|
|
128
157
|
# misc
|
158
|
+
s.gsub!(/(\d)<ref[^<>]*>[\s\S]*?<\/ref>(\d)/, '\1 – \2')
|
129
159
|
s.gsub!(/<ref[^<>]*>[\s\S]*?<\/ref>/, '')
|
160
|
+
s.gsub!(/<ref(.*?(?=\/>))??\/>/, '')
|
130
161
|
s.gsub!(/<!--[^>]+?-->/, '')
|
162
|
+
s.gsub!(/\(\s+/, '(')
|
131
163
|
s.gsub!(' ', ' ')
|
132
164
|
s.strip!
|
133
165
|
|
134
166
|
# create paragraphs
|
135
167
|
sections = s.split("\n\n")
|
136
|
-
|
137
|
-
|
138
|
-
|
168
|
+
s =
|
169
|
+
if sections.size > 1
|
170
|
+
sections.map { |paragraph| "<p>#{paragraph.strip}</p>" }.join("\n")
|
171
|
+
else
|
172
|
+
"<p>#{s}</p>"
|
173
|
+
end
|
139
174
|
|
140
175
|
s
|
141
176
|
end
|
data/lib/wikipedia/version.rb
CHANGED
@@ -0,0 +1 @@
|
|
1
|
+
{"continue":{"plcontinue":"27746595|0|Agum_III","tlcontinue":"27746595|828|Citation/CS1","continue":"||info|revisions|extlinks|images|categories|coordinates|extracts"},"warnings":{"extracts":{"*":"\"exlimit\" was too large for a whole article extracts request, lowered to 1."}},"query":{"normalized":[{"from":"Sealand_Dynasty","to":"Sealand Dynasty"}],"pages":{"27746595":{"pageid":27746595,"ns":0,"title":"Sealand Dynasty","contentmodel":"wikitext","pagelanguage":"en","pagelanguagehtmlcode":"en","pagelanguagedir":"ltr","touched":"2017-09-02T16:43:05Z","lastrevid":798562411,"length":12810,"fullurl":"https://en.wikipedia.org/wiki/Sealand_Dynasty","editurl":"https://en.wikipedia.org/w/index.php?title=Sealand_Dynasty&action=edit","canonicalurl":"https://en.wikipedia.org/wiki/Sealand_Dynasty","revisions":[{"contentformat":"text/x-wiki","contentmodel":"wikitext","*":"The '''Sealand Dynasty''', (<small>URU.K\u00d9</small><sup>KI</sup><ref group=nb>Where \u0160E\u0160-\u1e2aA of King List A and \u0160E\u0160-K\u00d9-KI of King List B are read as URU.K\u00d9.KI</ref><ref>{{ cite journal | title = The Home of the First Sealand Dynasty | author = W. G. Lambert | journal = Journal of Cuneiform Studies | volume = 26 | number = 4 | year = 1974 | pages = 208\u2013209 }}</ref><ref>{{ cite book | title = Ancient Mesopotamia: Portrait of a Dead Civilization | author = A. Leo Oppenheim | publisher = University of Chicago | year = 1977 | page = 414 }}</ref>) or the 2nd Dynasty of [[Babylon]] (although it was independent of [[Amorite]] ruled Babylon), very speculatively c. 1732\u20131460 BC ([[short chronology]]), is an enigmatic series of kings attested to primarily in laconic references in the ''king lists A'' and ''B'', and as contemporaries recorded on the [[Assyria]]n ''Synchronistic king list A.117''. The dynasty, which had broken free of the short lived, and by this time crumbling [[Babylonian Empire]], was named for the province in the far south of [[Mesopotamia]], a swampy region bereft of large settlements which gradually expanded southwards with the silting up of the mouths of the [[Tigris]] and [[Euphrates]] rivers. The later kings bore fanciful pseudo-[[Sumerian language|Sumerian]] names and harked back to the glory days of the dynasty of [[Isin]]. The third king of the dynasty was even named for the ultimate king of the dynasty of Isin, [[Damiq-ilishu|Damiq-ili\u0161u]]. Despite these cultural motifs, the population predominantly bore Akkadian names and wrote and spoke in the [[Akkadian language]]. There is circumstantial evidence that their rule extended at least briefly to [[Babylon]] itself.\n\n==The King list tradition==\n\nThe king list references which bear witness to the sequence of Sealand kings are summarized below:\n\n{| class=\"wikitable\"\n|- bgcolor=\"#CCCCCC\"\n! Position !! King List A<ref group=i name=kla>Babylonian ''King List A'', BM 33332, i 4 to 14 where the names are abbreviated but give their lengths of reign.</ref> !! King List B<ref group=i name=klb>Babylonian ''King List B'', BM 38122, reverse 1 to 13.</ref> !! Purported reign<ref group=i name=kla/> !! Contemporary\n|-\n| 1 || Ilima[ii] || Ilum-ma-il\u012b || 60 years || [[Samsu-iluna]] and [[Abi-Eshuh|Abi-e\u0161uh]] (Babylon)<ref group=i name=early>''Chronicle of Early Kings'', tablets BM 26472 and BM 96152, B rev. (Ilum-ma-il\u012b) 7-10 (Ea-g\u00e2mil) 12\u201314.</ref>\n|-\n| 2 || Ittili || Itti-ili-n\u012bb\u012b || 56 years ||\n|-\n| 3 || Damqili || Damqi-ili\u0161u II || 36 years || [[Adasi]] (Assyria)<ref group=i name=sync>''Synchronistic King List A.117'', Assur 14616c, i 1 to 10.</ref>\n|-\n| 4 || I\u0161ki || I\u0161kibal || 15 years || [[Bel-bani|Belu-b\u0101ni]] (Assyria)<ref group=i name=sync/>\n|-\n| 5 || \u0160u\u0161\u0161i, brother|| \u0160u\u0161\u0161i || 24 years || [[Libaya|Lubaia]] (Assyria)<ref group=i name=sync/>\n|-\n| 6 || Gulki\u2026|| Gulki\u0161ar || 55 years || [[Sharma-Adad I]] (Assyria)<ref group=i name=sync/>\n|-\n| 6a || || <sup>m</sup><small>DI\u0160-U-EN</small><ref group=i name=sync/> || ? || [[Iptar-Sin|<small>LIK.KUD</small>-\u0160ama\u0161]] (Assyria)<ref group=i name=sync/>\n|-\n| 7 || Pe\u0161-gal || Pe\u0161galdarame\u0161,<ref group=nb>Given as PE\u0160.GAL-D\u00c0RA.MA\u0160.</ref> his son, same || 50 years || [[Bazaya|Bazaia]] (Assyria)<ref group=i name=sync/>\n|-\n| 8 || A-a-d\u00e0ra || Ayadaragalama,<ref group=nb>Given as A-D\u00c0RA-GALAM.MA.</ref> his son, same || 28 years || [[Lullaya]] (Assyria)<ref group=i name=sync/>\n|-\n| 9 || Ekurul || Akurduana || 26 years || [[Shu-Ninua]] (Assyria)<ref group=i name=sync/>\n|-\n| 10 || Melamma || Melamkurkurra || 7 years || [[Sharma-Adad II]] (Assyria)<ref group=i name=sync/>\n|-\n| 11 || Eaga || Ea-gam[il] || 9 years || [[Erishum III]] (Assyria)<ref group=i name=sync/>\n|}\n\nAn additional king list<ref group=i>Formed from BM 35572 and eleven other fragments.</ref> provides fragmentary readings of the earlier dynastic monarchs.<ref>{{ cite book | title = Reallexikon der Assyriologie und Vorderasiatischen Arch\u00e4ologie: Meek \u2013 Mythologie | author = J. A. Brinkman | editor = Dietz Otto Edzard | publisher = Walter De Gruyter | volume = 8 | year = 1999 | page = 7 }}</ref> The ''king list A'' totals the reigns to give a length of 368 years for this dynasty. The ''Synchronistic King List A.117'' gives the sequence from Damqi-ili\u0161u onward, but includes an additional king between Gulki\u0161ar and Pe\u0161galdarame\u0161, <sup>m</sup><small>DI\u0160-U-EN</small> (reading unknown). This source is considered reliable in this respect because the forms of the names of Pe\u0161galdarame\u0161 and Ayadaragalama match those on recently published contemporary economic tablets (see below).<ref name=dalley>{{ cite book | title = Cornell University Studies in Assyriology and Sumerology. Volume 9 Babylonian Tablets from the First Sealand Dynasty in the Schoyen Collection | author = Stephanie Dalley | authorlink=Stephanie Dalley | publisher = CDL Press | year = 2009 | pages = 1\u201316 }}</ref>\n\n==Evidence of individual reigns==\n\nThe sources for this dynasty are sparse in the extreme, with insufficient evidence to enable their placement in absolute chronology or to support the somewhat dubious length of reigns alleged on the king list A.\n\n===Ilum-ma-il\u012b===\n\n'''Ilum-ma-il\u012b''',<ref group=i>Tablet Ashm. 1922.353 from Larsa.</ref> or Iliman (<sup>m</sup>ili-ma-an),<ref group=i name=klb/> the founder of the dynasty, is known from the account of his exploits in the ''[[Chronicle of Early Kings]]''<ref group=i name=early/> which describes his conflicts with his Amorite Babylonian contemporaries Samsu-iluna and Abi-e\u0161u\u1e2b. It records that he \u201cattacked and brought about the defeat of (Samsu-iluna\u2019s) army.\u201d He is thought to have conquered [[Nippur]] late in Samsu-iluna\u2019s reign <ref>{{ cite book | title = Assyrian and Babylonian chronicles | author = Albert Kirk Grayson | publisher = J. J. Augustin | year = 1975 | page = 221 }}</ref> as there are legal documents from Nippur dated to his reign.<ref group=i>Five legal tablets such as CBS 4956, published in Chiera (1914), CBS 11013, published as BE VI 2 text 68, 3N-T 87, UM 55-21-239 catalogued as SAOC 44 text 12, and OIMA 1 45, from Nippur.</ref> [[Abi-eshuh]], the [[Amorite]] king of Babylon, and [[Samsu-iluna]]\u2019s son and successor, \u201cset out to conquer Ilum-ma-il\u012b,\u201d by damming the [[Tigris]], to flush him out of his swampy refuge, an endeavor which was apparently confounded by Ilum-ma-il\u012b\u2019s superior use of the terrain.\n\n===Damqi-ili\u0161u===\n\nThe last surviving year-name for [[Ammi-ditana]] commemorates the \u201cyear in which (he) destroyed the city wall of [[Der (Sumer)|Der]]/Udinim built by the army of '''Damqi-ili\u0161u'''.<ref group=i>Tablets MCS 2 52, YOS 13 359.</ref> This is the only current contemporary indication of the spelling of his name, contrasting with that of the earlier king of Isin.<ref>{{ cite book | title = The world's oldest literature: studies in Sumerian belles-lettres | author = William W. Hallo | publisher = BRILL | year = 2009 | page = 183 }}</ref>\n\n===Gulki\u0161ar===\n\n'''Gulki\u0161ar''', meaning \u201craider of the earth,\u201d has left few traces of his apparently lengthy reign. He was the subject of a royal epic concerning his enmity with [[Samsu-Ditana|Samsu-dit\u0101na]], the last king of the first dynasty of Babylon.<ref>{{ cite journal | title = 15) On the origin of the goddess I\u0161tar-of-the-Sealand, Ayyab\u012btu | author = Odette Boivin | journal = Nouvelles Assyriologiques Br\u00e8ves et Utilitaires (NABU) | year = 2016 | issue = 1 (Mars) | page = 25 }}</ref> The colophon of a tablet giving a chemical recipe for glaze<ref group=i>Tablet BM 120960 thought to have been recovered from Tall 'Umar (Seleucia) on the Tigris.</ref> reads \u201cproperty of a priest of Marduk in Eridu,\u201d thought to be a quarter of Babylon rather than the city of Eridu, is dated ''mu.us-sa Gul-ki-\u0161ar lugal-e'' \"year after (the one when) Gul-kisar (became?) king.\u201d<ref>{{ cite book | title = Glass and Glassmaking in Ancient Mesopotamia | author = A. Leo Oppenheim | publisher = The Corning Museum of Glass Press | year = 1970 | page = 60 }}</ref> A kudurru<ref group=i>Kudurru in the University Museum, Philadelphia, BE I/1 83 15.</ref> of the period of Babylonian king [[Enlil-nadin-apli|Enlil-n\u0101din-apli]], c. 1103\u20131100 BC, records the outcome of an inquiry instigated by the king into the ownership of a plot of land claimed by a temple estate. The governors of Bit-Sin-magir and Sealand, upheld the claim based on the earlier actions of Gulki\u0161ar who had \u201cdrawn for Nanse, his divine mistress, a land boundary.\u201d It is an early example of a ''Distanzangaben'' statement recording that 696 years had elapsed between [[Nebuchadnezzar I|Nab\u00fb-kudurr\u012b-u\u1e63ur]], Enlil-n\u0101din-apli\u2019s father, and Gulki\u0161ar.<ref name=brinkman>{{ cite book | title = A political history of post-Kassite Babylonia, 1158\u2013722 B.C. | author = J. A. Brinkman | publisher = Analecta Orientalia | year = 1968 | page = 118 }}</ref>\n\n===Pe\u0161galdarame\u0161 and Ayadaragalama===\n\n'''Pe\u0161galdarame\u0161''', \u201cson of the ibex,\u201d and '''Ayadaragalama''', \u201cson of the clever stag,\u201d were successive kings and descendants (<small>DUMU</small>, \"sons\" in its broadest meaning) of Gulki\u0161ar.\n\nRecently (2009) published tablets mainly from the [[Schoyen Collection|Martin Sch\u00f8yen collection]], the largest privately held collection of manuscripts to be assembled during the 20th century, cover a 15 to 18 year period extending over part of each king\u2019s reign. They seem to originate from a single cache but their provenance was lost after languishing in smaller private collections since their acquisition on the antiquities market a century earlier.<ref name=dalley/>{{rp|v}} The tablets include letters, receipts, ledgers, personnel rosters, etc., and provide year-names and references which hint at events of the period. Messengers from [[Elam]] are provisioned,<ref group=i>MS 2200/40 and MS 2200/455.</ref> Anzak, a god of [[Dilmun]] (ancient Bahrain) appears as a theophoric element in names,<ref group=i>MS 2200/394, 444, 321 and so on.</ref> and N\u016br-Bau asks whether he should detain the boats of [[Eshnunna|E\u0161nunna]],<ref group=i>MS 2200/3.</ref> a rare late reference to this once thriving Sumerian conurbation. In addition to normal commercial activity, two omen texts<ref group=i>R. Kovacs 5304 and 5309.</ref> from another private collection are dated to the reign of Pe\u0161galdarame\u0161 and a kurugu-hymn mentions Ayadaragalama.<ref group=i>R. Kovacs 5306.</ref> A variant version of the [[Epic of Gilgamesh|Epic of Gilgame\u0161]] relocates the hero to [[Ur]] and is a piece from this period.<ref name=dalley/>\n\nAyadaragalama\u2019s reign seems to have been eventful, as a year-name records expelling the \u201cmassed might of two enemies,\u201d speculated to be [[Elamites]] and [[Kassites]], the Kassites having previously deposed the [[Amorites]] as rulers in Babylon. Another records the building of a \u201cgreat ring against the Kal\u0161u (Kassite) enemy\u201d and a third records the \u201cyear when his land rebelled.\u201d A year-name gives \u201cyear when Ayadaragalama was king \u2013 after Enlil established (for him?) the shepherding of the whole earth,\u201d and a list of gods includes [[Marduk]] and [[Sarpanitum]], the tutelary deities of the Sealand.<ref group=i>MS 2200/81.</ref><ref name=dalley/> Excavations conducted between 2013 and 2017 at Tell Khaiber, around 20 km from [[Ur]], have revealed the foundations of a large mudbrick fortress with an unusual arrangement of perimeter close-set towers and is dated, by an archive of almost 200 administrative tablets, to Ayadaragalama.<ref>{{cite web|url=https://www.theguardian.com/science/2017/sep/01/castle-sealand-kings-ancient-iraqs-rebel-rulers|title=Castle of the Sealand kings: Discovering ancient Iraq\u2019s rebel rulers - The Guardian|website=www.theguardian.com/|date=2017-09-01|accessdate=2017-09-02}}</ref>\n\nA neo-Babylonian official took a bronze band dedicatory inscription of ''A-ia-da-a-ra'', <small>MAN \u0160\u00da</small> \u201cking of the world,\u201d to [[Tell en-Nasbeh]], probably as an antique curio, where it was discarded to be found in the 20th century.\n\n===Ea-g\u00e2mil===\n\n'''Ea-g\u00e2mil''', the ultimate king of the dynasty, fled to [[Elam]] ahead of an invading horde led by [[Kassites|Kassite]] chief [[Ulamburiash|Ulam-Buria\u0161]], brother of the king of Babylon [[Kashtiliash III]], who conquered the Sealand, incorporated it into [[Babylonia]] and \u201cmade himself master of the land.\u201d\n\n==Inscriptions==\n\n<references group=\"i\"/>\n\n==Notes==\n\n<references group=\"nb\"/>\n\n==References==\n\n{{Reflist}}\n\n{{Babylonian kings}}\n\n{{DEFAULTSORT:Sealand Dynasty}}\n[[Category:States and territories established in the 18th century BC]]\n[[Category:States and territories disestablished in the 15th century BC]]\n[[Category:Babylonian kings]]"}],"links":[{"ns":0,"title":"Abi-Eshuh"},{"ns":0,"title":"Abi-Rattash"},{"ns":0,"title":"Abi-eshuh"},{"ns":0,"title":"Abisare"},{"ns":0,"title":"Adad-apla-iddina"},{"ns":0,"title":"Adad-shuma-iddina"},{"ns":0,"title":"Adad-shuma-usur"},{"ns":0,"title":"Adasi"},{"ns":0,"title":"Agum I"},{"ns":0,"title":"Agum II"}],"extlinks":[{"*":"https://www.theguardian.com/science/2017/sep/01/castle-sealand-kings-ancient-iraqs-rebel-rulers"}],"categories":[{"ns":14,"title":"Category:Babylonian kings"},{"ns":14,"title":"Category:States and territories disestablished in the 15th century BC"},{"ns":14,"title":"Category:States and territories established in the 18th century BC"}],"templates":[{"ns":10,"title":"Template:Babylonian kings"},{"ns":10,"title":"Template:Cite book"},{"ns":10,"title":"Template:Cite journal"},{"ns":10,"title":"Template:Cite web"},{"ns":10,"title":"Template:Main other"},{"ns":10,"title":"Template:Navbox"},{"ns":10,"title":"Template:Reflist"},{"ns":10,"title":"Template:Rp"},{"ns":828,"title":"Module:Arguments"},{"ns":828,"title":"Module:Check for unknown parameters"}],"extract":"The Sealand Dynasty, (URU.K\u00d9KI) or the 2nd Dynasty of Babylon (although it was independent of Amorite ruled Babylon), very speculatively c. 1732\u20131460 BC (short chronology), is an enigmatic series of kings attested to primarily in laconic references in the king lists A and B, and as contemporaries recorded on the Assyrian Synchronistic king list A.117. The dynasty, which had broken free of the short lived, and by this time crumbling Babylonian Empire, was named for the province in the far south of Mesopotamia, a swampy region bereft of large settlements which gradually expanded southwards with the silting up of the mouths of the Tigris and Euphrates rivers. The later kings bore fanciful pseudo-Sumerian names and harked back to the glory days of the dynasty of Isin. The third king of the dynasty was even named for the ultimate king of the dynasty of Isin, Damiq-ili\u0161u. Despite these cultural motifs, the population predominantly bore Akkadian names and wrote and spoke in the Akkadian language. There is circumstantial evidence that their rule extended at least briefly to Babylon itself.\n\n\n== The King list tradition ==\nThe king list references which bear witness to the sequence of Sealand kings are summarized below:\nAn additional king list provides fragmentary readings of the earlier dynastic monarchs. The king list A totals the reigns to give a length of 368 years for this dynasty. The Synchronistic King List A.117 gives the sequence from Damqi-ili\u0161u onward, but includes an additional king between Gulki\u0161ar and Pe\u0161galdarame\u0161, mDI\u0160-U-EN (reading unknown). This source is considered reliable in this respect because the forms of the names of Pe\u0161galdarame\u0161 and Ayadaragalama match those on recently published contemporary economic tablets (see below).\n\n\n== Evidence of individual reigns ==\nThe sources for this dynasty are sparse in the extreme, with insufficient evidence to enable their placement in absolute chronology or to support the somewhat dubious length of reigns alleged on the king list A.\n\n\n=== Ilum-ma-il\u012b ===\nIlum-ma-il\u012b, or Iliman (mili-ma-an), the founder of the dynasty, is known from the account of his exploits in the Chronicle of Early Kings which describes his conflicts with his Amorite Babylonian contemporaries Samsu-iluna and Abi-e\u0161u\u1e2b. It records that he \u201cattacked and brought about the defeat of (Samsu-iluna\u2019s) army.\u201d He is thought to have conquered Nippur late in Samsu-iluna\u2019s reign as there are legal documents from Nippur dated to his reign. Abi-eshuh, the Amorite king of Babylon, and Samsu-iluna\u2019s son and successor, \u201cset out to conquer Ilum-ma-il\u012b,\u201d by damming the Tigris, to flush him out of his swampy refuge, an endeavor which was apparently confounded by Ilum-ma-il\u012b\u2019s superior use of the terrain.\n\n\n=== Damqi-ili\u0161u ===\nThe last surviving year-name for Ammi-ditana commemorates the \u201cyear in which (he) destroyed the city wall of Der/Udinim built by the army of Damqi-ili\u0161u. This is the only current contemporary indication of the spelling of his name, contrasting with that of the earlier king of Isin.\n\n\n=== Gulki\u0161ar ===\nGulki\u0161ar, meaning \u201craider of the earth,\u201d has left few traces of his apparently lengthy reign. He was the subject of a royal epic concerning his enmity with Samsu-dit\u0101na, the last king of the first dynasty of Babylon. The colophon of a tablet giving a chemical recipe for glaze reads \u201cproperty of a priest of Marduk in Eridu,\u201d thought to be a quarter of Babylon rather than the city of Eridu, is dated mu.us-sa Gul-ki-\u0161ar lugal-e \"year after (the one when) Gul-kisar (became?) king.\u201d A kudurru of the period of Babylonian king Enlil-n\u0101din-apli, c. 1103\u20131100 BC, records the outcome of an inquiry instigated by the king into the ownership of a plot of land claimed by a temple estate. The governors of Bit-Sin-magir and Sealand, upheld the claim based on the earlier actions of Gulki\u0161ar who had \u201cdrawn for Nanse, his divine mistress, a land boundary.\u201d It is an early example of a Distanzangaben statement recording that 696 years had elapsed between Nab\u00fb-kudurr\u012b-u\u1e63ur, Enlil-n\u0101din-apli\u2019s father, and Gulki\u0161ar.\n\n\n=== Pe\u0161galdarame\u0161 and Ayadaragalama ===\nPe\u0161galdarame\u0161, \u201cson of the ibex,\u201d and Ayadaragalama, \u201cson of the clever stag,\u201d were successive kings and descendants (DUMU, \"sons\" in its broadest meaning) of Gulki\u0161ar.\nRecently (2009) published tablets mainly from the Martin Sch\u00f8yen collection, the largest privately held collection of manuscripts to be assembled during the 20th century, cover a 15 to 18 year period extending over part of each king\u2019s reign. They seem to originate from a single cache but their provenance was lost after languishing in smaller private collections since their acquisition on the antiquities market a century earlier. The tablets include letters, receipts, ledgers, personnel rosters, etc., and provide year-names and references which hint at events of the period. Messengers from Elam are provisioned, Anzak, a god of Dilmun (ancient Bahrain) appears as a theophoric element in names, and N\u016br-Bau asks whether he should detain the boats of E\u0161nunna, a rare late reference to this once thriving Sumerian conurbation. In addition to normal commercial activity, two omen texts from another private collection are dated to the reign of Pe\u0161galdarame\u0161 and a kurugu-hymn mentions Ayadaragalama. A variant version of the Epic of Gilgame\u0161 relocates the hero to Ur and is a piece from this period.\nAyadaragalama\u2019s reign seems to have been eventful, as a year-name records expelling the \u201cmassed might of two enemies,\u201d speculated to be Elamites and Kassites, the Kassites having previously deposed the Amorites as rulers in Babylon. Another records the building of a \u201cgreat ring against the Kal\u0161u (Kassite) enemy\u201d and a third records the \u201cyear when his land rebelled.\u201d A year-name gives \u201cyear when Ayadaragalama was king \u2013 after Enlil established (for him?) the shepherding of the whole earth,\u201d and a list of gods includes Marduk and Sarpanitum, the tutelary deities of the Sealand. Excavations conducted between 2013 and 2017 at Tell Khaiber, around 20 km from Ur, have revealed the foundations of a large mudbrick fortress with an unusual arrangement of perimeter close-set towers and is dated, by an archive of almost 200 administrative tablets, to Ayadaragalama.\nA neo-Babylonian official took a bronze band dedicatory inscription of A-ia-da-a-ra, MAN \u0160\u00da \u201cking of the world,\u201d to Tell en-Nasbeh, probably as an antique curio, where it was discarded to be found in the 20th century.\n\n\n=== Ea-g\u00e2mil ===\nEa-g\u00e2mil, the ultimate king of the dynasty, fled to Elam ahead of an invading horde led by Kassite chief Ulam-Buria\u0161, brother of the king of Babylon Kashtiliash III, who conquered the Sealand, incorporated it into Babylonia and \u201cmade himself master of the land.\u201d\n\n\n== Inscriptions ==\n\n\n== Notes ==\n\n\n== References =="}}}}
|
@@ -0,0 +1,26 @@
|
|
1
|
+
{{About|the Baroque composer|his grandson of the same name|Johann Sebastian Bach (painter)|other uses of Bach|Bach (disambiguation)}}
|
2
|
+
{{pp-semi-indef}}
|
3
|
+
{{Use dmy dates|date=December 2012}}
|
4
|
+
{{Use British English|date=September 2012}}
|
5
|
+
{{Infobox person
|
6
|
+
| name = Johann Sebastian Bach
|
7
|
+
| image = Johann Sebastian Bach.jpg
|
8
|
+
| alt =
|
9
|
+
| caption = Portrait of Bach, aged 61, {{nowrap|by [[Elias Gottlob Haussmann|E. G. Haussmann]], 1748}}
|
10
|
+
| birth_date = 21 March 1685 [[Old Style and New Style dates|(O.S.)]]<br>31 March 1685 [[Old Style and New Style dates|(N.S.)]]
|
11
|
+
| birth_place = [[Eisenach]]
|
12
|
+
| death_date = {{death date and age|1750|7|28|1685|3|31|df=y}} <!-- 31 March, new style date -->
|
13
|
+
| death_place = [[Leipzig]]
|
14
|
+
| signature = Johann Sebastian Bach signature.svg
|
15
|
+
| signature_size = 300px
|
16
|
+
| image_upright = 1.2
|
17
|
+
| works = [[List of compositions by Johann Sebastian Bach|List of compositions]]
|
18
|
+
}}
|
19
|
+
'''Johann Sebastian Bach'''{{efn|{{IPA-de|ˈjoːhan zeˈbasti̯an ˈbax|lang|De-Johann Sebastian Bach.ogg}}. The last name appears as {{IPAc-en|b|ɑː|x}} in ''[[OED]]''/[[OUP]].<ref>"[http://www.oxforddictionaries.com/definition/english/bach-johann-sebastian Bach, Johann Sebastian]" entry at {{url|www.oxforddictionaries.com}}. Retrieved 3 May 2016.</ref><!--[[Dictionary.com]] has {{IPAc-en|ˈ|j|oʊ|h|ɑː|n|_|s|ɪ|ˈ|b|æ|s|tʃ|ən|_|ˈ|b|ɑː|x}} for the English pronunciation.<ref>"[http://www.dictionary.com/browse/johann-sebastian-bach johann sebastian bach]" entry at [http://www.dictionary.com/ ''Dictionary.com Unabridged''.] [[Random House]]. Retrieved 3 May 2016.</ref> The same pronunciation of the last name is found in ''Phonetics for Dummies''.<ref>William F. Katz. [https://books.google.com/books?id=5f5dAAAAQBAJ ''Phonetics For Dummies''.] John Wiley & Sons, 2013. {{ISBN|9781118505083}}. [https://books.google.com/books?id=5f5dAAAAQBAJ&pg=PA261 p. 261]</ref>--> According to ''[[Webster's]]'', the last consonant can alternatively be pronounced as {{IPAc-en|k}}.<ref>"bach trumpet" entry p. 157 in ''[[Webster's|Webster's Third New International Dictionary]]'' (unabridged). [[Merriam-Webster]], 1981. {{ISBN|0877792062}}</ref>}} ({{OldStyleDate|31 March|1685|21 March}}{{spaced ndash}}28 July 1750) was a German composer and musician of the [[Baroque music|Baroque period]]. He is known for instrumental compositions such as the ''[[Brandenburg Concertos]]'' and the ''[[Goldberg Variations]]'', and vocal music such as the ''[[St Matthew Passion]]'' and the [[Mass in B minor]]. Since the 19th-century [[Bach Revival]] he has been generally regarded as one of the greatest composers of all time.<ref>{{cite book|url=https://books.google.com/books?id=6RptffQRvEEC&pg=PA272|title=The Triumph of Music: The Rise of Composers, Musicians and Their Art|year=2008|first=T. C. W.|last=Blanning|author-link=T. C. W. Blanning|page=272|quote=And of course the greatest master of harmony and counterpoint of all time was Johann Sebastian Bach, 'the Homer of music'.}}</ref>
|
20
|
+
|
21
|
+
The [[Bach family]] already counted several composers when Johann Sebastian was born as the last child of a city musician in [[Eisenach]]. Having become an orphan at age 10, he lived for five years with [[Johann Christoph Bach (organist at Ohrdruf)|his eldest brother]], after which he continued his musical formation in [[Lüneburg]]. From 1703 he was back in [[Thuringia]], working as a musician for [[Protestantism|Protestant]] churches in [[Arnstadt]] and [[Mühlhausen]] and, for longer stretches of time, at courts in [[Saxe-Weimar|Weimar]] —where he expanded his repertoire for the [[pipe organ|organ]]— and [[Anhalt-Köthen|Köthen]] —where he was mostly engaged with [[chamber music]]. From 1723 he was employed as [[Thomaskantor]] ([[Cantor (Christianity)|cantor]] at [[St. Thomas School, Leipzig|St. Thomas]]) in [[Leipzig]]. He composed music for the principal [[Lutheran]] churches of the city, and for its university's student ensemble [[Collegium Musicum]]. From 1726 [[List of compositions by Johann Sebastian Bach printed during his lifetime|he published]] some of his [[keyboard instrument|keyboard]] and organ music. In Leipzig, as had happened in some of his earlier positions, he had a difficult relation with his employer, a situation that was little remedied when he was granted the title of court composer by the [[Augustus III of Poland|Elector of Saxony and King of Poland]] in 1736. In the last decades of his life he reworked and extended many of his earlier compositions. He died of complications after eye surgery in 1750.
|
22
|
+
|
23
|
+
Bach enriched established German styles through his mastery of [[counterpoint]], [[harmony|harmonic]] and [[Motif (music)|motivic]] organisation, and his adaptation of rhythms, forms, and textures from abroad, particularly from Italy and France. [[List of compositions by Johann Sebastian Bach|Bach's compositions]] include [[Bach cantata|hundreds of cantatas]], both [[Church cantata (Bach)|sacred]] and [[List of secular cantatas by Johann Sebastian Bach|secular]].<ref name=Wolff5>Wolff (1997), p. 5</ref> He [[Bach's church music in Latin|composed Latin church music]], [[Passions (Bach)|Passions]], [[List of masses, passions and oratorios by Johann Sebastian Bach#Oratorios and associated cantatas|oratorios]] and [[List of motets by Johann Sebastian Bach|motets]]. He often adopted [[Lutheran hymn]]s, not only in his larger vocal works, but for instance also in [[List of chorale harmonisations by Johann Sebastian Bach|his four-part chorales]] and [[List of songs and arias by Johann Sebastian Bach|his sacred songs]]. He wrote extensively [[List of organ compositions by Johann Sebastian Bach|for organ]] and [[List of keyboard and lute compositions by Johann Sebastian Bach|for other keyboard instruments]]. He [[List of concertos by Johann Sebastian Bach|composed concertos]], for instance [[List of orchestral works by Johann Sebastian Bach#Violin concertos (BWV 1041–1043)|for violin]] and [[Keyboard concertos by Johann Sebastian Bach|for harpsichord]], and [[Suite (Bach)|suites]], [[List of chamber music works by Johann Sebastian Bach|as chamber music]] as well as [[Orchestral suites (Bach)|for orchestra]]. [[List of fugal works by Johann Sebastian Bach|Many of his works employ]] the genres of [[canon (music)|canon]] and [[fugue]].
|
24
|
+
|
25
|
+
Throughout the 18th century Bach was primarily valued as [[organist]], while his keyboard music, such as ''[[The Well-Tempered Clavier]]'', was appreciated for its didactic qualities. The 19th century saw the publication of some major [[Biographies of Johann Sebastian Bach|Bach-biographies]], and by the end of that century all of his known music had been printed. Dissemination of scholarship on the composer continued through periodicals and websites exclusively devoted to him, and other publications such as the ''[[Bach-Werke-Verzeichnis]]'' (BWV, a numbered catalogue of his works) and new critical editions of his compositions. His music was further popularised through a multitude [[List of transcriptions of compositions by Johann Sebastian Bach|of arrangements]], including for instance the ''[[Air on the G String]]'', and of recordings, for instance three different box sets with complete performances of the composer's oeuvre marking the 250th anniversary of his death.
|
26
|
+
{{TOC limit|3}}
|
@@ -0,0 +1,4 @@
|
|
1
|
+
<p><b>Johann Sebastian Bach</b> (31 March [<abbr title="Old Style">O.S.</abbr> 21 March] 1685 – 28 July 1750) was a German composer and musician of the Baroque period. He is known for instrumental compositions such as the <i>Brandenburg Concertos</i> and the <i>Goldberg Variations</i>, and vocal music such as the <i>St Matthew Passion</i> and the Mass in B minor. Since the 19th-century Bach Revival he has been generally regarded as one of the greatest composers of all time.</p>
|
2
|
+
<p>The Bach family already counted several composers when Johann Sebastian was born as the last child of a city musician in Eisenach. Having become an orphan at age 10, he lived for five years with his eldest brother, after which he continued his musical formation in Lüneburg. From 1703 he was back in Thuringia, working as a musician for Protestant churches in Arnstadt and Mühlhausen and, for longer stretches of time, at courts in Weimar —where he expanded his repertoire for the organ— and Köthen —where he was mostly engaged with chamber music. From 1723 he was employed as Thomaskantor (cantor at St. Thomas) in Leipzig. He composed music for the principal Lutheran churches of the city, and for its university's student ensemble Collegium Musicum. From 1726 he published some of his keyboard and organ music. In Leipzig, as had happened in some of his earlier positions, he had a difficult relation with his employer, a situation that was little remedied when he was granted the title of court composer by the Elector of Saxony and King of Poland in 1736. In the last decades of his life he reworked and extended many of his earlier compositions. He died of complications after eye surgery in 1750.</p>
|
3
|
+
<p>Bach enriched established German styles through his mastery of counterpoint, harmonic and motivic organisation, and his adaptation of rhythms, forms, and textures from abroad, particularly from Italy and France. Bach's compositions include hundreds of cantatas, both sacred and secular. He composed Latin church music, Passions, oratorios and motets. He often adopted Lutheran hymns, not only in his larger vocal works, but for instance also in his four-part chorales and his sacred songs. He wrote extensively for organ and for other keyboard instruments. He composed concertos, for instance for violin and for harpsichord, and suites, as chamber music as well as for orchestra. Many of his works employ the genres of canon and fugue.</p>
|
4
|
+
<p>Throughout the 18th century Bach was primarily valued as organist, while his keyboard music, such as <i>The Well-Tempered Clavier</i>, was appreciated for its didactic qualities. The 19th century saw the publication of some major Bach-biographies, and by the end of that century all of his known music had been printed. Dissemination of scholarship on the composer continued through periodicals and websites exclusively devoted to him, and other publications such as the <i>Bach-Werke-Verzeichnis</i> (BWV, a numbered catalogue of his works) and new critical editions of his compositions. His music was further popularised through a multitude of arrangements, including for instance the <i>Air on the G String</i>, and of recordings, for instance three different box sets with complete performances of the composer's oeuvre marking the 250th anniversary of his death.</p>
|
@@ -1 +1 @@
|
|
1
|
-
<b>Metro-Goldwyn-Mayer Inc.</b>, or <b>MGM</b>, is an American media company, involved primarily in the production and distribution of films and television programs. MGM was founded in 1924 when the entertainment entrepreneur Marcus Loew gained control of Metro Pictures, Goldwyn Pictures Corporation and Louis B. Mayer Pictures
|
1
|
+
<p><b>Metro-Goldwyn-Mayer Inc.</b>, or <b>MGM</b>, is an American media company, involved primarily in the production and distribution of films and television programs. MGM was founded in 1924 when the entertainment entrepreneur Marcus Loew gained control of Metro Pictures, Goldwyn Pictures Corporation and Louis B. Mayer Pictures.</p>
|
@@ -2,9 +2,9 @@
|
|
2
2
|
{{redirect2|Medieval|Mediaeval}}
|
3
3
|
{{pp-move-indef}}
|
4
4
|
[[File:Karl 1 mit papst gelasius gregor1 sacramentar v karl d kahlen.jpg|thumb|300px|Ninth-century depiction of [[Charlemagne]] with popes [[Gelasius I]] and [[Gregory the Great]]]]
|
5
|
-
The '''Middle Ages''' (adjectival form: '''medieval''' or '''mediæval''') is a period of [[European history]] covering roughly a [[millennium]] from the [[5th century]] through to the [[16th century]]. It is commonly dated from the [[Decline of the Roman Empire|fall of the Western Roman Empire]], and contrasted with a later [[Early Modern Period]]; the time during which the rise of [[humanism]] in the [[Italian Renaissance]] and the [[Protestant Reformation|Reformation]] unfolded, are generally associated with the transition out of the Middle Ages, with European overseas expansion as a succeeding process, but such dates are approximate and based upon nuanced arguments.
|
5
|
+
The '''Middle Ages''' (adjectival form: '''medieval''' or '''mediæval''') is a period of [[European history]] covering roughly a [[millennium]] from the [[5th century]] through to the [[16th century]]. It is commonly dated from the [[Decline of the Roman Empire|fall of the Western Roman Empire]], and contrasted with a later [[Early Modern Period]]; the time during which the rise of [[humanism]] in the [[Italian Renaissance]] and the [[Protestant Reformation|Reformation]] unfolded, are generally associated with the transition out of the Middle Ages, with European overseas expansion as a succeeding process, but such dates are approximate and based upon nuanced arguments.
|
6
6
|
|
7
7
|
More specific starting and ending points are sometimes adopted by scholars to suit their respective specializations or current focus. In particular, in British history, the Middle Ages are often understood to start at the [[Norman conquest of England|Norman conquest]] of 1066 and continue through to about the end of the 15th century (the era between the fall of the Roman Empire and the Norman conquest is referred to as the [[Anglo-Saxon England | Anglo-Saxon]] period). "[[#Periodization issues|Periodization issues]]" are discussed in a later section of this article.
|
8
8
|
|
9
9
|
The Middle Ages included the first sustained [[urbanization]] of northern and western [[Europe]]. Many modern European countries owe their origins to events and trends in the Middle Ages; present European political boundaries are, in many regards, the result of the military and dynastic outcomes during this period.
|
10
|
-
[[File:Neamt Citadel 05.jpg|thumb|right|220px|[[Neamţ Citadel]], [[Romania]]]]
|
10
|
+
[[File:Neamt Citadel 05.jpg|thumb|right|220px|[[Neamţ Citadel]], [[Romania]]]]
|
@@ -1 +1 @@
|
|
1
|
-
The <b>SMS <i>Elbing</b></i> was a German <i>Pillau</i> class light cruiser, named after the East Prussian city of Elbing. Intended for the Russian navy under the name <i>Admiral Newelski</i> (named after the discoverer of the insularity of Sakhalin), the ship was built at F. Schichau-Werft in Danzig in 1913-1914. Following the outbreak of World War I, the ship was confiscated and launched on 21 November 1914 as the SMS <i>Elbing</i
|
1
|
+
<p>The <b>SMS <i>Elbing</b></i> was a German <i>Pillau</i> class light cruiser, named after the East Prussian city of Elbing. Intended for the Russian navy under the name <i>Admiral Newelski</i> (named after the discoverer of the insularity of Sakhalin), the ship was built at F. Schichau-Werft in Danzig in 1913-1914. Following the outbreak of World War I, the ship was confiscated and launched on 21 November 1914 as the SMS <i>Elbing</i>.</p>
|
@@ -1,7 +1,6 @@
|
|
1
|
-
<p>
|
2
|
-
<b>Sashimi</b> (, ; ) is a Japanese delicacy primarily consisting of very fresh raw seafood, sliced into thin pieces and served with only a dipping sauce (soy sauce with wasabi paste or other condiments such as grated fresh ginger, or ponzu), depending on the fish, and simple garnishes such as shiso and shredded daikon radish. Dimensions vary depending on the type of item and chef, but are typically about 2.5 cm (1") wide by 4 cm (1.5") long by 0.5 cm (0.2") thick.</p>
|
1
|
+
<p><b>Sashimi</b> (<span lang="ja">刺身</span>, ) is a Japanese delicacy primarily consisting of very fresh raw seafood, sliced into thin pieces and served with only a dipping sauce (soy sauce with wasabi paste or other condiments such as grated fresh ginger, or ponzu), depending on the fish, and simple garnishes such as shiso and shredded daikon radish. Dimensions vary depending on the type of item and chef, but are typically about 2.5 cm (1") wide by 4 cm (1.5") long by 0.5 cm (0.2") thick.</p>
|
3
2
|
<p>The word <i>sashimi</i> means "pierced body", i.e. "刺身 = <i>sashimi</i> = 刺し = <i>sashi</i> (pierced, stuck) and 身 = <i>mi</i> (body, meat).
|
4
3
|
This word had used from Muromachi period, withheld the word "切る = <i>Cut</i> ,the culinary step, by Samurai for inauspiciousness.
|
5
4
|
This word may derive from the culinary practice of sticking the fish's tail and fin to the slices in identifying the fish being eaten.</p>
|
6
5
|
<p>Another possibility for the name could come from the traditional method of harvesting. 'Sashimi Grade' fish is caught by individual handline, and as soon as the fish is landed, its brain is pierced with a sharp spike, killing it instantly, then placed in slurried ice. This spiking is called the Ike jime process. Because the flesh thus contains minimal lactic acid from the fish dying slowly, it will keep fresh on ice for about 10 days without turning white, or otherwise degrading.</p>
|
7
|
-
<p>The word <i>sashimi</i> has been integrated into the English language and is often used to refer to other uncooked fish preparations besides the traditional Japanese dish subject of this article. Many non-Japanese conflate sashimi and sushi; the two dishes are actually distinct and separate. Sushi refers to any dish made with vinegared rice, and while raw fish is one traditional sushi ingredient, many sushi dishes contain seafood that has been cooked, while others have no seafood at all.</p>
|
6
|
+
<p>The word <i>sashimi</i> has been integrated into the English language and is often used to refer to other uncooked fish preparations besides the traditional Japanese dish subject of this article. Many non-Japanese conflate sashimi and sushi; the two dishes are actually distinct and separate. Sushi refers to any dish made with vinegared rice, and while raw fish is one traditional sushi ingredient, many sushi dishes contain seafood that has been cooked, while others have no seafood at all.</p>
|
@@ -1,3 +1,3 @@
|
|
1
|
-
<p><b><i>Velociraptor</i></b> (
|
1
|
+
<p><b><i>Velociraptor</i></b> (meaning 'swift seizer') is a genus of dromaeosaurid theropod dinosaur that existed approximately 75 to 71 million years ago during the later part of the Cretaceous Period. Only two species are currently recognized, although others have been assigned in the past. The type species is <i>V. mongoliensis</i>; fossils of this species have been discovered in both Inner and Outer Mongolia in central Asia. A second species, <i>V. osmolskae</i>, was named in 2008 for skull material from Inner Mongolia.</p>
|
2
2
|
<p>Smaller than other dromaeosaurids like <i>Deinonychus</i> and <i>Achillobator</i>, the turkey-sized <i>Velociraptor</i> nevertheless shared many of the same anatomical features. It was a bipedal, feathered carnivore with a long, stiffened tail and an enlarged sickle-shaped claw on each hindfoot, which is thought to have been used to kill its prey. <i>Velociraptor</i> can be distinguished from other dromaeosaurids by its long and low skull, with an upturned snout.</p>
|
3
3
|
<p><i>Velociraptor</i> (commonly shortened to 'raptor') is one of the dinosaur genera most familiar to the general public due to its prominent role in the <i>Jurassic Park</i> motion picture series. In the films it was shown with anatomical inaccuracies, including being much larger than it was in reality and without feathers. It is also well known to paleontologists, with over a dozen recovered fossil skeletons—the most of any dromaeosaurid. One particularly famous specimen preserves a <i>Velociraptor</i> locked in combat with a <i>Protoceratops</i>.</p>
|
data/spec/lib/client_spec.rb
CHANGED
@@ -201,3 +201,16 @@ describe Wikipedia::Client, 'page.summary (mocked)' do
|
|
201
201
|
' program computation. This annual award was renamed the Dijkstra Prize the following year, in his honor.')
|
202
202
|
end
|
203
203
|
end
|
204
|
+
|
205
|
+
describe Wikipedia::Client, '.find page (mocked)' do
|
206
|
+
before(:each) do
|
207
|
+
@client = Wikipedia::Client.new
|
208
|
+
@sealand_dynasty = File.read(File.dirname(__FILE__) + '/../fixtures/Sealand_Dynasty.json')
|
209
|
+
expect(@client).to receive(:request).and_return(@sealand_dynasty)
|
210
|
+
end
|
211
|
+
|
212
|
+
it 'should return nil' do
|
213
|
+
@page = @client.find('Sealand_Dynasty')
|
214
|
+
expect(@page.image_urls).to eq(nil)
|
215
|
+
end
|
216
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wikipedia-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Cyril David
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2017-06
|
16
|
+
date: 2017-10-06 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: rake
|
@@ -135,6 +135,7 @@ files:
|
|
135
135
|
- spec/fixtures/Edsger_Dijkstra_section_0.json
|
136
136
|
- spec/fixtures/Edsger_content.txt
|
137
137
|
- spec/fixtures/File_Edsger_Wybe_Dijkstra_jpg.json
|
138
|
+
- spec/fixtures/Sealand_Dynasty.json
|
138
139
|
- spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-raw.txt
|
139
140
|
- spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-sanitized.txt
|
140
141
|
- spec/fixtures/sanitization_samples/Edsger_W_Dijkstra-raw.txt
|
@@ -143,6 +144,8 @@ files:
|
|
143
144
|
- spec/fixtures/sanitization_samples/Flower_video_game-sanitized.txt
|
144
145
|
- spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-raw.txt
|
145
146
|
- spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-sanitized.txt
|
147
|
+
- spec/fixtures/sanitization_samples/J_S_Bach-raw.txt
|
148
|
+
- spec/fixtures/sanitization_samples/J_S_Bach-sanitized.txt
|
146
149
|
- spec/fixtures/sanitization_samples/Kirsten_Dunst-raw.txt
|
147
150
|
- spec/fixtures/sanitization_samples/Kirsten_Dunst-sanitized.txt
|
148
151
|
- spec/fixtures/sanitization_samples/Large_Hadron_Collider-raw.txt
|
@@ -192,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
192
195
|
version: '0'
|
193
196
|
requirements: []
|
194
197
|
rubyforge_project:
|
195
|
-
rubygems_version: 2.6.
|
198
|
+
rubygems_version: 2.6.13
|
196
199
|
signing_key:
|
197
200
|
specification_version: 3
|
198
201
|
summary: Ruby client for the Wikipedia API
|
@@ -202,6 +205,7 @@ test_files:
|
|
202
205
|
- spec/fixtures/Edsger_Dijkstra_section_0.json
|
203
206
|
- spec/fixtures/Edsger_content.txt
|
204
207
|
- spec/fixtures/File_Edsger_Wybe_Dijkstra_jpg.json
|
208
|
+
- spec/fixtures/Sealand_Dynasty.json
|
205
209
|
- spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-raw.txt
|
206
210
|
- spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-sanitized.txt
|
207
211
|
- spec/fixtures/sanitization_samples/Edsger_W_Dijkstra-raw.txt
|
@@ -210,6 +214,8 @@ test_files:
|
|
210
214
|
- spec/fixtures/sanitization_samples/Flower_video_game-sanitized.txt
|
211
215
|
- spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-raw.txt
|
212
216
|
- spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-sanitized.txt
|
217
|
+
- spec/fixtures/sanitization_samples/J_S_Bach-raw.txt
|
218
|
+
- spec/fixtures/sanitization_samples/J_S_Bach-sanitized.txt
|
213
219
|
- spec/fixtures/sanitization_samples/Kirsten_Dunst-raw.txt
|
214
220
|
- spec/fixtures/sanitization_samples/Kirsten_Dunst-sanitized.txt
|
215
221
|
- spec/fixtures/sanitization_samples/Large_Hadron_Collider-raw.txt
|