edited itis and ubio and added to controlled sci classes

Gemfile

@@ -117,7 +117,7 @@ group :development, :test do
   # Rspec stuff
   gem 'rspec-rails', '~>2.0'
 
-  gem 'sqlite3', '~>1.3.7'
+  gem 'sqlite3', '~>1.3.9'
   gem 'jettywrapper'
 
   # Form testing

Gemfile.lock

@@ -508,7 +508,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
     stomp (1.3.2)
     subexec (0.2.3)
     sxp (0.1.4)
@@ -609,7 +609,7 @@ DEPENDENCIES
   sparql-client
   spring
   sprockets-digest-assets-fix!
-  sqlite3 (~> 1.3.7)
+  sqlite3 (~> 1.3.9)
   uglifier (>= 1.3.0)
   unicode
   webmock

bin/setup

@@ -19,7 +19,8 @@ fi
 # Install RVM
 if [[ ! -e "/usr/local/rvm/scripts/rvm" ]]; then
   echo "Install RVM, Ruby, Gems"
-  curl -sSL https://get.rvm.io | bash -s stable --ruby > /dev/null 2>&1
+  gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+  curl -sSL https://get.rvm.io | bash -s stable --ruby 
   source /usr/local/rvm/scripts/rvm
   echo "Installed `ruby --version`"
 fi

config/initializers/controlled_vocabularies.rb

@@ -38,8 +38,8 @@
   :subject              =>  { :prefix => 'http://opaquenamespace.org/ns/subject/', :source => 'https://raw.github.com/OregonDigital/opaque_ns/master/subject.jsonld', :strict => false, :fetch => false },
   :technique            =>  { :prefix => 'http://opaquenamespace.org/ns/technique/', :source => 'https://raw.github.com/OregonDigital/opaque_ns/master/technique.jsonld', :strict => false, :fetch => false },
   :worktype             =>  { :prefix => 'http://opaquenamespace.org/ns/workType/', :source => 'https://raw.github.com/OregonDigital/opaque_ns/master/workType.jsonld', :strict => false, :fetch => false },
-  :ubio                 =>  { :prefix => 'http://identifiers.org/ubio.namebank/', :strict => false, :fetch => false },
-  :itis                 =>  { :prefix => 'http://www.itis.gov/ITISWebService/', :strict => false, :fetch => false },
+  :ubio                 =>  { :prefix => 'http://www.ubio.org/authority/', :strict => false, :fetch => false },
+  :itis                 =>  { :prefix => 'http://rdfdata.eionet.europa.eu/itis/taxon/', :strict => false, :fetch => false },
   :bm                   =>  { :prefix => 'http://collection.britishmuseum.org/', :strict => false, :fetch => false },
   :archiveshub          =>  { :prefix => 'http://data.archiveshub.ac.uk/def/', :source => 'http://data.archiveshub.ac.uk/def/' },
   :bibframe             =>  { :prefix => 'http://bibframe.org/vocab/', :source => 'http://bibframe.org/vocab/', :strict => false, :fetch => false},

lib/oregon_digital/controlled_vocabularies/sci_class.rb

@@ -3,6 +3,8 @@ class SciClass < ActiveFedora::Rdf::Resource
     include OregonDigital::RDF::Controlled
 
     use_vocabulary :sciclass
+    use_vocabulary :ubio
+    use_vocabulary :itis
 
   end
 end

lib/oregon_digital/controlled_vocabularies/sci_common.rb

@@ -3,6 +3,8 @@ class SciCommon < ActiveFedora::Rdf::Resource
     include OregonDigital::RDF::Controlled
 
     use_vocabulary :scicommon
+    use_vocabulary :ubio
+    use_vocabulary :itis
 
   end
 end

lib/oregon_digital/controlled_vocabularies/sci_genus.rb

@@ -3,6 +3,8 @@ class SciGenus < ActiveFedora::Rdf::Resource
     include OregonDigital::RDF::Controlled
 
     use_vocabulary :scigenus
+    use_vocabulary :ubio
+    use_vocabulary :itis
 
   end
 end

lib/oregon_digital/controlled_vocabularies/sci_phylum.rb

@@ -3,6 +3,8 @@ class SciPhylum < ActiveFedora::Rdf::Resource
     include OregonDigital::RDF::Controlled
 
     use_vocabulary :sciphylum
+    use_vocabulary :ubio
+    use_vocabulary :itis
 
   end
 end

lib/oregon_digital/controlled_vocabularies/subject.rb

@@ -11,6 +11,8 @@ class Subject < ActiveFedora::Rdf::Resource
     use_vocabulary :lc_orgs
     use_vocabulary :creator
     use_vocabulary :people
+    use_vocabulary :itis
+    use_vocabulary :ubio
 
     class QaLcsh < Qa::Authorities::Loc
       include OregonDigital::Qa::Caching

lib/oregon_digital/vocabularies/archiveshub.rb

@@ -132,12 +132,12 @@ class ARCHIVESHUB < ::RDF::StrictVocabulary("http://data.archiveshub.ac.uk/def/"
         the creation or accumulation.)
     property :isPublisherOf, :label => 'Is Publisher Of', :comment =>
       %(A resource which the agent makes available.)
-    property :isRepresentedBy, :label => 'Is Represented By', :comment =>
-      %(An archival resourcce represented by the resource.)
     property :isRepresentedBy, :label => 'Is Represented By', :comment =>
       %(A resource which represents the archival resource, such as an
         image of a text page, a transcription of text, an audio or
         video clip, or an aggregation of such resources.)
+    property :isRepresentedBy, :label => 'Is Represented By', :comment =>
+      %(An archival resourcce represented by the resource.)
     property :item, :label => 'Item', :comment =>
       %(A number of items)
     property :level, :label => 'Level', :comment =>

lib/oregon_digital/vocabularies/dummycreator.rb

@@ -1,4 +1,4 @@
-# This file generated automatically using vocab-fetch from http://creativecommons.org/ns#
+# This file generated automatically using vocab-fetch from http://dummynamespace.org/creator/
 require 'rdf'
 module OregonDigital::Vocabularies
   class DUMMYCREATOR < ::RDF::Vocabulary("http://dummynamespace.org/creator/")

lib/oregon_digital/vocabularies/iana.rb

@@ -1,6 +1,6 @@
+# This file generated automatically using vocab-fetch from http://www.iana.org/assignments/relation/
 require 'rdf'
 module OregonDigital::Vocabularies
   class IANA < ::RDF::Vocabulary("http://www.iana.org/assignments/relation/")
   end
 end
-

lib/oregon_digital/vocabularies/iso_639_2.rb

@@ -51,8 +51,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :bnt, :label => 'Bantu languages'
     property :bas, :label => 'Basa'
     property :bak, :label => 'Bashkir'
-    property :eus, :label => 'Basque'
     property :baq, :label => 'Basque'
+    property :eus, :label => 'Basque'
     property :btk, :label => 'Batak languages'
     property :bej, :label => 'Beja | Bedawiyet'
     property :bel, :label => 'Belarusian'
@@ -111,8 +111,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :crh, :label => 'Crimean Tatar | Crimean Turkish'
     property :hrv, :label => 'Croatian'
     property :cus, :label => 'Cushitic languages'
-    property :ces, :label => 'Czech'
     property :cze, :label => 'Czech'
+    property :ces, :label => 'Czech'
     property :dak, :label => 'Dakota'
     property :dan, :label => 'Danish'
     property :dar, :label => 'Dargwa'
@@ -123,8 +123,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :dgr, :label => 'Dogrib'
     property :dra, :label => 'Dravidian languages'
     property :dua, :label => 'Duala'
-    property :nld, :label => 'Dutch | Flemish'
     property :dut, :label => 'Dutch | Flemish'
+    property :nld, :label => 'Dutch | Flemish'
     property :dum, :label => 'Dutch, Middle (ca.1050-1350)'
     property :dyu, :label => 'Dyula'
     property :dzo, :label => 'Dzongkha'
@@ -165,8 +165,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :gez, :label => 'Geez'
     property :geo, :label => 'Georgian'
     property :kat, :label => 'Georgian'
-    property :deu, :label => 'German'
     property :ger, :label => 'German'
+    property :deu, :label => 'German'
     property :gmh, :label => 'German, Middle High (ca.1050-1500)'
     property :goh, :label => 'German, Old High (ca.750-1050)'
     property :gem, :label => 'Germanic languages'
@@ -176,8 +176,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :got, :label => 'Gothic'
     property :grb, :label => 'Grebo'
     property :grc, :label => 'Greek, Ancient (to 1453)'
-    property :ell, :label => 'Greek, Modern (1453-)'
     property :gre, :label => 'Greek, Modern (1453-)'
+    property :ell, :label => 'Greek, Modern (1453-)'
     property :grn, :label => 'Guarani'
     property :guj, :label => 'Gujarati'
     property :gwi, :label => 'Gwich\'in'
@@ -280,15 +280,15 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :luo, :label => 'Luo (Kenya and Tanzania)'
     property :lus, :label => 'Lushai'
     property :ltz, :label => 'Luxembourgish | Letzeburgesch'
-    property :mkd, :label => 'Macedonian'
     property :mac, :label => 'Macedonian'
+    property :mkd, :label => 'Macedonian'
     property :mad, :label => 'Madurese'
     property :mag, :label => 'Magahi'
     property :mai, :label => 'Maithili'
     property :mak, :label => 'Makasar'
     property :mlg, :label => 'Malagasy'
-    property :msa, :label => 'Malay'
     property :may, :label => 'Malay'
+    property :msa, :label => 'Malay'
     property :mal, :label => 'Malayalam'
     property :mlt, :label => 'Maltese'
     property :mnc, :label => 'Manchu'
@@ -297,8 +297,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :mni, :label => 'Manipuri'
     property :mno, :label => 'Manobo languages'
     property :glv, :label => 'Manx'
-    property :mri, :label => 'Maori'
     property :mao, :label => 'Maori'
+    property :mri, :label => 'Maori'
     property :arn, :label => 'Mapudungun | Mapuche'
     property :mar, :label => 'Marathi'
     property :chm, :label => 'Mari'
@@ -362,8 +362,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :pap, :label => 'Papiamento'
     property :paa, :label => 'Papuan languages'
     property :nso, :label => 'Pedi | Sepedi | Northern Sotho'
-    property :fas, :label => 'Persian'
     property :per, :label => 'Persian'
+    property :fas, :label => 'Persian'
     property :peo, :label => 'Persian, Old (ca.600-400 B.C.)'
     property :phi, :label => 'Philippine languages'
     property :phn, :label => 'Phoenician'
@@ -378,8 +378,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :rar, :label => 'Rarotongan | Cook Islands Maori'
     property :"qaa-qtz", :label => 'Reserved for local use'
     property :roa, :label => 'Romance languages'
-    property :ron, :label => 'Romanian | Moldavian | Moldovan'
     property :rum, :label => 'Romanian | Moldavian | Moldovan'
+    property :ron, :label => 'Romanian | Moldavian | Moldovan'
     property :roh, :label => 'Romansh'
     property :rom, :label => 'Romany'
     property :run, :label => 'Rundi'
@@ -413,8 +413,8 @@ class ISO_639_2 < ::RDF::StrictVocabulary("http://id.loc.gov/vocabulary/iso639-2
     property :sms, :label => 'Skolt Sami'
     property :den, :label => 'Slave (Athapascan)'
     property :sla, :label => 'Slavic languages'
-    property :slk, :label => 'Slovak'
     property :slo, :label => 'Slovak'
+    property :slk, :label => 'Slovak'
     property :slv, :label => 'Slovenian'
     property :sog, :label => 'Sogdian'
     property :som, :label => 'Somali'

lib/oregon_digital/vocabularies/itis.rb

@@ -1,6 +1,6 @@
-# This file generated automatically using vocab-fetch from http://www.itis.gov/ITISWebService/
+# This file generated automatically using vocab-fetch from http://rdfdata.eionet.europa.eu/itis/taxon/
 require 'rdf'
 module OregonDigital::Vocabularies
-  class ITIS < ::RDF::Vocabulary("http://www.itis.gov/ITISWebService/")
+  class ITIS < ::RDF::Vocabulary("http://rdfdata.eionet.europa.eu/itis/taxon/")
   end
 end

lib/oregon_digital/vocabularies/ore.rb

@@ -1,3 +1,4 @@
+# This file generated automatically using vocab-fetch from http://www.openarchives.org/ore/1.0/datamodel#
 require 'rdf'
 module OregonDigital::Vocabularies
   class ORE < ::RDF::Vocabulary("http://www.openarchives.org/ore/1.0/datamodel#")