rubyfocus 0.5.6 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e695cc8f092d4f4fd24f1f65f3aa3bcfe808051
-  data.tar.gz: 72c4ce4e2a8c2faca9d59f1a1e3dde2874bf4de8
+  metadata.gz: 80ef3e4cecd0eadf4c382649ebc6e0bec02f5ef0
+  data.tar.gz: 18d49a1f6c59c97058918fb1d6e9684c131cf467
 SHA512:
-  metadata.gz: 11b5d85f415b2ad27d384e8ab78ff1aebb35983484368d561d6b8cb08398b7491c2b5f9d5041366404a5e97bc6c2673d709f6beb0464cce8b258780187341462
-  data.tar.gz: 49dbdd242c1fc944d5a99b19d8737bd587e5425ef99dc44fc80400ae48ec3a826063e8d1a1f98312a3dfd96b881f509daa91900af4e73b3941712a9863aad3af
+  metadata.gz: 104abdd65cbbf6d662786395c28d0a4ac67febbe1fea637dee88b2f46d3d58006ad59e190e8810a126261816a29c888082995d80090d4c172de767379369e80a
+  data.tar.gz: 04a52e5c3d0cb037c3b93d1d6082e808804045261d6a912710eb562295cdf97fd937063fb03b5b57ef3403fc580591c822d9f66975fc3a8e149b930b9a8594bf

data/HISTORY.md

@@ -1,5 +1,23 @@
 # History
 
+## 0.5.9 // 2016-09-04
+
+Further Omnifocus database format changes result in shennanigans with rubyfocus. All fixed.
+
+* [Fixed] Blank entries in updates are now treated as "no change", rather than "new value is nil".
+
+## 0.5.8 // 2016-09-02
+
+Heading off edge cases, again a result of the new Omnifocus database format
+
+* [Fixed] Projects inside folders were being reported as having no container, due to empty `<task/`> tags. Now fixed.
+
+## 0.5.7 // 2016-09-02
+
+A quick fix for the new OF database format
+
+* [Fixed] Empty `<project/>` tags in a task description will no longer cause Rubyfocus to treat said task as a project.
+
 ## 0.5.6 // 2016-09-01
 
 * [New] Added `Time.safely_parse`, which will not choke on empty strings or nil values

data/README.md

@@ -1,4 +1,4 @@
-# Version: 0.5.6
+# Version: 0.5.9
 
 Rubyfocus is a one-way (read-only) ruby bridge to OmniFocus. Analyse, store, inspect, or play with your projects and tasks in OmniFocus from the comfort and flexibility of ruby!
 
@@ -22,7 +22,7 @@ Now build and install it!
 
 ```
 gem build rubyfocus.gemspec
-gem install rubyfocus-0.5.6.gem
+gem install rubyfocus-0.5.9.gem
 ```
 
 # Usage

data/lib/rubyfocus/document.rb

@@ -135,6 +135,38 @@ class Rubyfocus::Document
 		end
 	end
 
+	# Update an element in-place by applying xml. This method also takes into account:
+	# * new nodes (i.e. silently creates if required)
+	# * tasks upgraded to projects
+	# * projects downgraded to tasks
+	# Note that unlike add_element, this takes pure XML
+	def update_element(node)
+		element = self[node["id"]]
+
+		# Does element already exist?
+		if element
+			# Quick check: is it a task being upgraded to a project?
+			if element.class == Rubyfocus::Task && Rubyfocus::Project.matches_node?(node)
+				# Upgrade
+				new_node = element.to_project
+				new_node.apply_xml(node)
+				add_element(new_node, overwrite:true)
+			# or is the project being downgraded to a task?
+			elsif element.class == Rubyfocus::Project && !Rubyfocus::Project.matches_node?(node)
+				# Downgrade
+				new_node = element.to_task
+				new_node.apply_xml(node)
+				add_element(new_node, overwrite:true)
+			else
+				# Update in-place
+				element.apply_xml(node)
+			end
+		else
+			# Create a new node and add it
+			Rubyfocus::Parser.parse(self,node)
+		end
+	end
+
 	#-------------------------------------------------------------------------------
 	# Searchable stuff
 	def elements

data/lib/rubyfocus/items/project.rb

@@ -1,6 +1,5 @@
 # The project represents an OmniFocus project object.
 class Rubyfocus::Project < Rubyfocus::Task
-	# It's parseable
 	include Rubyfocus::Parser
 
 	#-------------------------------------------------------------------------------
@@ -8,7 +7,11 @@ class Rubyfocus::Project < Rubyfocus::Task
 
 	# Projects are <task>s with an interior <project> node
 	def self.matches_node?(node)
-		return (node.name == "task" && (node/"project").size > 0)
+		return (
+			node.name == "task" &&
+			(node/"project").size > 0 &&
+			(node/"project").first.children.size > 0
+		)
 	end
 	
 	# Singleton: contains one-off tasks
@@ -64,10 +67,11 @@ class Rubyfocus::Project < Rubyfocus::Task
 	def dropped?; status == :dropped; end
 
 	#---------------------------------------
-	# Convert to a task
+	# Convert to a task.  Does not supply a document, as this would overwrite current project
 	def to_task
-		t = Rubyfocus::Task.new(self.document)
+		t = Rubyfocus::Task.new(nil)
 		instance_variables.each do |ivar|
+			next if ivar == :"@document"
 			setter = ivar.to_s.gsub(/^@/,"") + "="
 			t.send(setter, self.instance_variable_get(ivar))	if t.respond_to?(setter)
 		end

data/lib/rubyfocus/items/ranked_item.rb

@@ -2,6 +2,7 @@ class Rubyfocus::RankedItem < Rubyfocus::NamedItem
 	attr_accessor :rank
 
 	# Ranked items also happen to be contained items
+	# Container setting is handled by subclasses - tasks and folders
 	idref :container
 
 	# Retrieve a full list of the parents of this item. [0] = immediate parent

data/lib/rubyfocus/items/task.rb

@@ -25,7 +25,11 @@ class Rubyfocus::Task < Rubyfocus::RankedItem
 
 	def apply_xml(n)
 		super(n)
-		conditional_set(:container_id, n.at_xpath("xmlns:task") || n.at_xpath("xmlns:project/xmlns:folder")){ |e| e["idref"] }
+
+		t = n.at_xpath("xmlns:task")
+		f = n.at_xpath("xmlns:project/xmlns:folder")
+
+		conditional_set(:container_id, (t && t["idref"]) || (f && f["idref"])){ |e| e }
 
 		conditional_set(:context_id, 	n.at_xpath("xmlns:context"))	{ |e| e["idref"] }
 		conditional_set(:note, 				n.at_xpath("xmlns:note"))			{ |e| e.inner_html.strip }
@@ -128,10 +132,11 @@ class Rubyfocus::Task < Rubyfocus::RankedItem
 	#---------------------------------------
 	# Conversion methods
 
-	# Convert the task to a project
+	# Convert the task to a project. Does not supply a document, as this would overwrite current task
 	def to_project
-		p = Rubyfocus::Project.new(self.document)
+		p = Rubyfocus::Project.new(nil)
 		instance_variables.each do |ivar|
+			next if ivar == :"@document"
 			setter = ivar.to_s.gsub(/^@/,"") + "="
 			p.send(setter, self.instance_variable_get(ivar))	if p.respond_to?(setter)
 		end

data/lib/rubyfocus/patch.rb

@@ -96,27 +96,18 @@ class Rubyfocus::Patch
 	# Apply this patch to a document.
 	def apply_to!(document)
 		# Updates modify elements
-		self.update.each{ |node| update_node(document, node) }
+		self.update.each{ |node| document.update_element(node) }
 		
 		# Deletes remove elements
 		self.delete.each{ |node| document.remove_element(node["id"]) }
 
 		# Creates make new elements
-		self.create.each{ |node| update_node(document, node) }
+		self.create.each{ |node| document.update_element(node) }
 
 		# Modify current patch_id to show new value
 		document.patch_id = self.to_id
 	end
 
-	# Atomic node update code
-	def update_node(document, node)
-		# Create new element with correct ID. Then add to document, overwriting previous element(s)
-		new_node = Rubyfocus::Parser.parse(nil, node)
-		if new_node
-			document.add_element(new_node, overwrite: true)
-		end
-	end
-
 	# String representation
 	def to_s
 		if from_ids.size == 1

data/version.txt

@@ -1 +1 @@
-0.5.6
+0.5.9

metadata

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