alfred-workflow 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA1: 
-  data.tar.gz: 44da5de16055d5653fe7f387119c9fbb4493f7ed
-  metadata.gz: 2849f51a6e1823e47bea54c7afe211415af86140
-SHA512: 
-  data.tar.gz: 8fc645db678c87245591ee1d539e63501158828ca69ffaa1056d693248c9b30893845bdc5b1f0f44f5b965980345f59ade8acd3fd60033b632e76baff203d8d0
-  metadata.gz: 6190c3241b08397f6774dc8c49f20cef7cedc8ffe72b74962ef2772c128fecb0f87913ea3b90c1bd5bfe68fc83ac5ef7fe340bbed3e577a516b11723fb876815
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjBhMTczN2Y3ZjI0YmFlMmM3YmM3MzdlYTY1N2IyMjk1NWRjYWM1YQ==
+  data.tar.gz: !binary |-
+    MjM4M2RiMWZjNmVjY2NjODA3YWEyYjM3M2Y5MGI4M2VjNTdiMzE0Mg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjA2Y2YzYmQzMzA5YWQzMDM1NGViZGI5ZWNjMzI1NjU4Yzc5ZWZmN2I1ZDQx
+    N2ExZjA1N2IzYjU4ZmFkMTk0MTI5NGJiYWMzYzkzNDBjZDgwOTQ3NDEyZTlm
+    YWQ2Y2I5N2EzYzhlNTFjMTk1MWY3NzgzNGJiNzJlNWJhNWFlMmI=
+  data.tar.gz: !binary |-
+    OGI1NGI0NzcyNzAwZmM3YTBiMjlmZTQ5YjZiNDEwMDI5NTUxMGJjMjQ0Mjcz
+    Mjk0ODEyZDUxNjQzMjRkNzc1YzdjMjg5YzNjYWFmZGFkMDgzMmM0ODE2NTVi
+    NTBiNzc0MDFhYjk0N2U0MDczYzQ4YzAyZTZmNjRlNjljMzQ0OTM=

data/.ruby-version

@@ -0,0 +1 @@
+system

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.2.3 / 2013-03-25
+
+* add function to output rescue feedback xml items
+* add a few query regexp builders
+! refactor feedback items
+! add autotest support
+! add rspec test
+
 === 1.1.0 / 2013-03-24
 * 3 major enhancements:
 

data/Manifest.txt

@@ -1,6 +1,7 @@
 .autotest
 .gemtest
 .rspec
+.ruby-version
 Gemfile
 Gemfile.lock
 History.txt
@@ -14,5 +15,6 @@ lib/alfred/feedback/file_item.rb
 lib/alfred/feedback/item.rb
 lib/alfred/ui.rb
 lib/alfred/version.rb
+spec/feedback_spec.rb
 spec/item_spec.rb
 spec/spec_helper.rb

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.plugin :bundler
 Hoe.plugin :test
 
 Hoe.plugin :git
-Hoe.plugin :rubygems
+Hoe.plugin :gemspec
 Hoe.plugin :version
 
 Hoe.spec 'alfred-workflow' do

data/lib/alfred.rb

@@ -16,7 +16,6 @@ module Alfred
 
   class ObjCError           < AlfredError; status_code(1) ; end
   class NoBundleIDError     < AlfredError; status_code(2) ; end
-  class ArgumentError       < AlfredError; status_code(3) ; end
   class NoMethodError       < AlfredError; status_code(13) ; end
   class PathError           < AlfredError; status_code(14) ; end
 
@@ -37,8 +36,9 @@ module Alfred
         exit e.status
       rescue Exception => e
         alfred.ui.error(
-          "Unfortunately, a fatal error has occurred. Please seek help in the Alfred Forum or raise an issue in \n" \
-          "github. Thanks!\n  #{e.inspect} #{e.backtrace.join("\n")}\n")
+          "A fatal error has occurred. " \
+          "You may seek help in the Alfred supporting site, forum or raise an issue in the bug tracking site.\n" \
+          "  #{e.inspect}\n#{e.backtrace.join("\n")}\n")
         raise e
       end
     end

data/lib/alfred/feedback/file_item.rb

@@ -21,25 +21,7 @@ module Alfred
       end
 
       def match?(query)
-        return true if query.empty?
-        if query.is_a? String
-          query = query.split("\s")
-        end
-
-        queries = []
-        query.each { |q|
-          queries << smartcase_query(q)
-        }
-
-        queries.delete_if { |q|
-          q.match(@title) or q.match(@subtitle)
-        }
-
-        if queries.empty?
-          return true
-        else
-          return false
-        end
+        all_title_match?(query)
       end
 
     end

data/lib/alfred/feedback/item.rb

@@ -59,6 +59,10 @@ module Alfred
       #   end
       # end
       def match?(query)
+        title_match?(query)
+      end
+
+      def title_match?(query)
         return true if query.empty?
         if smartcase_query(query).match(@title)
           return true
@@ -67,6 +71,29 @@ module Alfred
         end
       end
 
+      def all_title_match?(query)
+        return true if query.empty?
+        if query.is_a? String
+          query = query.split("\s")
+        end
+
+        queries = []
+        query.each { |q|
+          queries << smartcase_query(q)
+        }
+
+        queries.delete_if { |q|
+          q.match(@title) or q.match(@subtitle)
+        }
+
+        if queries.empty?
+          return true
+        else
+          return false
+        end
+      end
+
+
       def to_xml
         xml_element = REXML::Element.new('item')
         xml_element.add_attributes({
@@ -89,6 +116,14 @@ module Alfred
 
       protected
 
+      def build_regexp(query, option)
+        begin
+          Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
+        rescue RegexpError => e
+          Regexp.compile(".*#{Regexp.escape(query)}.*", option)
+        end
+      end
+
       def smartcase_query(query)
         if query.is_a? Array
           query = query.join(" ")
@@ -97,7 +132,7 @@ module Alfred
         if /[[:upper:]]/.match(query)
           option = nil
         end
-        Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
+        build_regexp(query, option)
       end
 
       def ignorecase_query(query)
@@ -105,14 +140,14 @@ module Alfred
           query = query.join(" ")
         end
         option = Regexp::IGNORECASE
-        Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*", option)
+        build_regexp(query, option)
       end
 
       def default_query(query)
         if query.is_a? Array
           query = query.join(" ")
         end
-        Regexp.compile(".*#{query.gsub(/\s+/,'.*')}.*")
+        build_regexp(query, nil)
       end
 
     end

data/lib/alfred/version.rb

@@ -1,3 +1,3 @@
 module Alfred
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/spec/feedback_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "Feedback" do
+
+  before :all do
+    @feedback = Alfred::Feedback.new
+  end
+  it "should create a basic XML response" do
+    @feedback.add_item(:uid          => "uid"          ,
+                       :arg          => "arg"          ,
+                       :autocomplete => "autocomplete" ,
+                       :title        => "Title"        ,
+                       :subtitle     => "Subtitle")
+
+    @feedback.to_xml.should == "<items><item arg='arg' autocomplete='autocomplete' uid='uid' valid='yes'><title>Title</title><subtitle>Subtitle</subtitle><icon>icon.png</icon></item></items>"
+  end
+
+end

metadata

@@ -1,70 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: alfred-workflow
-version: !ruby/object:Gem::Version 
-  version: 1.2.3
+version: !ruby/object:Gem::Version
+  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Zhao Cai
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: plist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: logging
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
-  version_requirements: *id004
-description: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
+description: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com)
+  workflow.
+email:
 - caizhaoff@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .autotest
 - .gemtest
 - .rspec
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -78,34 +93,33 @@ files:
 - lib/alfred/feedback/item.rb
 - lib/alfred/ui.rb
 - lib/alfred/version.rb
+- spec/feedback_spec.rb
 - spec/item_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/zhaocai/alfred-workflow
 licenses: []
-
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id005 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id005
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: alfred-workflow
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com) workflow.
+summary: alfred-workflow is a ruby Gem helper for building [Alfred](http://www.alfredapp.com)
+  workflow.
 test_files: []
-