Update to Alphred 3

kejadlen · Jul 20, 2016 · 5c3e976 · 5c3e976
1 parent b9884bd
commit 5c3e976
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Unreleased
+## 2016.07.20 - 1.0.0
 ### Added
 - Search for emojis!
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "alphred", "~> 1.1"
-gem "gemoji", "~> 2.1"
+gem 'alphred', '~> 2.0'
+gem 'gemoji', '~> 2.1'
 
 group :development do
-  gem "minitest"
-  gem "pry"
+  gem 'minitest'
+  gem 'pry'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    alphred (1.1.1)
+    alphred (2.0.0)
       builder (~> 3.2)
     builder (3.2.2)
     coderay (1.1.0)
@@ -18,7 +18,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  alphred (~> 1.1)
+  alphred (~> 2.0)
   gemoji (~> 2.1)
   minitest
   pry

diff --git a/emoji.rb b/emoji.rb
@@ -1,30 +1,31 @@
-$LOAD_PATH.unshift(File.expand_path("../vendor/bundle", __FILE__))
-require "bundler/setup"
+$LOAD_PATH.unshift(File.expand_path('../vendor/bundle', __FILE__))
+require 'bundler/setup'
 
-require "alphred"
-require "emoji"
+require 'alphred'
+require 'emoji'
 
 module Emoji
   class Character
     def code
-      ":#{self.name}:"
+      ":#{name}:"
     end
 
     def matches(query)
-      !self.aliases.grep(query).empty? || !self.tags.grep(query).empty?
+      !aliases.grep(query).empty? || !tags.grep(query).empty?
     end
 
     def to_item
-      etc = self.aliases + self.tags
-      etc.delete(self.name)
-      etc = etc.join(", ")
+      alts = aliases + tags
+      alts.delete(name)
       Alphred::Item.new(
-        title: self.name,
-        uid: self.name,
-        subtitle: etc,
-        arg: JSON.dump(unicode: self.raw, code: self.code),
-        icon: File.join(Emoji.images_path, "emoji", self.image_filename),
-        mods: { ctrl: etc },
+        title: name,
+        uid: name,
+        subtitle: alts.join(', '),
+        arg: raw,
+        icon: File.join(Emoji.images_path, 'emoji', image_filename),
+        mods: {
+          ctrl: { arg: code, subtitle: "Copy #{code} to pasteboard" }
+        },
       )
     end
   end
@@ -33,5 +34,5 @@ def to_item
 if __FILE__ == $0
   query = Regexp.new(ARGV.shift)
   emojis = Emoji.all.select {|emoji| emoji.matches(query) }
-  puts Alphred::Items.new(*emojis.map(&:to_item)).to_xml
+  puts Alphred::Items[*emojis.map(&:to_item)].to_json
 end
diff --git a/info.plist b/info.plist
@@ -7,42 +7,6 @@
 	<key>connections</key>
 	<dict>
 		<key>0744A6DC-F5C1-4D81-8056-8C281A5494D2</key>
-		<array>
-			<dict>
-				<key>destinationuid</key>
-				<string>6D5D9CA0-5A68-48BD-86CB-FE41DF6F0D5F</string>
-				<key>modifiers</key>
-				<integer>0</integer>
-				<key>modifiersubtext</key>
-				<string></string>
-				<key>vitoclose</key>
-				<false/>
-			</dict>
-			<dict>
-				<key>destinationuid</key>
-				<string>8899A913-7F3C-42F8-A9DB-79560FDB43E2</string>
-				<key>modifiers</key>
-				<integer>262144</integer>
-				<key>modifiersubtext</key>
-				<string></string>
-				<key>vitoclose</key>
-				<false/>
-			</dict>
-		</array>
-		<key>6D5D9CA0-5A68-48BD-86CB-FE41DF6F0D5F</key>
-		<array>
-			<dict>
-				<key>destinationuid</key>
-				<string>52E6556C-14D2-4D85-8BDD-4B13B2B5943D</string>
-				<key>modifiers</key>
-				<integer>0</integer>
-				<key>modifiersubtext</key>
-				<string></string>
-				<key>vitoclose</key>
-				<false/>
-			</dict>
-		</array>
-		<key>8899A913-7F3C-42F8-A9DB-79560FDB43E2</key>
 		<array>
 			<dict>
 				<key>destinationuid</key>
@@ -83,31 +47,6 @@
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
-		<dict>
-			<key>config</key>
-			<dict>
-				<key>concurrently</key>
-				<false/>
-				<key>escaping</key>
-				<integer>102</integer>
-				<key>script</key>
-				<string># encoding: utf-8
-require "json"
-print JSON.load("{query}")["unicode"]</string>
-				<key>scriptargtype</key>
-				<integer>0</integer>
-				<key>scriptfile</key>
-				<string></string>
-				<key>type</key>
-				<integer>2</integer>
-			</dict>
-			<key>type</key>
-			<string>alfred.workflow.action.script</string>
-			<key>uid</key>
-			<string>6D5D9CA0-5A68-48BD-86CB-FE41DF6F0D5F</string>
-			<key>version</key>
-			<integer>2</integer>
-		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -151,31 +90,6 @@ print JSON.load("{query}")["unicode"]</string>
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
-		<dict>
-			<key>config</key>
-			<dict>
-				<key>concurrently</key>
-				<false/>
-				<key>escaping</key>
-				<integer>102</integer>
-				<key>script</key>
-				<string># encoding: utf-8
-require "json"
-print JSON.load("{query}")["code"]</string>
-				<key>scriptargtype</key>
-				<integer>0</integer>
-				<key>scriptfile</key>
-				<string></string>
-				<key>type</key>
-				<integer>2</integer>
-			</dict>
-			<key>type</key>
-			<string>alfred.workflow.action.script</string>
-			<key>uid</key>
-			<string>8899A913-7F3C-42F8-A9DB-79560FDB43E2</string>
-			<key>version</key>
-			<integer>2</integer>
-		</dict>
 	</array>
 	<key>readme</key>
 	<string></string>
@@ -184,30 +98,16 @@ print JSON.load("{query}")["code"]</string>
 		<key>0744A6DC-F5C1-4D81-8056-8C281A5494D2</key>
 		<dict>
 			<key>xpos</key>
-			<integer>300</integer>
+			<integer>210</integer>
 			<key>ypos</key>
-			<real>10</real>
+			<integer>170</integer>
 		</dict>
 		<key>52E6556C-14D2-4D85-8BDD-4B13B2B5943D</key>
 		<dict>
 			<key>xpos</key>
-			<integer>700</integer>
-			<key>ypos</key>
-			<real>10</real>
-		</dict>
-		<key>6D5D9CA0-5A68-48BD-86CB-FE41DF6F0D5F</key>
-		<dict>
-			<key>xpos</key>
-			<integer>500</integer>
-			<key>ypos</key>
-			<real>10</real>
-		</dict>
-		<key>8899A913-7F3C-42F8-A9DB-79560FDB43E2</key>
-		<dict>
-			<key>xpos</key>
-			<integer>500</integer>
+			<integer>550</integer>
 			<key>ypos</key>
-			<real>130</real>
+			<integer>170</integer>
 		</dict>
 	</dict>
 	<key>webaddress</key>