braille_ueb 0.0.2 → 0.0.3

data/lib/braille_ueb.rb

@@ -1,5 +1,6 @@
 require 'braille_ueb/constants'
 require 'braille_ueb/char'
+require 'braille_ueb/token'
 require 'braille_ueb/word'
 
 module BrailleUEB

data/lib/braille_ueb/char.rb

@@ -2,7 +2,7 @@ module BrailleUEB
   class Char < String
 
     def upper?
-      c == c.upcase
+      c == c.upcase && !number?
     end
 
     def number?
@@ -17,6 +17,10 @@ module BrailleUEB
       ALPHA.has_key?(c.downcase)
     end
 
+    def alphanumeric?
+      letter? || number?
+    end
+
     private
 
     def c

data/lib/braille_ueb/constants.rb

@@ -53,17 +53,38 @@ module BrailleUEB
     ',' => '⠂'
   }
 
+  GROUPS = {
+    'and'   => '⠯',
+    'for'   => '⠿',
+    'of'    => '⠷',
+    'the'   => '⠮',
+    'with'  => '⠾',
+  }
+
   CONTRACTIONS = {
-    'like' => '⠇',
-    'but'  => '⠃',
-    'you'  => '⠽',
-    'will' => '⠺',
-    'just' => '⠚',
-    'do'   => '⠙',
-    'that' => '⠞',
-    'so'   => '⠎',
-    'can'  => '⠉',
-    'go'   => '⠛'    
+    'but'   => '⠃',
+    'can'   => '⠉',
+    'do'    => '⠙',
+    'every' => '⠑',
+    'from'  => '⠋',
+    'go'    => '⠛',
+    'have'  => '⠓',
+    'just'  => '⠚',
+    'knowledge' => '⠅',
+    'like'  => '⠇',
+    'more'  => '⠍',
+    'not'   => '⠝',
+    'people' => '⠏',
+    'quite' => '⠟',
+    'rather' => '⠗',
+    'so'    => '⠎',
+    'that'  => '⠞',
+    'us'    => '⠥',
+    'very'  => '⠧',
+    'will'  => '⠺',
+    'it'    => '⠭',
+    'you'   => '⠽',
+    'as'    => '⠵'
   }
 
 end

data/lib/braille_ueb/token.rb

@@ -0,0 +1,23 @@
+module BrailleUEB
+  class Token
+    def initialize(token)
+      @word, @punc = split(token)
+    end
+
+    def translate
+      braille = @word.translate 
+      braille << PUNCTUATION[@punc] if @punc
+      braille
+    end
+
+    private
+
+    def split(token)
+      punctuation = PUNCTUATION.keys.join("")
+      word = token.tr(punctuation, "")
+      punc = token.match("[#{punctuation}]")
+      punc = punc[0] if punc
+      [ Word.new(word), punc ]
+    end
+  end
+end

data/lib/braille_ueb/version.rb

@@ -1,3 +1,3 @@
 module BrailleUEB 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/braille_ueb/word.rb

@@ -1,85 +1,47 @@
 module BrailleUEB
-  class Token
-    def initialize(token)
-      @word, @punc = split(token)
-    end
-
-    def translate
-      braille = @word.translate 
-      braille << PUNCTUATION[@punc] if @punc
-      braille
-    end
-
-    private
-
-    def split(token)
-      punctuation = PUNCTUATION.keys.join("")
-      word = token.tr(punctuation, "")
-      punc = token.match("[#{punctuation}]")
-      punc = punc[0] if punc
-      [ Word.new(word), punc ]
-    end
-  end
-
   class Word
     def initialize(word)
       @word = word
     end
 
     def translate
-      if contraction?
-        contracted 
-      else
-        letter_by_letter
-      end
-    end
+      return "" if @word.empty?
 
-    private
-
-    def contraction?
-      CONTRACTIONS.has_key?(@word.downcase)
-    end
-
-    def contracted
       braille = ""
       braille << SPECIAL[:capital] if starts_with_upper?
-      braille << CONTRACTIONS[@word.downcase]
-      braille
-    end
+      braille << SPECIAL[:number]  if starts_with_number?
+      braille << @word.downcase
 
-    def starts_with_upper?
-      Char.new(@word[0]).upper?
-    end
+      CONTRACTIONS.each { |key, val|
+        braille = braille.gsub(key, val)
+      }
 
-    def letter_by_letter
-      braille = ""
-      previous = Char.new("")
+      GROUPS.each { |key, val|
+        braille = braille.gsub(key, val)
+      }
 
-      @word.each_char do |c|
-        c = Char.new(c)
-        braille << translate_char(previous, c)
-        previous = c
-      end
+      ALPHA.each { |key, val|
+        braille = braille.gsub(key, val)
+      }
+
+      NUMBER.each { |key, val|
+        braille = braille.gsub(key, val)
+      }
 
       braille
-    end
 
-    def translate_char(previous, c)
-      result = ""
+    end
 
-      if c.letter?
-        result << SPECIAL[:capital] if c.upper?
-        result << ALPHA[c.downcase]
-      elsif c.number?
-        result << SPECIAL[:number] unless previous.number?
-        result << NUMBER[c]
-      else
-        result << c
-      end
+    private
 
-      result
+    def starts_with_upper?
+      Char.new(@word[0]).upper?
     end
 
+    def starts_with_number?
+      Char.new(@word[0]).number?
+    end
+    
   end
 end
 

data/spec/braille_ueb_spec.rb

@@ -9,6 +9,10 @@ describe BrailleUEB do
     verify 'c', '⠉'
   end
 
+  it 'should convert the same letter in a row' do
+    verify 'zz', '⠵⠵'
+  end
+
   it 'should convert capital letters' do
     verify 'Z', '⠠⠵'
   end
@@ -35,6 +39,14 @@ describe BrailleUEB do
     verify 'like', '⠇'
   end
 
+  it 'should handle special wordsigns' do
+    verify 'and', '⠯'
+  end
+
+  it 'should handle group signs' do
+    verify 'band', '⠃⠯'
+  end
+
   it 'should perform contractions that end with punctuation' do
     verify 'like.', '⠇⠲'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braille_ueb
 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: 2012-11-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies: []
 description: A translator for Unified English Braille (UEB)
 email: chris@geihsler.net
@@ -20,6 +20,7 @@ files:
 - Rakefile
 - lib/braille_ueb/char.rb
 - lib/braille_ueb/constants.rb
+- lib/braille_ueb/token.rb
 - lib/braille_ueb/version.rb
 - lib/braille_ueb/word.rb
 - lib/braille_ueb.rb
@@ -33,17 +34,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24