shortee 0.0.2 → 0.0.3

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in shortee.gemspec
-gemspec
+gemspec

data/lib/shortee.rb

@@ -1,9 +1,9 @@
 require "shortee/version"
 require "shortee/parser"
+require "shortee/little_endian_parser"
 
 module Shortee
 
-
 end
 
 

data/lib/shortee/little_endian_parser.rb

@@ -0,0 +1,18 @@
+require "parslet"
+
+module Shortee
+
+  class Shortee::LittleEndianParser < Parslet::Parser
+
+    rule(:day) { match('[0-9]').repeat(1).as(:day) }
+    rule(:month) { match('[a-zA-Z0-9]').repeat(1).as(:month) }
+    rule(:year) { match('[0-9]').repeat(1).as(:year) }
+    rule(:forwardslash) { match['/'] }
+
+    rule(:date) { (day >> forwardslash >> month >> forwardslash >> year) }
+
+    root(:date)
+
+  end
+
+end

data/lib/shortee/parser.rb

@@ -3,71 +3,64 @@ require "parslet"
 module Shortee
 
   class Shortee::Parser < Parslet::Parser
+    def initialize(date_parser)
+      @date_parser = date_parser
+    end
 
-    # A space and many spaces
+    # Generic rules
     rule(:space) { match('\s').repeat(1) }
     rule(:space?) { space.maybe }
-
-    # Other rules
     rule(:dash?) { match['_-'].maybe }
+    rule(:colon) { match[':'] }
     rule(:at) { str('@') | (dash? >> (str('at') | str('AT')) >> dash?) }
     rule(:dot) { str('.') | (dash? >> (str('dot') | str('DOT')) >> dash?) }
-
-    rule(:forwardslash) { match['/'] }
-
     rule(:integer) { match('[0-9]').repeat(1)>> space? }
-    rule(:word) { match('[a-zA-Z0-9]').repeat(1).as(:word) >> space? }
-    rule(:separator) { dot.as(:dot) >> space? | space }
-    rule(:words) { word >> (separator >> word).repeat }
 
     # Shortee rules
     rule(:actor) { match('[a-zA-Z0-9]').repeat(1).as(:actor) >> space? }
     rule(:actee) { match('[a-zA-Z0-9]').repeat(1).as(:actee) >> space? }
     rule(:action) { match('[a-zA-Z]').repeat(1).as(:action) >> space? }
-    rule(:amountnum) { match('[0-9.]').repeat(1).as(:amountnum) }
+    rule(:amountnum) { match('[0-9.]').repeat(1).as(:amountnum) >> space? }
     rule(:amountunits) { match('[a-zA-Z]').repeat(1).as(:amountunits) >> space? }
 
-    rule(:day) { match('[0-9]').repeat(1).as(:day) }
-    rule(:month) { match('[a-zA-Z]').repeat(1).as(:month) }
-    rule(:year) { match('[0-9]').repeat(1).as(:year) }
-    rule(:ukmonth) { match('[0-9]').repeat(1).as(:ukmonth) }
+    rule(:time) { match('[0-9:]').repeat(1).as(:time) >> space? }
+
+    # Date and time
+    rule(:date) { @date_parser }
 
-    rule(:shorteeshort) {
+    rule(:short) {
       (space? >> at >> actor.as(:mainactor) >>
           action >>
           amountnum >> amountunits >>
-          day >> forwardslash >>
-          month >> forwardslash >> year).as(:shortee)
+          date >> space?).as(:short)
     }
 
-    rule(:shorteeukshort) {
+    rule(:shortwithactee) {
       (space? >> at >> actor.as(:mainactor) >>
           action >>
+          at >> actee.as(:actee) >>
           amountnum >> amountunits >>
-          day >> forwardslash >>
-          ukmonth >> forwardslash >> year).as(:shortee)
+          date >> space?).as(:short)
     }
 
-    rule(:shorteelong) {
+    rule(:shortwithtime) {
       (space? >> at >> actor.as(:mainactor) >>
           action >>
-          at >> actee.as(:actee) >>
           amountnum >> amountunits >>
-          day >> forwardslash >>
-          month >> forwardslash >> year).as(:shortee)
+          time >> date >> space?).as(:short)
     }
 
-    rule(:shorteeuklong) {
+    rule(:shortwithtimeandacteeg) {
       (space? >> at >> actor.as(:mainactor) >>
           action >>
           at >> actee.as(:actee) >>
           amountnum >> amountunits >>
-          day >> forwardslash >>
-          ukmonth >> forwardslash >> year).as(:shortee)
+          time >> date >> space?).as(:short)
     }
 
-    rule(:allshorts) { shorteeshort | shorteeukshort | shorteelong | shorteeuklong }
+    rule(:allshorts) { short | shortwithactee | shortwithtime | shortwithtimeandacteeg }
 
     root(:allshorts)
   end
+
 end

data/lib/shortee/version.rb

@@ -1,3 +1,3 @@
 module Shortee
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/parser_spaces_spec.rb

@@ -0,0 +1,21 @@
+require 'rspec'
+require 'spec_helper'
+require 'shortee'
+
+describe Shortee::Parser do
+
+  it "parses a short with initial spaces" do
+    test_message ="  @DateBoy tried 2things 01/sep/2013"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:mainactor][:actor].to_s.should eq("DateBoy")
+  end
+
+  it "parses a short with a trailing space" do
+    test_message ="@DateBoy tried 2things 01/sep/2013 "
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:mainactor][:actor].to_s.should eq("DateBoy")
+  end
+
+end

data/spec/parser_spec.rb

@@ -4,73 +4,103 @@ require 'shortee'
 
 describe Shortee::Parser do
 
-  it "should parse an actee" do
+  it "parses a short with time" do
+    test_message="@somebody did 1thing 08:00 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:time].to_s.should eq("08:00")
+  end
+
+  it "parses a short with time and actee" do
+    test_message="@somebody did @jimbo 1thing 09:00 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:time].to_s.should eq("09:00")
+  end
+
+  it "parses an actee" do
     test_message="@actor didto @actee 1something 01/12/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:actee][:actee].to_s.should eq("actee")
+    parsed_message[:short][:actee][:actee].to_s.should eq("actee")
   end
 
-  it "should parse another actee" do
+  it "parses another actee" do
     test_message="@actor didto @jimboWilliams 1something 01/jan/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:actee][:actee].to_s.should eq("jimboWilliams")
+    parsed_message[:short][:actee][:actee].to_s.should eq("jimboWilliams")
   end
 
-  it "should parse a valid actee" do
-    test_message="@actor gave @frank 2cheeses 01/jan/2012"
-    parser = Shortee::Parser.new
+  it "parses an action" do
+    test_message="@somebody did 1thing 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:actee][:actee].to_s.should eq("frank")
+    parsed_message[:short][:action].to_s.should eq("did")
   end
 
-  it "should parse a valid mainactor" do
+  it "parses an amount" do
     test_message="@somebody did 1thing 01/jan/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:mainactor][:actor].to_s.should eq("somebody")
+    parsed_message[:short][:amountnum].should eq("1")
   end
 
-  it "should parse a valid action" do
-    test_message="@somebody did 1thing 01/jan/2012"
-    parser = Shortee::Parser.new
+  it "parses a 1 decimal place amount" do
+    test_message="@somebody did 0.2things 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:action].to_s.should eq("did")
+    parsed_message[:short][:amountnum].should eq("0.2")
   end
 
-  it "should parse a valid amount" do
-    test_message="@somebody did 1thing 01/jan/2012"
-    parser = Shortee::Parser.new
+  it "parses a unit" do
+    test_message="@somebody did 1jibberjabber 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:amountunits].should eq("jibberjabber")
+  end
+
+  it "parses a unit with a space before it and the amount" do
+    test_message="@somebody did 1 jibberjabber 01/jan/2012"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:amountnum].should eq("1")
+    parsed_message[:short][:amountunits].should eq("jibberjabber")
   end
 
-  it "should parse a valid full date" do
+  it "parses a full standard uk date dd/mmm/yyyy" do
     test_message="@somebody did 1thing 01/jan/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:day].should eq("01")
-    parsed_message[:shortee][:month].should eq("jan")
-    parsed_message[:shortee][:year].should eq("2012")
+    parsed_message[:short][:day].should eq("01")
+    parsed_message[:short][:month].should eq("jan")
+    parsed_message[:short][:year].should eq("2012")
   end
 
-  it "should parse a valid UK date" do
+  it "parses a UK numeric date" do
     test_message="@somebody did 1thing 01/12/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:day].should eq("01")
-    parsed_message[:shortee][:ukmonth].should eq("12")
-    parsed_message[:shortee][:year].should eq("2012")
+    parsed_message[:short][:day].should eq("01")
+    parsed_message[:short][:month].should eq("12")
+    parsed_message[:short][:year].should eq("2012")
   end
 
-  it "should parse another valid UK date" do
+  it "parses another UK numeric date" do
     test_message="@frankee ate 2cheeses 13/01/2012"
-    parser = Shortee::Parser.new
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
+    parsed_message = parser.parse(test_message)
+    parsed_message[:short][:day].should eq("13")
+    parsed_message[:short][:month].should eq("01")
+    parsed_message[:short][:year].should eq("2012")
+  end
+
+  it "parses another UK numeric date with actee" do
+    test_message="@bill won @theoscars 2awards 23/07/2015"
+    parser = Shortee::Parser.new(Shortee::LittleEndianParser.new)
     parsed_message = parser.parse(test_message)
-    parsed_message[:shortee][:day].should eq("13")
-    parsed_message[:shortee][:ukmonth].should eq("01")
-    parsed_message[:shortee][:year].should eq("2012")
+    parsed_message[:short][:day].should eq("23")
+    parsed_message[:short][:month].should eq("07")
+    parsed_message[:short][:year].should eq("2015")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortee
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -69,15 +69,16 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - Shortee_specification.md
 - lib/shortee.rb
+- lib/shortee/little_endian_parser.rb
 - lib/shortee/parser.rb
 - lib/shortee/version.rb
 - shortee.gemspec
+- spec/parser_spaces_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/JeremyNevill/shortee
@@ -92,25 +93,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2187104680392310245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2187104680392310245
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Shortee gem contains a message parser and specification for easy and fast
   event tracking using single line messages.
 test_files:
+- spec/parser_spaces_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb

data/Guardfile

@@ -1,112 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-
-
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-
-
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-
-
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-
-
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-