LittleWeasel 1.1.0 → 2.0.0

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 ruby '1.9.3'
-gem "rspec", "~> 2.13.0"
-gem "yard", "0.8.6.1"
-gem "redcarpet", "~> 2.3.0"
+gem 'rspec', "~> 2.13.0"
+gem 'yard', "0.8.6.1"
+gem 'redcarpet', "~> 2.3.0"
+
+gem 'activesupport', "~> 4.1.1"

data/README.md

@@ -22,6 +22,7 @@ Or install it yourself as:
 require 'LittleWeasel'
 
 LittleWeasel::Checker.instance.exists?('word', options|nil) # true if exists in the dictionary, false otherwise.
+LittleWeasel::Checker.instance.exists?('Multiple words', options|nil) # true if exists in the dictionary, false otherwise.
 
 ## Contributing
 
@@ -31,7 +32,7 @@ Not taking contributions just yet.
 
 (The MIT License)
 
-Copyright © 2013 Gene M. Angelo, Jr.
+Copyright © 2013-2014 Gene M. Angelo, Jr.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/LittleWeasel/version.rb

@@ -1,4 +1,4 @@
 # The version of this gem
 module LittleWeasel
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/LittleWeasel.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require "LittleWeasel/version"
+require 'active_support/inflector'
 
 module LittleWeasel
 
@@ -14,25 +15,31 @@ module LittleWeasel
 
     private
 
-    attr_reader :alphanet_exclusion_list
+    attr_reader :alphabet_exclusion_list
+
+    # Keep these private...will expose as options later.
+    attr_accessor :word_regex, :numeric_regex, :non_wordchar_regex
 
     public
 
     # The constructor
     def initialize
-      @options = {exclude_alphabet: false, strip_whitespace: false}
+      @options = {exclude_alphabet: false, strip_whitespace: false, ignore_numeric: true}
       @alphabet_exclusion_list = %w{ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z }
+      @numeric_regex = /^[-+]?[0-9]?(\.[0-9]+)?$+/
+      @word_regex = /\s+(?=(?:[^"]*"[^"]*")*[^"]*$)/
+      @non_wordchar_regex = /\W+/
       @dictionary = Hash.new(1)
       load
     end
 
     # Interrogates the dictionary to determine whether or not [word] exists.
     #
-    # @param [String] word the word to interrogate
+    # @param [String] word the word or words to interrogate
     # @param [Hash] options options to apply to this query (see #options=).  Options passed to this
     #   method are applied for this query only.
     #
-    # @return [Boolean] true if *word* exists, false otherwise.
+    # @return [Boolean] true if the word/words in *word* exists, false otherwise.
     #
     # @example
     #
@@ -40,12 +47,17 @@ module LittleWeasel
     #  LittleWeasel::Checker.instance.exists?('A', {exclude_alphabet:true}) # false
     #  LittleWeasel::Checker.instance.exists?('X', {exclude_alphabet:false}) # true
     #  LittleWeasel::Checker.instance.exists?('Hello') # true
-    #  LittleWeasel::Checker.instance.exists?('Hello World') # false, two words does not a single word make :)
     #
     #  LittleWeasel::Checker.instance.exists?(' Hello ') # false (default options, :strip_whitespace => false)
     #  LittleWeasel::Checker.instance.exists?(' Yes ', {strip_whitespace:true}) # true
     #  LittleWeasel::Checker.instance.exists?('No ', {strip_whitespace:false}) # false
-    #  LittleWeasel::Checker.instance.exists?('Hell o', {strip_whitespace:true}) # false, strip_whitespace only removes leading and trailing spaces
+    #  LittleWeasel::Checker.instance.exists?('How dy', {strip_whitespace:true}) # false, strip_whitespace only removes leading and trailing spaces
+    #
+    #  LittleWeasel::Checker.instance.exists?('90210') # true (default options, ignore_numeric => true)
+    #  LittleWeasel::Checker.instance.exists?('90210', {ignore_numeric:false}) # false
+    #
+    #  LittleWeasel::Checker.instance.exists?('Hello World') # true, we're accepting multiple words now :)}
+    #  LittleWeasel::Checker.instance.exists?("hello, mister; did I \'mention\'' that lemon cake is \"great?\" It's just wonderful!") # true
     #
     def exists?(word, options=nil)
       options = options || @options
@@ -55,10 +67,11 @@ module LittleWeasel
       word.strip! if options[:strip_whitespace]
 
       return false if word.empty?
-
+      return block_exists? word if block?(word)
+      return true if options[:ignore_numeric] && number?(word)
       return false if options[:exclude_alphabet] && word.length == 1 && @alphabet_exclusion_list.include?(word.upcase)
 
-      dictionary.has_key? word
+      valid_word? word
     end
 
     # Sets the global options for this gem.
@@ -86,7 +99,12 @@ module LittleWeasel
     #
     #  LittleWeasel::Checker.instance.options({strip_whitespace:true})
     #  LittleWeasel::Checker.instance.exists?(' Yes ') # true
-    #  LittleWeasel::Checker.instance.exists?('Hell o') # false, strip_whitespace only removes leading and trailing spaces
+    #  LittleWeasel::Checker.instance.exists?('How dy') # false, strip_whitespace only removes leading and trailing spaces
+    #
+    #  LittleWeasel::Checker.instance.exists?('90210') # true (default options, ignore_numeric => true)
+    #  LittleWeasel::Checker.instance.exists?('90210', {ignore_numeric:false}) # false
+    #  LittleWeasel::Checker.instance.exists?('I watch Beverly Hills 90210') # true (default options, ignore_numeric => true)
+    #  LittleWeasel::Checker.instance.exists?('I watch Beverly Hills 90210', {ignore_numeric:false}) # false
     #
     def options=(options)
       @options = options
@@ -99,6 +117,43 @@ module LittleWeasel
       @options
     end
 
+    protected
+
+    def number?(word)
+      word.strip.gsub(@numeric_regex).count > 0
+    end
+
+    def block?(string)
+      tmp = string
+      return false unless tmp.is_a?(String)
+      tmp.gsub!(@numeric_regex, "")#.squeeze(" ").strip
+      return false unless tmp.length > 1
+      tmp.strip.scan(/[\w'-]+/).length > 1
+    end
+
+    def block_exists?(block)
+      tmp = block
+      tmp.gsub!(@numeric_regex, "").squeeze(" ").strip if options[:ignore_numeric]
+      tmp.gsub!(@non_wordchar_regex, " ")
+      tmp.split(@word_regex).uniq.each { |word|
+        return false unless valid_block_word?(word)
+      }
+      return true
+    end
+
+    def valid_word?(word)
+      tmp = word.downcase
+      exists = dictionary.has_key?(tmp)
+      exists = dictionary.has_key?(tmp.singularize) unless exists
+      puts "=> exists?(#{word}=>#{tmp}) # => #{exists}"
+      exists
+    end
+
+    def valid_block_word?(word)
+      return true if word.length == 1
+      valid_word? word.strip
+    end
+
     private
 
     def dictionary_path
@@ -110,6 +165,7 @@ module LittleWeasel
         io.each { |line| line.chomp!; @dictionary[line] = line }
       end
     end
+
   end
 
 end

data/spec/checker/checker_spec.rb

@@ -93,13 +93,29 @@ describe 'LittleWeasel Inline Options Tests' do
     words.each { |word| @spell.exists?(word).should == true }
   end
 
+  it 'should return true if option ignore_numeric is true, and word is a number' do
+    @spell.options = {ignore_numeric: true}
+    @spell.exists?('1').should == true
+    @spell.exists?('-1').should == true
+    @spell.exists?('1.0').should == true
+    @spell.exists?('-1.0').should == true
+  end
+
+  it 'should return false if option ignore_numeric is false, and word is a number' do
+    @spell.options = {ignore_numeric: false}
+    @spell.exists?('1').should == false
+    @spell.exists?('-1').should == false
+    @spell.exists?('1.0').should == false
+    @spell.exists?('-1.0').should == false
+  end
+
 end
 
 describe 'LittleWeasel Global Options Tests' do
 
-  before (:all) do
+  before (:each) do
     @spell = LittleWeasel::Checker.instance
-    @spell.options = {exclude_alphabet: true, strip_whitespace: true}
+    @spell.options = {exclude_alphabet: true, strip_whitespace: true, ignore_numeric: true}
   end
 
   it 'should create a LittleWeasel object' do
@@ -133,6 +149,9 @@ describe 'LittleWeasel Global Options Tests' do
 
     @spell.exists?(' h ', {exclude_alphabet: false, strip_whitespace: true}).should == true
     @spell.exists?(' h ').should == false
+
+    @spell.exists?('1', {ignore_numeric: false}).should == false
+    @spell.exists?('1').should == true
   end
 
   it 'should return true for valid word with leading spaces' do
@@ -147,4 +166,72 @@ describe 'LittleWeasel Global Options Tests' do
     @spell.exists?(' apple ').should == true
   end
 
+  it 'should return true if word is a number' do
+    @spell.exists?('1').should == true
+    @spell.exists?('-1').should == true
+    @spell.exists?('1.0').should == true
+    @spell.exists?('-1.0').should == true
+  end
+
+  it 'should return false if word is a number' do
+    @spell.options = {ignore_numeric: false}
+    @spell.exists?('1').should == false
+    @spell.exists?('-1').should == false
+    @spell.exists?('1.0').should == false
+    @spell.exists?('-1.0').should == false
+  end
+
+end
+
+describe 'LittleWeasel Block Tests' do
+
+  before (:all) do
+    @spell = LittleWeasel::Checker.instance
+    @spell.options = {exclude_alphabet: true, strip_whitespace: true}
+  end
+
+  it 'should return true for valid words' do
+    @spell.exists?('apple sauce').should == true
+  end
+
+  it 'should return false for invalid words' do
+    @spell.exists?('appel sauce').should == false
+  end
+
+  it 'should return true for valid words with leading spaces' do
+    @spell.exists?(' apple sauce').should == true
+  end
+
+  it 'should return true for valid words with trailing spaces' do
+    @spell.exists?('apple sauce ').should == true
+  end
+
+  it 'should return true for valid words with leading and trailing spaces' do
+    @spell.exists?(' apple sauce ').should == true
+  end
+
+  it 'should return true for valid words split across \n and \r\n' do
+    @spell.exists?("apple\r\n\n\nsauce is great\r\n").should == true
+  end
+
+  it 'should return true for valid words separated by \t' do
+    @spell.exists?("\tapple\t\t\tsauce is great\t").should == true
+  end
+
+  it 'should return true for valid words that are repeated' do
+    @spell.exists?(' are you bad are you bad are you bad ').should == true
+  end
+
+  it 'should return true for valid words separated by non-alpha chars' do
+    @spell.exists?("hello, mister; did I \'mention\'' that lemon cake is \"great?\" It's just wonderful!").should == true
+  end
+
+  it 'should return true for valid pluralized words' do
+    @spell.exists?('Apples and peaches are great! Some people are good, each person is a people.').should == true
+  end
+
+  it 'should return true for valid words' do
+    @spell.exists?('Hell o').should == true
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LittleWeasel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler