From b934c7a45b121de18346a9f3e09982e26a9ed896 Mon Sep 17 00:00:00 2001 From: Aron Filbert Date: Wed, 22 Aug 2012 21:08:33 -0500 Subject: [PATCH 1/3] Modified for starter zendesk accounts, removed whitespace --- lib/zenpush.rb | 2 +- lib/zenpush/zendesk.rb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/zenpush.rb b/lib/zenpush.rb index 7b8a9bf..7c60ca0 100644 --- a/lib/zenpush.rb +++ b/lib/zenpush.rb @@ -11,7 +11,7 @@ def z @z ||= ZenPush::Zendesk.new end - # + # def file_to_category_forum_entry(file) absolute_path = File.realpath(file) parts = absolute_path.split('/') diff --git a/lib/zenpush/zendesk.rb b/lib/zenpush/zendesk.rb index 3791488..79466a2 100644 --- a/lib/zenpush/zendesk.rb +++ b/lib/zenpush/zendesk.rb @@ -10,12 +10,15 @@ class Zendesk headers 'Content-Type' => 'application/json' # debug_output - def initialize(b = nil, u = nil, p = nil) + attr_reader :mode + + def initialize(b = nil, u = nil, p = nil, m = nil) if b.nil? || u.nil? || p.nil? creds = YAML.load_file(File.join(ENV['HOME'], '.zenpush.yml')) b ||= creds['uri'] u ||= creds['user'] p ||= creds['password'] + @mode = creds['mode'] end self.class.base_uri b + '/api/v1' @@ -68,6 +71,7 @@ def entry(entry_id, options = {}) # Find category by name def find_category(category_name, options = {}) + return nil if mode == 'starter' self.categories.detect {|c| c['name'] == category_name} end @@ -77,6 +81,7 @@ def find_forum(category_name, forum_name, options = {}) if category self.forums.detect {|f| f['name'] == forum_name} end + self.forums.detect {|f| f['name'] == forum_name} end # Find entry by name, knowing the forum name and category name From f18263490c9b60be3a8d61021ac602a29d04c002 Mon Sep 17 00:00:00 2001 From: Aron Filbert Date: Wed, 22 Aug 2012 21:25:15 -0500 Subject: [PATCH 2/3] Cleaned up troubleshooting artifacts --- lib/zenpush/zendesk.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/zenpush/zendesk.rb b/lib/zenpush/zendesk.rb index 79466a2..b71bc04 100644 --- a/lib/zenpush/zendesk.rb +++ b/lib/zenpush/zendesk.rb @@ -12,7 +12,7 @@ class Zendesk attr_reader :mode - def initialize(b = nil, u = nil, p = nil, m = nil) + def initialize(b = nil, u = nil, p = nil) if b.nil? || u.nil? || p.nil? creds = YAML.load_file(File.join(ENV['HOME'], '.zenpush.yml')) b ||= creds['uri'] @@ -81,7 +81,6 @@ def find_forum(category_name, forum_name, options = {}) if category self.forums.detect {|f| f['name'] == forum_name} end - self.forums.detect {|f| f['name'] == forum_name} end # Find entry by name, knowing the forum name and category name From 6d027756c2c0e17917a582778e2c392b40c45f4a Mon Sep 17 00:00:00 2001 From: Aron Filbert Date: Wed, 29 Aug 2012 18:42:27 -0500 Subject: [PATCH 3/3] Modified further after last pull introduced a bug --- lib/zenpush/zendesk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zenpush/zendesk.rb b/lib/zenpush/zendesk.rb index b71bc04..3e45454 100644 --- a/lib/zenpush/zendesk.rb +++ b/lib/zenpush/zendesk.rb @@ -78,7 +78,7 @@ def find_category(category_name, options = {}) # Find forum by name, knowing the category name def find_forum(category_name, forum_name, options = {}) category = self.find_category(category_name, options) - if category + if category || mode == 'starter' self.forums.detect {|f| f['name'] == forum_name} end end