rubyfocus 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70297c5dac917c7b8a6f0c5341bddb4587456c4f
-  data.tar.gz: a99ec2c4d65a7c36ed70f022ea8229e7d4ccec35
+  metadata.gz: f0e0262c3cf6abfc04f58c73c86f08241fc7173b
+  data.tar.gz: 902d1bdeb21ef74cfeef68c98aa553099c3be1c3
 SHA512:
-  metadata.gz: 7309cae4cbe610eb65f30ec46b6bef8359db5bcb76eb0023f4ab779f4d3ceec78fc3fe9ea8a2b1dc5035694660cb3504ff542b1ecad782680f4f7598c701775a
-  data.tar.gz: 637d8a4edd2f2531ebfe084e114ce7532554313e6bec4c9f0ea5d91b64f026a6fc5877b1ad3a63bdd85627afb0d828025d214aee7292891f0772b6871ec372d7
+  metadata.gz: 471231676b0538b7f5a6efec824d52c05f5d5017d4ff4b230ac8530ae32b669a81a51af08949b0eca6a4a18e69d17951293913ef22d11d8989a162f9e6c5ce05
+  data.tar.gz: 77bba4659add4bc7d8dc08e818c4361dcc8816e9ae1b8f6bec48f257951f3be21e9caf375ba8fb5920640574e77f18c8a9406d80487198195130cb9d6fd77015

data/lib/rubyfocus/document.rb

@@ -6,7 +6,7 @@
 # a Nokogiri XML document (or +nil+). Alternatively, you can initialize through +Document.from_file(file)+,
 # which reads the file and parses it as XML
 #
-# You add XML to the document by running +Documet::apply_xml(doc)+, which takes all children of the root
+# You add XML to the document by running +Document::apply_xml(doc)+, which takes all children of the root
 # XML node, tries to turn each child into a relevant object, and adds it to the document. This is done using
 # the private +ivar_for+ method, as well as +add_element(e)+, which you can use to add individual objects.
 class Rubyfocus::Document

data/lib/rubyfocus/fetchers/local_fetcher.rb

@@ -1,6 +1,4 @@
 class Rubyfocus::LocalFetcher < Rubyfocus::Fetcher
-	# This is where the files are usually stored
-	LOCATION = File.join(ENV["HOME"], "/Library/Containers/com.omnigroup.OmniFocus2/Data/Library/Application Support/OmniFocus/OmniFocus.ofocus")
 
 	#---------------------------------------
 	# Parent method overrides
@@ -56,8 +54,33 @@ class Rubyfocus::LocalFetcher < Rubyfocus::Fetcher
 
 	#---------------------------------------
 	# Location file setters and getters
+
+	# Default (non app-store) file location
+	def default_location
+		@default_location ||= File.join(ENV["HOME"],
+																		"/Library/Containers/com.omnigroup.OmniFocus2",
+																		"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus")
+	end
+
+	# Default app-store file location
+	def appstore_location
+		@appstore_location ||= File.join(ENV["HOME"],
+																			"/Library/Containers/com.omnigroup.OmniFocus2.MacAppStore",
+																			"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus")
+	end
+
+	# Determine location based on assigned and default values. Returns +nil+
+	# if no assigned location and default locations don't exist.
 	def location
-		@location || LOCATION
+		if @location
+			@location
+		elsif File.exists?(default_location)
+			default_location
+		elsif File.exists?(appstore_location)
+			appstore_location
+		else
+			nil
+		end
 	end
 
 	def location= l

data/version.txt

@@ -1 +1 @@
-0.5.3
+0.5.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyfocus
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jan-Yves Ruzicka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri