alfred-workflow 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 2557094d89a1cdd90790d352f41333a6b4e60a3cc595d85fe581b567091240733314964039e3c3ba94e2b686f935c4b0a1229197d30e91e0827f2552a01d246e
-  data.tar.gz: 8129bfdbf94145f2c43843ef202e01455bce3485c5b6e8cb7a9aa0870d3794d406a8557bb2c4c578ec9c399f0eb4c02d05ed06a214c1da49e5cec4a7bcd9bc2b
+  metadata.gz: 0f6b816d4a18e2c4a85d14cf99407366bfea9a1ab44a0963bfc073540f67cf7e42aa92f3a895d319c3a2150b6a180d63e515cffec6cbbc0ec758e628d78dc819
+  data.tar.gz: 06be2ed6bf284ddceb2efb260f58e8d02a141992618f3b52185b5bf982195174e165e41125f645cf85041954e05f69d9bf0998f37ad2d0407c256560817b4105
 SHA1: 
-  metadata.gz: 1226f27047ece44ef0ad0575371ea92c1a09f827
-  data.tar.gz: 09a7f2050ef6782e225616bf19bf4fe94de8ea6b
+  metadata.gz: 26a4c6ecaf54da2b488919f10c7768414a939510
+  data.tar.gz: 2af4b640058cdbd52f31dcce8c9c936150eb4cc1

data/README.md

@@ -33,6 +33,7 @@ alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.
 
 * [alfred2-top-workflow]( https://github.com/zhaocai/alfred2-top-workflow )
 * [alfred2-google-workflow]( https://github.com/zhaocai/alfred2-google-workflow )
+* [alfred2-keylue-workflow]( https://github.com/zhaocai/alfred2-keylue-workflow )
 * [alfred2-sourcetree-workflow]( https://github.com/zhaocai/alfred2-sourcetree-workflow )
 
 ## SYNOPSIS:
@@ -76,7 +77,7 @@ Alfred.with_friendly_error do |alfred|
 end
 ```
 
-![rescue feedback](https://raw.github.com/zhaocai/alfred2-ruby-template/master/screenshots/rescue%20feedback.png)
+![](https://raw.github.com/zhaocai/alfred2-ruby-template/master/screenshots/rescue%20feedback.png)
 
 
 ### Automate saving and loading cached feedback
@@ -104,8 +105,37 @@ Alfred.with_friendly_error do |alfred|
 end
 ```
 
+### Customize feedback item matcher
 
+```ruby
+fb = alfred.feedback
+fb.add_item(:uid          => "uid"          ,
+            :arg          => "arg"          ,
+            :autocomplete => "autocomplete" ,
+            :title        => "Title"        ,
+            :subtitle     => "Subtitle"     ,
+            :match?       => :all_title_match?)
+
+fb.add_file_item(File.expand_path "~/Applications/", :match? => :all_title_match?)
+```
+
+`:title_match?` and `:all_title_match?` are built in.
+
+To define your new matcher
+```ruby
+Module Alfred
+  class Feedback
+    class Item
+      # define new matcher function here
+      def your_match?(query)
+        return true
+      end
+    end
+  end
+end
+```
 
+Check the code in [alfred/feedback/item.rb]( https://github.com/zhaocai/alfred-workflow/blob/master/lib/alfred/feedback/item.rb#L63 ) for more information.
 
 
 

data/lib/alfred/feedback.rb

@@ -22,8 +22,14 @@ module Alfred
 
     def to_xml(with_query = '', items = @items)
       document = REXML::Element.new("items")
-      items.each do |item|
-        document << item.to_xml if item.match?(with_query)
+      if with_query.empty?
+        items.each do |item|
+          document << item.to_xml
+        end
+      else
+        items.each do |item|
+          document << item.to_xml if item.match?(with_query)
+        end
       end
       document.to_s
     end

data/lib/alfred/feedback/file_item.rb

@@ -18,6 +18,8 @@ module Alfred
         @valid = 'yes'
         @autocomplete = @title
         @type = 'file'
+
+        super @title, opts
       end
 
       def match?(query)

data/lib/alfred/feedback/item.rb

@@ -12,52 +12,55 @@ module Alfred
         if opts[:icon]
           @icon    = opts[:icon]
         else
-          @icon    = {:type => "default", :name => "icon.png"}
+          @icon  ||= {:type => "default", :name => "icon.png"}
         end
 
         if opts[:uid]
           @uid    = opts[:uid]
-        else
-          @uid    = nil
         end
 
         if opts[:arg]
           @arg    = opts[:arg]
         else
-          @arg    = @title
+          @arg  ||= @title
         end
 
         if opts[:type]
           @type    = opts[:type]
         else
-          @type    = 'default'
+          @type  ||= 'default'
         end
 
         if opts[:valid]
           @valid    = opts[:valid]
         else
-          @valid    = 'yes'
+          @valid  ||= 'yes'
         end
 
         if opts[:autocomplete]
           @autocomplete    = opts[:autocomplete]
         end
+
+        if opts[:match?]
+          @matcher   = opts[:match?].to_sym
+        else
+          @matcher ||= :title_match?
+        end
       end
 
-      ## To customize a new match? function, overwrite it.
+      ## To customize a new matcher?, define it.
       #
       # Module Alfred
       #   class Feedback
       #     class Item
-      #       alias_method :default_match?, :match?
-      #       def match?(query)
-      #         # define new match? function here
+      #       def your_match?(query)
+      #         # define new matcher here
       #       end
       #     end
       #   end
       # end
       def match?(query)
-        title_match?(query)
+        send(@matcher, query)
       end
 
       def title_match?(query)
@@ -105,7 +108,7 @@ module Alfred
             'valid'        => @valid,
             'autocomplete' => @autocomplete
           })
-          
+
         end
         xml_element.add_attributes('type' => 'file') if @type == "file"
 
@@ -125,7 +128,7 @@ module Alfred
       def build_regexp(query, option)
         begin
           Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
-        rescue RegexpError => e
+        rescue RegexpError
           Regexp.compile(".*#{Regexp.escape(query)}.*", option)
         end
       end

data/lib/alfred/feedback/webloc_item.rb

@@ -10,11 +10,11 @@ module Alfred
           opts[:webloc] = ::Alfred::Util.make_webloc(
             opts[:title], opts[:url], File.dirname(opts[:webloc]))
         end
-        super opts[:webloc], opts
 
-        @title = title if title
         @subtitle = opts[:url]
         @uid = opts[:url]
+
+        super title, opts
       end
 
     end

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.10.1'
+  VERSION = '1.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alfred-workflow
 version: !ruby/object:Gem::Version 
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors: 
 - Zhao Cai
@@ -31,7 +31,7 @@ cert_chain:
   S6w/KYMnbhUxfyEU1MX10sJv87WIrtgF
   -----END CERTIFICATE-----
 
-date: 2013-09-25 00:00:00 Z
+date: 2013-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plist