hexpress 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59cd6698ba5d1e610f469986e66e765b4c50583b
-  data.tar.gz: 00e04fcce40cc9d0eecc323d0aa02c352b48f586
+  metadata.gz: 752857ed8c0b2bd7de59d509e4a535935bca1a84
+  data.tar.gz: 126104d41811bda18dcba0062815757070b41a28
 SHA512:
-  metadata.gz: 9e8d9bd6b4098c41657c3484457213684bbea32c7f19e78e0175e10fa31422f9334775b6ecc0ce6ea9d07432c243ee4a81ada3c92a7779a59b739df9e5e56600
-  data.tar.gz: 40e2fcb76837dd970bbf0492bf333d881d18ad5876f628fa04b012b7eddd6a6c73cfc4bf9e890ba40f36ac42cb47e56edb8318613172ebe8adec3df2b6ac5929
+  metadata.gz: 43b82b6110908cdb21320619f478fe900749eb4e46873585843ca1380ce32dad92ceff7702089bf71653e65717172b36deb05b1c380aaba8b3089d3d376bfed2
+  data.tar.gz: 8cdcf2330039b366ae6cc700bd339cb3f35bb7d9b1b0740a7b2b89601922729beadd3d19e7cceba6abc91e9b3b48ba51bd4bfb8601e39a52f3f36450d47826d3

data/lib/hexpress.rb

@@ -1,7 +1,9 @@
 class Hexpress
   CHARACTERS = [:word, :digit, :space]
-  def initialize(&block)
-    @hexpressions = []
+  attr_reader :expressions
+
+  def initialize(*expressions, &block)
+    @expressions = expressions
     instance_exec(&block) if block_given?
   end
 
@@ -70,16 +72,22 @@ class Hexpress
 
   # This method returns the string version of the regexp.
   def to_s
-    @hexpressions.map(&:to_s).join
+    @expressions.map(&:to_s).join
+  end
+
+  # Takes an expression and returns the combination of the two expressions
+  # in a new Hexpress object.
+  def +(expression)
+    Hexpress.new(*expressions + expression.expressions)
   end
 
   private
 
   # This method takes an hexpression and adds it to the hexpression queue
   # while returning the main object.
-  def add(hexpression)
+  def add(expression)
     tap do
-      @hexpressions << hexpression
+      @expressions << expression
     end
   end
 end

data/lib/hexpress/main.rb

@@ -1,5 +1,8 @@
 require "hexpress"
 
-def hexp(&block)
-  Hexpress.new(&block)
+class Object
+  def hex(&block)
+    Hexpress.new(&block)
+  end
+  alias_method :hexp, :hex
 end

data/lib/hexpress/nested.rb

@@ -1,9 +1,9 @@
 class Hexpress
   private
 
-  def add_nested(hexpression, &block)
+  def add_nested(expression, &block)
     tap do
-      @hexpressions << hexpression.new(&block)
+      @expressions << expression.new(&block)
     end
   end
 

data/lib/hexpress/verbal_expressions.rb

@@ -1,5 +1,4 @@
 require "hexpress"
-require "pry"
 
 class Hexpress
   alias_method :startOfLine, :starting

data/lib/hexpress/version.rb

@@ -1,3 +1,3 @@
 class Hexpress
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/spec/lib/hexpress/main_spec.rb

@@ -2,6 +2,16 @@ require "spec_helper"
 require "hexpress/main"
 
 describe Hexpress do
+  describe "hex" do
+    it "allow for a chain of methods" do
+      expect(hex.find("foo").to_r).to eq(/(foo)/)
+    end
+
+    it "allow for a block of methods" do
+      expect(hex { find("foo") }.to_r).to eq(/(foo)/)
+    end
+  end
+
   describe "hexp" do
     it "allow for a chain of methods" do
       expect(hexp.find("foo").to_r).to eq(/(foo)/)

data/spec/lib/hexpress/value/with_spec.rb

@@ -5,5 +5,12 @@ describe Hexpress::Value::With do
     it "returns the string given" do
       expect(described_class.new("foo").to_s).to eq("foo")
     end
+
+    it "allows composing of multiple patterns" do
+      pattern1 = Hexpress.new.starting("foo")
+      pattern2 = Hexpress.new.ending("bar")
+      pattern3 = Hexpress.new.including(pattern1).with("1").including(pattern2)
+      expect(pattern3.to_r).to eq(/^foo1bar$/)
+    end
   end
 end

data/spec/lib/hexpress_spec.rb

@@ -1,6 +1,12 @@
 require "spec_helper"
 
 describe Hexpress do
+  it "takes a list of expressions and turns them into a regex" do
+    expressions = [Hexpress::Value::With.new("foo"), Hexpress::Value::With.new("bar")]
+    pattern = Hexpress.new(*expressions)
+    expect(pattern.to_r).to eq(/foobar/)
+  end
+
   it "takes a block and turns into a regex" do
     pattern = Hexpress.new { find("foo") }
     expect(pattern.to_r).to eq(/(foo)/)
@@ -70,4 +76,14 @@ describe Hexpress do
       expect(Hexpress.new.anything.to_s).to eq('(?:.)*')
     end
   end
+
+  describe "#+" do
+    it "returns a combination of any number of expressions" do
+      pattern1 = Hexpress.new.with("foo")
+      pattern2 = Hexpress.new.with("bar")
+      pattern3 = Hexpress.new.with("bang")
+      pattern4 = pattern1 + pattern2 + pattern3
+      expect(pattern4.to_r).to eq(/foobarbang/)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexpress
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler