lbp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8f418230bba408ab7abcc2bfc63535ce44a425
-  data.tar.gz: 89cb6d564dfd559786f940882b168ee20deab8b5
+  metadata.gz: f14f2c06206b6b7dc4363adf804dd6ab9a80c6a0
+  data.tar.gz: f6830a79e5ccc39462855457d76c1e1178d226cc
 SHA512:
-  metadata.gz: 4f0cc56d0015815ac15c2e71e801afb290e3958205a0205c9b0160139e1c918a39aa6278e611b1f8f4f13b5931f1bd2f289b8c58cdb665b5de25afed919a89dd
-  data.tar.gz: dae6f816869aeeeb625a89c5eaffd4153c63ab071d79ed585611e3f8e293e0ef867461ac0d9ec5cb21ca1a378f4906cc8cac65bd1658aa1607b76b7b38f3ef7d
+  metadata.gz: e4880d84d9d763e52cd1a203c780beef3ef1510809eb5d5cbd3421569f227fb8bad1903e421ea39f19e27947f1438e21cbde4d533f14c9450551dd37a3c20a0c
+  data.tar.gz: 236fe2daf7e79a48e8c8c0d95db2e78da2f2040a49fa84d3d6322621e11f7807d43482c09ca86a24f30ed93e0678f91b8b84e4bc054ca082e21e021fd747a815

data/lib/lbp/file.rb

@@ -32,9 +32,9 @@ module Lbp
 
 		def file
 			file = open(self.file_path)
-	    if file.base_uri.to_s != self.file_path
-	        file = open(self.file_path, {:http_basic_authentication => [@confighash[:git_username], @confighash[:git_password]]})
-	    end
+			if file.base_uri.to_s != self.file_path
+				file = open(self.file_path, {:http_basic_authentication => [@confighash[:git_username], @confighash[:git_password] ]})
+			end
 			return file
 		end
 		def nokogiri

data/lib/lbp/resource.rb

@@ -4,13 +4,14 @@ require 'rdf/rdfxml'
 require 'rdf/ntriples'
 require 'rdf/vocab'
 require 'lbp'
+#require 'forwardable'
 
 
 module Lbp
-	class Resource 
+	class Resource
 		class << self
 			def find(resource_id)
-				#adding the to_s method allows a resource to be created 
+				#adding the to_s method allows a resource to be created
 				#by passing in an RDF::URL object as well as the url string.
 				if resource_id.to_s.include? "http"
 					query = Query.new
@@ -26,8 +27,8 @@ module Lbp
 			end
 			def create(resource_url, results)
 				type = results.dup.filter(:p => RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")).first[:o].to_s.split("/").last
-				klass = if type == "workGroup" 
-						Lbp.const_get("WorkGroup") 
+				klass = if type == "workGroup"
+						Lbp.const_get("WorkGroup")
 					elsif type == "expressionType"
 						Lbp.const_get("ExpressionType")
 					else
@@ -38,15 +39,15 @@ module Lbp
 				Resource.new(resource_url, results)
 			end
 		end
-		
+
 		# end class level methods
-		
-		attr_reader :identifier, :results 
-		extend Forwardable 
+
+		attr_reader :identifier, :results
+		extend Forwardable
 		def_delegators :@identifier, :short_id, :url, :rdf_uri, :to_s
-		
+
 		def initialize(resource_url, results)
-			# if there are problems with results being empty 
+			# if there are problems with results being empty
 			# and, for example, dup or filter being called on a null class
 			# consider changing the following line to @results = results || <an empty object for whatever results normally is>
 			@results = results || RDF::Query::Solutions.new()
@@ -62,13 +63,13 @@ module Lbp
 
 		def value(property) # should return a single resource identifier; and error if there is more than one property for this value
 			value = @results.dup.filter(:p => RDF::URI(property))
-			if value.count > 0 
+			if value.count > 0
 				value = value.first[:o]
 				ResourceIdentifier.new(value)
-			else 
+			else
 				nil
 			end
-			
+
 		end
 
 		#query for properties global to all resources
@@ -77,9 +78,9 @@ module Lbp
 		end
 		def title
 			#careful here; title in db is not actualy a uri, but a litteral
-			#to_s method should work, but it might not be correct for this to be initially 
-			#instantiated into a resource identifer. 
-			# This is why I'm forcing the to_s method in the return value rather than 
+			#to_s method should work, but it might not be correct for this to be initially
+			#instantiated into a resource identifer.
+			# This is why I'm forcing the to_s method in the return value rather than
 			# return the ResourceIdentifer object itself as in the case of type above
 			value(RDF::Vocab::DC11.title).to_s
 		end
@@ -95,4 +96,4 @@ module Lbp
 
 
 	end
-end
+end

data/lib/lbp/transcription.rb

@@ -8,22 +8,35 @@ require 'lbp'
 module Lbp
 	class Transcription < Resource
 		#initionalization handled by Resource Class
-		def file_path(branch="master")
+		def file_path
 			file_path = value("http://scta.info/property/hasXML").to_s
 			#file_path = self.results.dup.filter(:p => RDF::URI("http://scta.info/property/hasXML")).first[:o].to_s
-			if branch != "master"
-			file_path.gsub!("master", branch)
+			if ENV['EXIST'] == "local"
+				file_path.gsub!("exist.scta.info", "localhost:8080")
 			end
 			return file_path
 		end
+		#TODO; this will need to change because an expression above the item level will have more than one doc listed
+		def doc_path(branch="master")
+			doc_path = value("http://scta.info/property/hasDocument").to_s
+			#file_path = self.results.dup.filter(:p => RDF::URI("http://scta.info/property/hasXML")).first[:o].to_s
+			if branch != "master"
+			doc_path.gsub!("master", branch)
+			end
+			return doc_path
+		end
 	  def transcription_type
 	  	type = value("http://scta.info/property/transcriptionType")
 	  	#type = self.results.dup.filter(:p => RDF::URI("http://scta.info/property/transcriptionType")).first[:o].to_s
 	  	type.to_s.downcase
 	  end
 
-	  def file(branch: "master", confighash: nil)
-	  	file = File.new(self.file_path(branch), self.transcription_type, confighash)
+	  def file(branch: "master", confighash: nil, path: "doc")
+			if path == "file"
+	  		file = File.new(self.file_path, self.transcription_type, confighash)
+			else path == "doc"
+				file = File.new(self.doc_path(branch), self.transcription_type, confighash)
+			end
 	  	return file
 	  end
 	  #NOTE: this really is a temporary method, since the database
@@ -31,8 +44,12 @@ module Lbp
 	  #dynamically generated by the exist-db database.
 	  # but this could remain in case it was useful to grab the part
 	  # from a file that would include a tei header etc.
-		def file_part(partid: nil, confighash: nil)
-	  	file = FilePart.new(self.file_path, self.transcription_type, confighash, partid)
+		def file_part(partid: nil, confighash: nil, path: "doc")
+			if path == "file"
+	  		file = FilePart.new(self.file_path, self.transcription_type, confighash, partid)
+			else path == "doc"
+				file = FilePart.new(self.doc_path, self.transcription_type, confighash, partid)
+			end
 	  	return file
 	  end
 	end

data/lib/lbp/version.rb

@@ -1,3 +1,3 @@
 module Lbp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/file_spec.rb

@@ -11,6 +11,7 @@ describe 'file object' do
 	$fileobject_private = Lbp::File.new("https://bitbucket.org/jeffreycwitt/lectio19/raw/master/lectio19.xml", "critical", $confighash)
 	$fileobject3 = Lbp::File.new("https://bitbucket.org/jeffreycwitt/lectio1/raw/master/lectio1.xml", "critical", $confighash)
 	$fileobject_with_null_config = Lbp::File.new("https://bitbucket.org/jeffreycwitt/lectio1/raw/master/lectio1.xml", "critical", nil)
+	$file_from_transcription = Lbp::Resource.find("lectio1/critical/transcription").file
 
 	it 'should return the full filename for an edited item' do
 		result = $fileobject.file_path
@@ -47,7 +48,8 @@ describe 'file object' do
 		result = $fileobject.validating_schema_version
 		expect(result).to be_kind_of(String)
 	end
-		it 'should retrieve the transcription type from the TEI xml file' do
+
+	it 'should retrieve the transcription type from the TEI xml file' do
 		result = $fileobject.transcription_type_from_file
 		expect(result).to be_kind_of(String)
 	end
@@ -57,6 +59,12 @@ describe 'file object' do
 		expect(result).to be_kind_of(String)
 	end
 
+	it 'should retrieve the validating schema label from TEI xml file from existDB batabase using hasXML rather than hasDoc' do
+		result = $file_from_transcription.title
+		binding.pry
+		expect(result).to be_kind_of(String)
+	end
+
 	it 'should retrieve the author name from the TEI xml file' do
 		result = $fileobject.author
 		expect(result).to be_kind_of(String)
@@ -70,11 +78,12 @@ describe 'file object' do
 
 	it 'should retrieve the edition number from TEI xml file in a private git repo' do
 		result = $fileobject_private.ed_no
+
 		expect(result).to be_kind_of(String)
 	end
 
 	it 'should retrieve the edition date from TEI xml file' do
-		result = $fileobject3.ed_date
+		result = $fileobject_private.ed_date
 		expect(result).to be_kind_of(String)
 	end
 

data/spec/transcription_spec.rb

@@ -3,33 +3,33 @@ require 'lbp'
 require 'pry'
 require 'nokogiri'
 
-describe 'transcript object' do 
+describe 'transcript object' do
 	$transcript_obj1 = Lbp::Resource.find("http://scta.info/resource/wdr-l1d1/wettf15/transcription")
 	$transcript_obj2 = Lbp::Resource.find("http://scta.info/resource/principiumIV/critical/transcription")
-	
-	it 'returns type of resource' do 
+
+	it 'returns type of resource' do
 		result = $transcript_obj1.type.short_id
 		expect(result).to be == "transcription"
  	end
- 	it 'returns transcription type of transcription (documentary)' do 
+ 	it 'returns transcription type of transcription (documentary)' do
 		result = $transcript_obj1.transcription_type
-		expect(result).to be == "documentary" # the use of documentary could be confusing because somtimes I say diplomatic 
+		expect(result).to be == "documentary" # the use of documentary could be confusing because somtimes I say diplomatic
  	end
- 	it 'returns transcription type of transcription (critical)' do 
+ 	it 'returns transcription type of transcription (critical)' do
 		result = $transcript_obj2.transcription_type
-		expect(result).to be == "critical" 
+		expect(result).to be == "critical"
  	end
- 	it 'returns file path for transcription' do 
+ 	it 'returns file path for transcription' do
 		result = $transcript_obj1.file_path
 		expect(result).to be_kind_of(String)
  	end
- 	it 'returns file path for transcription' do 
-		result = $transcript_obj1.file_path("develop")
+ 	it 'returns file path for transcription' do
+		result = $transcript_obj1.doc_path("develop")
 
 		expect(result).to be_kind_of(String)
  	end
- 	it 'returns file path for transcription' do 
+ 	it 'returns file path for transcription' do
 		result = $transcript_obj2.file_path
 		expect(result).to be_kind_of(String)
  	end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lbp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jeffrey C. Witt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler