contador 1.0.1 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.2.0

data/contador.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{contador}
-  s.version = "1.0.1"
+  s.name = "contador"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Acosta-Rubio"]
-  s.date = %q{2011-04-01}
-  s.description = %q{This gem counts the numbers of words in a string. It returns each word and the multiplicity}
-  s.email = %q{ivan@bakedweb.net}
+  s.date = "2012-11-14"
+  s.description = "This gem counts the numbers of words in a string. It returns each word and the multiplicity"
+  s.email = "ivan@bakedweb.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
@@ -33,17 +33,16 @@ Gem::Specification.new do |s|
     "spec/contador_spec.rb",
     "spec/spec.opts"
   ]
-  s.homepage = %q{http://github.com/ivanacostarubio/contador}
+  s.homepage = "http://github.com/ivanacostarubio/contador"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{This gem counts the numbers of words in a string. It returns each word and the multiplicity}
+  s.rubygems_version = "1.8.24"
+  s.summary = "This gem counts the numbers of words in a string. It returns each word and the multiplicity"
   s.test_files = [
     "spec/contador_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/contador.rb

@@ -12,7 +12,7 @@ class Contador
 
   def delete_omits
     $omits.split(' ').each do |word|
-      @final.delete(word.to_sym)
+      @final.delete(word)
     end
   end
 
@@ -21,7 +21,7 @@ class Contador
   end
 
   def omit(word)
-    @final.delete(word.to_sym)
+    @final.delete(word)
   end
 
   private
@@ -29,8 +29,8 @@ class Contador
   def split_string_into_hash
     string.split(' ').each do |word|
       begin
-        word.gsub!(/\W+/, '')
-        key = word.downcase.to_sym
+        word.gsub!(/[^0-9A-Za-z[-]_\s]/, '')
+        key = word.downcase
         if @final.has_key?(key)
           @final[key] += 1
         else
@@ -42,3 +42,7 @@ class Contador
     end
   end
 end
+
+
+
+

data/spec/contador_spec.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'spec'
-require 'lib/contador'
+require './lib/contador'
 
 describe Contador do 
   it "returns an empty string for nothing " do 
@@ -10,33 +10,38 @@ describe Contador do
 
   it "handles a single word" do 
     contador = Contador.new("cuenta")
-    contador.multiplicity.should == {:cuenta => 1}
+    contador.multiplicity.should == {"cuenta" => 1}
   end
 
   it "handles a couple of words" do 
     contador = Contador.new("estudio estudio")
-    contador.multiplicity.should == {:estudio => 2}
+    contador.multiplicity.should == {"estudio" => 2}
   end
 
   it "handles multiple single words" do 
     contador = Contador.new("estudio estudio estudio estudio estudio estudio")
-    contador.multiplicity.should == {:estudio => 6} 
+    contador.multiplicity.should == {"estudio" => 6} 
   end
 
   it "handles real sentences" do 
     contador = Contador.new("Cuando voy a estudiar me siento muy bien")
-    contador.multiplicity.should == {:cuando => 1, :voy => 1, :a => 1, :estudiar => 1, :me => 1, :siento => 1, :muy => 1, :bien => 1}
+    contador.multiplicity.should == {"cuando" => 1, "voy" => 1, "a" => 1, "estudiar" => 1, "me" => 1, "siento" => 1, "muy" => 1, "bien" => 1}
   end
 
   it "handles duplicates words in sentences" do 
     contador = Contador.new("Ruby es depinga. Muy depinga.")
-    contador.multiplicity.should == {:ruby => 1, :es => 1, :depinga => 2, :muy => 1}
+    contador.multiplicity.should == {"ruby" => 1, "es" => 1, "depinga" => 2, "muy" => 1}
   end
 
   it "handles weir case" do 
     contador = Contador.new("Esto esta depinga. Depinga esta esto.")
-    contador.multiplicity.should == {:esto => 2, :esta => 2, :depinga => 2}
+    contador.multiplicity.should == {"esto" => 2, "esta" => 2, "depinga" => 2}
   end
+  
+  it "handles a complex word" do 
+    contador = Contador.new("Baby-Food")
+    contador.multiplicity.should == {"baby-food" => 1}
+  end  
 
 end
 
@@ -44,18 +49,18 @@ describe Contador, "No sally words" do
   it "omits some basic words" do 
     contador = Contador.new("y y y precio")
     contador.omit("y")
-    contador.multiplicity.should == {:precio => 1}
+    contador.multiplicity.should == {"precio" => 1}
   end
 
   it "knows about a constant and omits those words" do 
     $omits = "y"
     contador = Contador.new("y y y wasa")
-    contador.multiplicity.should == {:wasa => 1}
+    contador.multiplicity.should == {"wasa" => 1}
   end
 
   it "knows about a contant with multiple words" do
     $omits = "y que yo"
     contador = Contador.new("y que yo precio")
-    contador.multiplicity.should == {:precio => 1}
+    contador.multiplicity.should == {"precio" => 1}
   end
 end

metadata

@@ -1,96 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: contador
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ivan Acosta-Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-01 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 1.2.3
   type: :development
-  name: rspec
   prerelease: false
-  version_requirements: *id004
-description: This gem counts the numbers of words in a string. It returns each word and the multiplicity
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+description: This gem counts the numbers of words in a string. It returns each word
+  and the multiplicity
 email: ivan@bakedweb.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
 - README.rdoc
-files: 
+files:
 - .DS_Store
 - .document
 - Gemfile
@@ -105,39 +99,34 @@ files:
 - lib/contador.rb
 - spec/contador_spec.rb
 - spec/spec.opts
-has_rdoc: true
 homepage: http://github.com/ivanacostarubio/contador
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1571854133693256542
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: This gem counts the numbers of words in a string. It returns each word and the multiplicity
-test_files: 
+summary: This gem counts the numbers of words in a string. It returns each word and
+  the multiplicity
+test_files:
 - spec/contador_spec.rb