natophone 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc66af7ce5d5d06b5f361de80a33dabf020ee0e1
-  data.tar.gz: 791a88cbb58dcac56fc8cec7b4cdecc30712576b
+  metadata.gz: a8693ad33322d311963546584e9635a68ba9b96d
+  data.tar.gz: 8ccee5d5594de21dda8499f13c3e458665a0e5a1
 SHA512:
-  metadata.gz: 6d3b3b03deb38d7ae7e97037821fae5689707327e51670dc5cbcb7e437ae39f21a3355ea5f5965478f9849a1f2cb181e7d46c3e0e12c6418947d1eae609c3880
-  data.tar.gz: abbc572696c83f6de710c0ea56cf379be711faa593ad9c04183382d8dee30d9764e3cc508df6d4de0d95e4e97505880a2d0f19026a0afdbbb9a17cd889927ebb
+  metadata.gz: 7bf488683604a5acfa65e8c491eb05f50e3e4cc134bd0f8e225b1ba1ba7e888dabbd0eb47705f15e0ef6712f718417e6945f98bf9c5a977977d7ba341c5236fb
+  data.tar.gz: 704c52b58d500fdb355b0bad165691f2d7cac12c591375f09483bc7356f6c21476d2c533a32b8bfaadba283349c32568f137201b0f9deb6b50fbc8ce7059f455

data/.travis.yml

@@ -6,8 +6,9 @@ rvm:
   - "2.1.1"
   - "2.1.0"
   - "2.0.0"
+  - "1.9.3"
 
-script: 'rspec spec/spec_natophone.rb'
+script: 'bundle exec rake spec'
 
 branches:
   only:

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 0.0.2 2014-09-07
+- Fixes
+- Tests
+- New app structure
+
+# 0.0.1 2014-09-07
+- Encode, Decode, CLI

data/NATOPhone.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require_relative 'lib/version'
+require 'version'
 
 Gem::Specification.new do |spec|
   spec.name          = "natophone"
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 0.18"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "rb-fsevent", "~> 0.9"

data/README.md

@@ -39,11 +39,15 @@ And then execute:
 ### Library
 
 ```ruby
-enc = NATOPhone::Encoder.new(args)
-puts enc.inspect
+require 'natophone'
 ```  
 
 ```ruby
-dec = NATOPhone::Decoder.new(args)
-puts dec.inspect
+enc_by_string = NATOPhone::Encoder.new('hello world')
+enc_by_array = NATOPhone::Encoder.new(['hello', 'world'])
+```  
+
+```ruby
+dec_by_string = NATOPhone::Decoder.new('hotel echo lima lima oscar - whiskey oscar romeo lima delta')
+dec_by_array = NATOPhone::Decoder.new(%w{hotel echo lima lima oscar - whiskey oscar romeo lima delta})
 ```  

data/bin/natophone

@@ -3,39 +3,6 @@
 
 require_relative "../lib/version"
 require_relative '../lib/app'
+require_relative "../lib/cli"
 
-require "thor"
-
-class NATOPhoneCLI < Thor
-
-  desc "encode WORD(S)", "Encode to NATO alphabet"
-  option :yell, aliases: '-Y', type: :boolean, desc: "Option to YELL the translation"
-  option :json, aliases: '-J', type: :boolean, desc: "Option to export the translation in JSON"
-  def encode(*args)
-    enc = NATOPhone::Encoder.new(args)
-    if options[:yell]
-      puts "\n#{enc.yell}\n\n"
-    elsif options[:json]
-      puts enc.to_json
-    else
-      puts "\n#{enc.translate}\n\n"
-    end
-  end
-
-  desc "decode NATO", "Decode from NATO alphabet"
-  option :yell, aliases: '-Y', type: :boolean, desc: "Option to YELL the translation"
-  option :json, aliases: '-J', type: :boolean, desc: "Option to export the translation in JSON"
-  def decode(*args)
-    dec = NATOPhone::Decoder.new(args)
-    if options[:yell]
-      puts "\n#{dec.yell}\n\n"
-    elsif options[:json]
-      puts dec.to_json
-    else
-      puts "\n#{dec.translate}\n\n"
-    end
-  end
-
-end
-
-NATOPhoneCLI.start(ARGV)
+NATOPhone::NATOPhoneCLI.start(ARGV)

data/lib/app.rb

@@ -20,7 +20,10 @@ module NATOPhone
     end
 
     def otan_alphabet_decode
-      otan_alphabet_encode.invert
+      otan = otan_alphabet_encode.invert
+      otan.merge!({
+          "point" => "."
+        })
     end
 
     def sanitize(string)
@@ -43,7 +46,7 @@ module NATOPhone
 
     def to_json
       {
-        'args' => args,
+        'args' => @args,
         'encode' => @encode,
         'translate' => @translate,
         'yell' => @yell
@@ -83,7 +86,7 @@ module NATOPhone
 
     def to_json
       {
-        'args' => args,
+        'args' => @args,
         'decode' => @decode,
         'translate' => @translate,
         'yell' => @yell
@@ -94,10 +97,16 @@ module NATOPhone
 
     def convert(args)
       words = []
-      args = [args] if args.is_a?(String)
-      args.each do |el|
-        word = el.split(' ')
-        word.each {|ok| words << ok}
+      if args.is_a?(String)
+        args.split(' ').each do |word|
+          words << word
+        end
+      else
+        args.each do |string|
+          string.split(' ').each do |word|
+            words << word
+          end
+        end
       end
       words.map {|word| @dic[word]}
     end

data/lib/cli.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# coding: UTF-8
+
+require "thor"
+
+module NATOPhone
+  class NATOPhoneCLI < Thor
+
+    desc "encode WORD(S)", "Encode to NATO alphabet"
+    option :yell, aliases: '-Y', type: :boolean, desc: "Option to YELL the translation"
+    option :json, aliases: '-J', type: :boolean, desc: "Option to export the translation in JSON"
+    def encode(*args)
+      enc = NATOPhone::Encoder.new(args)
+      if options[:yell]
+        puts "\n#{enc.yell}\n\n"
+      elsif options[:json]
+        puts enc.to_json
+      else
+        puts "\n#{enc.translate}\n\n"
+      end
+    end
+
+    desc "decode NATO", "Decode from NATO alphabet"
+    option :yell, aliases: '-Y', type: :boolean, desc: "Option to YELL the translation"
+    option :json, aliases: '-J', type: :boolean, desc: "Option to export the translation in JSON"
+    def decode(*args)
+      dec = NATOPhone::Decoder.new(args)
+      if options[:yell]
+        puts "\n#{dec.yell}\n\n"
+      elsif options[:json]
+        puts dec.to_json
+      else
+        puts "\n#{dec.translate}\n\n"
+      end
+    end
+
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module NATOPhone
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/cli_spec.rb

@@ -0,0 +1,42 @@
+require_relative 'spec_helper'
+require_relative 'helpers'
+
+describe NATOPhone::NATOPhoneCLI do
+
+  let(:cli) {NATOPhone::NATOPhoneCLI}
+
+  describe "#encode" do
+    it "encodes" do
+      printed = capture_stdout do
+        test = lambda {cli.start(['encode', 'hello world'])}
+        test.call
+      end
+      expect(printed).to eq "\nhotel echo lima lima oscar - whiskey oscar romeo lima delta\n\n"
+    end
+    it "encodes" do
+      printed = capture_stdout do
+        test = lambda {cli.start(['encode', 'hello', 'world'])}
+        test.call
+      end
+      expect(printed).to eq "\nhotel echo lima lima oscar - whiskey oscar romeo lima delta\n\n"
+    end
+  end
+
+  describe "#decode" do
+    it "decodes" do
+      printed = capture_stdout do
+        test = lambda {cli.start(['decode', 'hotel echo lima lima oscar - whiskey oscar romeo lima delta'])}
+        test.call
+      end
+      expect(printed).to eq "\nhello world\n\n"
+    end
+    it "decodes" do
+      printed = capture_stdout do
+        test = lambda {cli.start(['decode', 'hotel', 'echo'])}
+        test.call
+      end
+      expect(printed).to eq "\nhe\n\n"
+    end
+  end
+
+end

data/spec/natophone_spec.rb

@@ -0,0 +1,134 @@
+require_relative 'spec_helper'
+require_relative 'helpers'
+
+describe NATOPhone::Encoder do
+
+  let(:enc) { NATOPhone::Encoder.new('1.0 Hello World.') }
+  let(:enc2) { NATOPhone::Encoder.new(['1.0 Hello World.']) }
+
+  describe "#args" do
+    it "shows args" do
+      expect(enc.args).to eq '1.0 Hello World.'
+    end
+    it "shows args" do
+      expect(enc2.args).to eq ["1.0 Hello World."]
+    end
+  end
+
+  describe "#translate" do
+    str = 'one stop zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
+    it "shows translation" do
+      expect(enc.translate).to eq str
+    end
+    it "shows translation" do
+      expect(enc2.translate).to eq str
+    end
+  end
+
+  describe "#encode" do
+    arr = ["one", "stop", "zero", "-", "hotel", "echo", "lima", "lima", "oscar", "-", "whiskey", "oscar", "romeo", "lima", "delta", "stop"]
+    it "shows encoded result" do
+      expect(enc.encode).to eq arr
+    end
+    it "shows encoded result" do
+      expect(enc2.encode).to eq arr
+    end
+  end
+
+  describe "#yell" do
+    str = 'ONE STOP ZERO - HOTEL ECHO LIMA LIMA OSCAR - WHISKEY OSCAR ROMEO LIMA DELTA STOP'
+    it "shows the yell string" do
+      expect(enc.yell).to eq str
+    end
+    it "shows the yell string" do
+      expect(enc2.yell).to eq str
+    end
+  end
+
+  describe "#to_json" do
+    it "outputs json" do
+      j = JSON.parse(enc.to_json)
+      expect(j['args']).to eq '1.0 Hello World.'
+      expect(j['translate']).to eq 'one stop zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
+      expect(j['encode']).to eq ["one", "stop", "zero", "-", "hotel", "echo", "lima", "lima", "oscar", "-", "whiskey", "oscar", "romeo", "lima", "delta", "stop"]
+      expect(j['yell']).to eq 'ONE STOP ZERO - HOTEL ECHO LIMA LIMA OSCAR - WHISKEY OSCAR ROMEO LIMA DELTA STOP'
+    end
+    it "outputs json" do
+      j = JSON.parse(enc2.to_json)
+      expect(j['args']).to eq ['1.0 Hello World.']
+      expect(j['translate']).to eq 'one stop zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
+      expect(j['encode']).to eq ["one", "stop", "zero", "-", "hotel", "echo", "lima", "lima", "oscar", "-", "whiskey", "oscar", "romeo", "lima", "delta", "stop"]
+      expect(j['yell']).to eq 'ONE STOP ZERO - HOTEL ECHO LIMA LIMA OSCAR - WHISKEY OSCAR ROMEO LIMA DELTA STOP'
+    end
+  end
+
+end
+
+describe NATOPhone::Decoder do
+
+  let(:dec) { NATOPhone::Decoder.new('one point zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop') }
+  let(:dec2) { NATOPhone::Decoder.new(['one point zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop']) }
+
+  describe "#args" do
+    str = 'one point zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
+    it "shows args" do
+      expect(dec.args).to eq str
+    end
+    it "shows args" do
+      expect(dec2.args).to eq [str]
+    end
+  end
+
+  describe "#translate" do
+    str = '1.0 hello world.'
+    it "shows translation" do
+      expect(dec.translate).to eq str
+    end
+    it "shows translation" do
+      expect(dec2.translate).to eq str
+    end
+  end
+
+  describe "#decode" do
+    arr = ["1", ".", "0", " ", "h", "e", "l", "l", "o", " ", "w", "o", "r", "l", "d", "."]
+    it "shows decoded result" do
+      expect(dec.decode).to eq arr
+    end
+    it "shows decoded result" do
+      expect(dec2.decode).to eq arr
+    end
+  end
+
+  describe "#yell" do
+    str = '1.0 HELLO WORLD.'
+    it "shows the yell string" do
+      expect(dec.yell).to eq str
+    end
+    it "shows the yell string" do
+      expect(dec2.yell).to eq str
+    end
+  end
+
+  describe "#to_json" do
+    arg = 'one point zero - hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
+    trans = '1.0 hello world.'
+    deco = ["1", ".", "0", " ", "h", "e", "l", "l", "o", " ", "w", "o", "r", "l", "d", "."]
+    ye = '1.0 HELLO WORLD.'
+    it "outputs json" do
+      j = JSON.parse(dec.to_json)
+      expect(j['args']).to eq arg
+      expect(j['translate']).to eq trans
+      expect(j['decode']).to eq deco
+      expect(j['yell']).to eq ye
+    end
+    it "outputs json" do
+      j = JSON.parse(dec2.to_json)
+      expect(j['args']).to eq [arg]
+      expect(j['translate']).to eq trans
+      expect(j['decode']).to eq deco
+      expect(j['yell']).to eq ye
+    end
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -3,9 +3,10 @@ Coveralls.wear!
 
 require_relative '../lib/version'
 require_relative '../lib/app'
+require_relative '../lib/cli'
 
 RSpec.configure do |config|
-  # config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   # Run specs in random order to surface order dependencies. If you find an

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natophone
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eric Dejonckheere
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - NATOPhone.gemspec
@@ -128,10 +129,12 @@ files:
 - Rakefile
 - bin/natophone
 - lib/app.rb
+- lib/cli.rb
 - lib/version.rb
+- spec/cli_spec.rb
 - spec/helpers.rb
+- spec/natophone_spec.rb
 - spec/spec_helper.rb
-- spec/spec_natophone.rb
 homepage: https://github.com/ericdke/NATOPhone
 licenses:
 - MIT
@@ -157,6 +160,7 @@ signing_key:
 specification_version: 4
 summary: Simple tool to encode/decode NATO alphabet.
 test_files:
+- spec/cli_spec.rb
 - spec/helpers.rb
+- spec/natophone_spec.rb
 - spec/spec_helper.rb
-- spec/spec_natophone.rb

data/spec/spec_natophone.rb

@@ -1,55 +0,0 @@
-require_relative 'spec_helper'
-require_relative 'helpers'
-
-describe NATOPhone::Encoder do
-
-  let(:enc) { NATOPhone::Encoder.new('Hello World.') }
-
-  describe "#args" do
-
-    it "shows args" do
-      expect(enc.args).to eq 'Hello World.'
-    end
-
-    it "shows translation" do
-      expect(enc.translate).to eq 'hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
-    end
-
-    it "shows encoded result" do
-      expect(enc.encode).to eq ["hotel", "echo", "lima", "lima", "oscar", "-", "whiskey", "oscar", "romeo", "lima", "delta", "stop"]
-    end
-
-    it "shows the yell string" do
-      expect(enc.yell).to eq 'HOTEL ECHO LIMA LIMA OSCAR - WHISKEY OSCAR ROMEO LIMA DELTA STOP'
-    end
-
-  end
-
-end
-
-describe NATOPhone::Decoder do
-
-  let(:dec) { NATOPhone::Decoder.new('hotel echo lima lima oscar - whiskey oscar romeo lima delta stop') }
-
-  describe "#args" do
-
-    it "shows args" do
-      expect(dec.args).to eq 'hotel echo lima lima oscar - whiskey oscar romeo lima delta stop'
-    end
-
-    it "shows translation" do
-      expect(dec.translate).to eq 'hello world.'
-    end
-
-    it "shows decoded result" do
-      expect(dec.decode).to eq ["h", "e", "l", "l", "o", " ", "w", "o", "r", "l", "d", "."]
-    end
-
-    it "shows the yell string" do
-      expect(dec.yell).to eq 'HELLO WORLD.'
-    end
-
-  end
-
-end
-