harby 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 80e0ad800028aa7cbefa4321ac94d5fc9b98ec18
+  data.tar.gz: 5696dbb4bd056261d88b220bf0b6dc98dee0a002
+SHA512:
+  metadata.gz: 54708102b85c48181bec88bbad276f90a5b785ebadeaf1bc9c37f22467499076799113519bc8ca520a33e5b1a1e387ac92e6883320175173de3285a87cbf3bf3
+  data.tar.gz: 8aab3de3cea7344a55276ab816748801c582cd7dcd35dcda27552ea8e4513120afce9336602ee8e521c420e49157ea6cbcc45dd339f318ac2a3f02afe3be7a6a

data/lib/harby.rb

@@ -13,5 +13,4 @@ require "harby/grammar/regex"
 require "harby/grammar/string"
 require "harby/grammar/arguments"
 
-require "harby/null_delegate"
 require "harby/parser"

data/lib/harby/grammar/arguments.treetop

@@ -5,23 +5,23 @@ module Harby
 			include Numeric
 			include Regex
 			include String
-			
+
 			rule arguments
-				first_arg:argument rest_args:(" "+ arg:argument)* {
+				' '* first_arg:argument rest_args:(' '+ arg:argument)* ' '* {
 					def args
 						[first_arg] + rest_args
 					end
-					
+
 					def parsed_args
 						@parsed_args ||= args.map { |arg| arg.parsed_value }
 					end
-					
+
 					def rest_args
 						super.elements.map { |space_and_arg| space_and_arg.arg }
 					end
 				}
 			end
-			
+
 			rule argument
 				command / numeric / regex / string
 			end

data/lib/harby/grammar/command.treetop

@@ -6,21 +6,17 @@ module Harby
 					def args
 						arguments.parsed_args
 					end
-					
+
 					def name
 						args.first
 					end
-					
+
 					def parsed_args
 						args[1..-1]
 					end
-					
+
 					def parsed_value
-						if delegate.respond_to?(:on_command)
-							delegate.on_command(name, parsed_args)
-						else
-							""
-						end
+						delegate.call name, parsed_args
 					end
 				}
 			end

data/lib/harby/grammar/string.treetop

@@ -4,33 +4,49 @@ module Harby
 			rule string
 				double_quoted / single_quoted / naked
 			end
-			
+
+			rule double_quote
+				'"' / '“' / '”'
+			end
+
+			rule escaped_double_quote
+				'\\' double_quote
+			end
+
 			rule double_quoted
-				'"' value:('\\"' / command / !'"' .)* '"' {
+				double_quote value:(escaped_double_quote / command / !double_quote .)* double_quote {
 					def parsed_value
 						value.elements.map do |element|
 							if element.respond_to?(:parsed_value)
 								element.parsed_value
 							else
-								element.text_value.gsub('\\"', '"')
+								element.text_value.gsub /\\(["“”])/, '\1'
 							end
-						end.join("")
+						end.join ''
 					end
 				}
 			end
-			
+
+			rule single_quote
+				"'" / '‘' / '’'
+			end
+
+			rule escaped_single_quote
+				'\\' single_quote
+			end
+
 			rule single_quoted
-				"'" value:("\\'" / !"'" .)* "'" {
+				single_quote value:(escaped_single_quote / !single_quote .)* single_quote {
 					def parsed_value
-						value.text_value.gsub("\\'", "'")
+						value.text_value.gsub /\\(['‘’])/, '\1'
 					end
 				}
 			end
-			
+
 			rule naked
-				("\\ " / !" " !"]" .)+ {
+				('\\ ' / !' ' !']' .)+ {
 					def parsed_value
-						text_value.gsub("\\ ", " ").gsub("\\/", "/")
+						text_value.gsub('\\ ', ' ').gsub '\\/', '/'
 					end
 				}
 			end

data/lib/harby/parser.rb

@@ -1,35 +1,27 @@
 module Harby
   class Parser
     attr_reader :parser
-    
-    def initialize(delegate = nil)
+
+    def initialize(delegate = nil, &block)
       @parser = Grammar::ArgumentsParser.new
-      @parser.delegate = delegate || NullDelegate.new
+      @parser.delegate = delegate || block
     end
-    
-    def parse(input)
-      result = @parser.parse(input)
-      result ? result.parsed_args : nil
-    end
-    
+
     def delegate=(delegate)
       @parser.delegate = delegate
     end
-    
+
     def delegate
       @parser.delegate
     end
-    
+
     def failure_reason
       @parser.failure_reason
     end
-    
-    def self.parse(input, delegate = nil)
-      new(delegate).parse(input)
+
+    def parse(input)
+      result = @parser.parse(input)
+      result ? result.parsed_args : nil
     end
   end
-  
-  def self.parse(input, delegate = nil)
-    Parser.parse(input, delegate)
-  end
 end

metadata

@@ -1,67 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: harby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Ross Paffett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70301669384000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.10
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70301669384000
-description: A grammar-based parser for textual commands. Ideal for IRC bots.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description: Parser for a Tcl-like syntax. Ideal for IRC bots.
 email:
 - ross@rosspaffett.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/harby.rb
 - lib/harby/concerns/delegation.rb
 - lib/harby/ext/compiled_parser.rb
 - lib/harby/ext/syntax_node.rb
-- lib/harby/null_delegate.rb
-- lib/harby/parser.rb
-- lib/harby.rb
 - lib/harby/grammar/arguments.treetop
 - lib/harby/grammar/command.treetop
 - lib/harby/grammar/numeric.treetop
 - lib/harby/grammar/regex.treetop
 - lib/harby/grammar/string.treetop
+- lib/harby/parser.rb
 homepage: http://github.com/raws/harby
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
-summary: Simple textual command parser
+specification_version: 4
+summary: Parser for a Tcl-like syntax.
 test_files: []
+has_rdoc: 

data/lib/harby/null_delegate.rb

@@ -1,5 +0,0 @@
-module Harby
-  class NullDelegate
-    def on_command(*args); end
-  end
-end