parsable 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dbda0cdf2f7beade2e6df252c90b65d4ac58b17
-  data.tar.gz: 7d14957ad92713946d32d44383c17bfac1be6c5b
+  metadata.gz: 3da0e05d9c9f0396d90d101a98d427f62567941f
+  data.tar.gz: 3734d2108f2dff1f9da7e18a7ea8cb37936f8e67
 SHA512:
-  metadata.gz: ad2d59f720cec99c17891b69a62f03b3199f916d5bb7e0e9e7d6b3c24a92ece2a2584756958193761419cc0f778fad53ba446ada7e67b8436df11f565abec124
-  data.tar.gz: 6c777d157984a1ed707e453513dfc9b7ecb65a8cdef6db1c2fa3a6bf5ae9510f56b6b0739db950c2111babbcbb2c9619c1ee8cb4d41d6ee655492eb3a7ccdd2b
+  metadata.gz: d74ff881314e4a550b66a3b73d1c4f1526a1f29641085a11cbca7bad1d958ea557ce77a85b7cbde12adcb89f88ec9f764dbeea9ed20918660eb6db59c07ce531
+  data.tar.gz: 59ce7eb7e8a092b2762c371a40a84b4ef2f33c2d720cfc39c839573340c318b699d2e9562b1a1ab6a136a83c9860c3976122634f47924abc18d7681f38a2b966

data/lib/parsable/parser.rb

@@ -1,7 +1,7 @@
 module Parsable
   class Parser
 
-    REGEX = /\{{2}(\w*\.?\S[^\{\{]*)\}{2}/
+    REGEX = /\{{2}(\w*\.?\S[^\{\{]*?)\}{2}/
 
     attr_accessor :original_string, :strings
 

data/lib/parsable/version.rb

@@ -1,3 +1,3 @@
 module Parsable
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/parser_spec.rb

@@ -1,67 +1,73 @@
 require 'spec_helper'
 
 describe Parsable::Parser do
+  let(:parser) { described_class.new(:string => string) }
 
   describe '#parse' do
+    subject { parser.parse }
+    let(:first) { subject.first }
 
     context "when no variables" do
+      let(:string) { "novariables" }
       it "returns empty" do
-        parsed = Parsable::Parser.new(:string => "novariables").parse
-        expect(parsed).to be_empty
+        expect(subject).to be_empty
       end
     end
 
     context "nil string" do
+      let(:string) { nil }
       it "returns empty" do
-        parsed = Parsable::Parser.new(:string => nil).parse
-        expect(parsed).to be_empty
+        expect(subject).to be_empty
       end
     end
 
     context 'when one variable' do
-      before :each do
-        @parsed = Parsable::Parser.new(:string => %(my+{{location.name}}@email.com)).parse.first
-      end
+      let(:string) { %(my+{{location.name}}@email.com) } 
+      
       it "parses object name" do
-        expect(@parsed.object).to eql('location')
+        expect(first.object).to eql('location')
       end
 
       it "parses attribute" do
-        expect(@parsed.attribute).to eql('name')
+        expect(first.attribute).to eql('name')
       end
     end
 
     context 'when multiple variables' do
-      before :each do
-        @parsed = Parsable::Parser.new(:string => %(my+{{location.name}}@{{email.domain}}.com)).parse
-      end
+      let(:string) { %(my+{{location.name}}@{{email.domain}}.com) }
 
       it "returns multiple strings" do
-        expect(@parsed.size).to eql(2)
+        expect(subject.size).to eql(2)
       end
 
       it "parses object names" do
-        expect(@parsed.first.object).to eql('location')
-        expect(@parsed.last.object).to eql('email')
+        expect(subject.first.object).to eql('location')
+        expect(subject.last.object).to eql('email')
       end
 
       it "parses attributes" do
-        expect(@parsed.first.attribute).to eql('name')
-        expect(@parsed.last.attribute).to eql('domain')
+        expect(subject.first.attribute).to eql('name')
+        expect(subject.last.attribute).to eql('domain')
       end
     end
 
     context 'when remote object' do
-      subject { Parsable::Parser.new(:string => %({{remote.http://google.com?query1=q1&query2=q2}}@email.com)).parse.first }
-
+      let(:string) { %({{remote.http://google.com?query1=q1&query2=q2}}@email.com) }  
       it "parses object name" do
-        expect(subject.object).to eql('remote')
+        expect(first.object).to eql('remote')
       end
 
       it "parses attribute" do
-        expect(subject.attribute).to eql('http://google.com?query1=q1&query2=q2')
+        expect(first.attribute).to eql('http://google.com?query1=q1&query2=q2')
       end
     end
-  end
 
+    context 'when the match has the potential to greedy match' do
+      let(:string) { %({{foo.bar}}some other text}}) }
+
+      it 'performs a non-greedy match' do
+        expect(first.attribute).to eq('bar')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parsable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Hubert Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler