excise 0.2.0 → 0.2.1

data/Changes.md

@@ -1,3 +1,9 @@
+# v0.2.1
+* Provide cleaner interface
+
+# v0.2.0
+* Memoize patterns
+
 # v0.1.1
 * Add `Excise(string, pattern)` convenience method. (see: [fb50807](https://github.com/ezkl/excise/commit/fb5080776b722cf6c2f0fabb419374b4e1e7674a))
 

data/README.md

@@ -28,9 +28,9 @@ Excise('About {result_count} results ({load_time} seconds)',
 #=> {:result_count=>"49,000,000", :load_time=>"0.15"}
 
 # Memoize pattern for performance improvement
-pattern = Excise::Base.new('[{key}]')
-pattern.parse_string '[value]' #=> {:key=>"value"}
-pattern.parse_string '[other]' #=> {:key=>"other"}
+pattern = Excise.new('[{key}]')
+pattern.parse '[value]' #=> {:key=>"value"}
+pattern.parse '[other]' #=> {:key=>"other"}
 ```
 
 ## Contributing

data/lib/excise.rb

@@ -1,13 +1,20 @@
 # encoding: utf-8
 require "excise/version"
 require "excise/base"
+require "forwardable"
 
 module Excise
-  def self.parse(string, pattern)
-    Base.new(string, pattern).parse
+  class << self
+    extend Forwardable
+
+    def_delegator 'Excise::Base', :new
+  end
+
+  def self.parse(pattern, string)
+    new(pattern).parse(string)
   end
 end
 
-def Excise(string, pattern)
-  Excise.parse(string, pattern)
+def Excise(pattern, string)
+  Excise.parse(pattern, string)
 end

data/lib/excise/base.rb

@@ -5,26 +5,20 @@ module Excise
     TOKEN_EXPRESSION = /{([^{}\t\r\n]+)}/.freeze
     SPECIAL_CHARACTERS_EXPRESSION = /[\\\^\$\*\+\.\?\(\)\[\]]/.freeze
 
-    attr_accessor :string
-
-    def initialize(pattern, string = "")
+    def initialize(pattern)
       @pattern = pattern
-      @string = string
-
-      @output = {}
     end
 
-    def parse
-      @matches = pattern_expression.match(@string)
+    def parse(string)
+      @matches = pattern_expression.match(string)
+
+      output = {}
+
       tokens.each_with_index do |key, index|
-        @output[key.to_sym] = @matches[index+1]
+        output[key.to_sym] = @matches[index+1]
       end
-      @output
-    end
 
-    def parse_string(string)
-      @string = string
-      parse
+      output
     end
 
     def tokens

data/lib/excise/version.rb

@@ -1,3 +1,3 @@
 module Excise
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/excise/base_spec.rb

@@ -5,15 +5,15 @@ module Excise
     context 'only a pattern' do
       let(:base) { Base.new(pattern) }
       let(:pattern) { '[{first}]' }
+      let(:string)  { '[value]' }
 
       it "should parse strings" do
-        base.string = '[value]'
-        base.parse.should be_a Hash
+        base.parse(string).should be_a Hash
       end
     end
 
     context 'pattern and string' do
-      subject       { Base.new(pattern, string).parse }
+      subject       { Base.new(pattern).parse(string) }
 
       let(:string)  { '[this] (patterned) <STRING>' }
       let(:pattern) { '[{first}] ({second}) <{third}>' }
@@ -23,13 +23,13 @@ module Excise
       its(:values) { should eq ['this', 'patterned', 'STRING'] }
     end
 
-    describe '#parse_string' do
+    describe '#parse' do
       let(:pattern) { Base.new('[{first}]') }
       it "should take a string and parse it" do
-        output = pattern.parse_string('[value]')
+        output = pattern.parse('[value]')
         output.should eq Hash[{first: 'value'}]
 
-        output = pattern.parse_string('[other]')
+        output = pattern.parse('[other]')
         output.should eq Hash[{first: 'other'}]
       end
     end

data/spec/excise_spec.rb

@@ -1,6 +1,11 @@
 require "spec_helper"
 
 describe Excise do
+  describe ".new" do
+    subject { Excise.new('{key}') }
+    it { should be_a Excise::Base }
+  end
+
   describe ".parse" do
     subject { Excise.parse(pattern, string) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excise
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: