morse-code-rb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d52693f5ba4566000e1e1b3dbf4601e0639854f
-  data.tar.gz: c9e11a75d919dfabdfa5e6d45f93740790f7c4f0
+SHA256:
+  metadata.gz: c054c4bd196b1c6b5f94bed7a2cdf1e6ec5ca3f88d894895409e92b6e23ffa35
+  data.tar.gz: e55557f5696b0f0f723f60e8b10a5560723fd065447f99107c1db2fd6deae7ee
 SHA512:
-  metadata.gz: 2508a171703c6e0fc04d39113221618c5fabfdcc66f5508ac4dae686d06e6b1c074246062cd82b208b9a79eeed24efd49517c7bfb24464ec74e5464d97a253a1
-  data.tar.gz: 148605233da1af1b81756e7b676cc34febda57e65706fabd433693edc567514af0ee29099412ce932f8a3164d3c1791b0ca8d986ee4537e609756fd1e2a532f5
+  metadata.gz: 4346ca4e6cfcd235cb4fffdcf522cf4dfba0b588a5affde4f47d3ddd7b86dd2e005fe39743bf1d30bbd3f11285d2584441225107ccaab172f4190ece69f1d8a8
+  data.tar.gz: 41504f9978c115307745703d532be5cb53b3dca42e21f943adc226054fee900dcf46dafc54fb272fd7c3670114c2f2153dce2adce9e8fd605228e570e9153eda

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Superiorlu
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/bin/mc

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'morse_code'
 
-MorseCode::Cli.start
+MorseCode::Cli.start

data/lib/morse_code/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'morse_code/error'
+
+module MorseCode
+  class Base
+    def self.inherited(subclass)
+      @@subclasses ||= []
+      @@subclasses << subclass
+    end
+
+    attr_reader :word
+
+    def initialize(word = '')
+      @word = word
+    end
+
+    def supported?
+      raise NotImplementedError, 'Subclass must override supported? method'
+    end
+
+    def supported_classes
+      supported_classes = Array(@@subclasses).select { |subclass| subclass.new(word).supported? }
+      puts "[WARING] Not Classs can support this #{word}!" if supported_classes.empty?
+      supported_classes
+    end
+  end
+end

data/lib/morse_code/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module MorseCode
@@ -6,7 +8,7 @@ module MorseCode
     map '-e' => :encode
     map '-d' => :decode
 
-    desc 'encode MESSAGE', 'encode message as Morse Code' 
+    desc 'encode MESSAGE', 'encode message as Morse Code'
     method_option :dit_dah, aliases: '-d', type: :boolean, desc: 'encode DITDAH message'
     def encode(message = '')
       if options[:dit_dah]
@@ -16,7 +18,7 @@ module MorseCode
       end
     end
 
-    desc 'decode MESSAGE', 'decode Morse Code as original message' 
+    desc 'decode MESSAGE', 'decode Morse Code as original message'
     method_option :dit_dah, aliases: '-d', type: :boolean, desc: 'decode from DITDAH message'
     def decode(message = '')
       if options[:dit_dah]

data/lib/morse_code/decoder.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require 'morse_code/decoders/base'
+require 'morse_code/base'
 require 'morse_code/decoders/chinese'
 require 'morse_code/decoders/english'
 
@@ -20,7 +22,7 @@ module MorseCode
             word.push(decode_char(char))
           end
         end
-        decode_words.push(word.join) if word.size > 0
+        decode_words.push(word.join) unless word.empty?
       end.join(' ')
     end
 
@@ -33,9 +35,11 @@ module MorseCode
     private
 
     def decode_char(char)
-      supported_class = MorseCode::Decoders::Base.new(char).supported_class
+      supported_classes = MorseCode::Base.new(char).supported_classes
+      supported_class = supported_classes.detect { |clazz| clazz.name.start_with?('MorseCode::Decoder') }
       return supported_class.new(char).decode if supported_class
-      return char
+
+      char
     end
   end
 end

data/lib/morse_code/decoders/chinese.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require_relative 'base'
+require 'morse_code/base'
 
 module MorseCode
   module Decoders
-    class Chinese < Base
-
+    class Chinese < MorseCode::Base
       MIN_CHINESE_CODEPOINT = 19_968  # \u4e00
       MAX_CHINESE_CODEPOINT = 40_869  # \u9fa5
 
@@ -19,7 +20,7 @@ module MorseCode
       private
 
       def decode_binary_word
-        @decode_binary_word ||= word.gsub('.', '0').gsub('-', '1').to_i(2)
+        @decode_binary_word ||= word.tr('.', '0').tr('-', '1').to_i(2)
       end
     end
   end

data/lib/morse_code/decoders/english.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require_relative 'base'
+require 'morse_code/base'
 
 module MorseCode
   module Decoders
-    class English < Base
-
+    class English < MorseCode::Base
       def supported?
         !MorseCode::DECODE_MAP[word].nil?
       end

data/lib/morse_code/encoder.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require 'morse_code/encoders/base'
+require 'morse_code/base'
 require 'morse_code/encoders/chinese'
 require 'morse_code/encoders/english'
 
@@ -32,9 +34,11 @@ module MorseCode
     end
 
     def encode_letter(letter)
-      supported_class = MorseCode::Encoders::Base.new(letter).supported_class
+      supported_classes = MorseCode::Base.new(letter).supported_classes
+      supported_class = supported_classes.detect { |clazz| clazz.name.start_with?('MorseCode::Encoder') }
       return supported_class.new(letter).encode if supported_class
-      return letter
+
+      letter
     end
   end
 end

data/lib/morse_code/encoders/chinese.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require_relative 'base'
+require 'morse_code/base'
 
 module MorseCode
   module Encoders
-    class Chinese < Base
-
+    class Chinese < MorseCode::Base
       def supported?
         !/\p{Han}/.match(word).nil? # \u4e00-\u9fa5
       end
 
       def encode
-        word.ord.to_s(2).gsub!('0', '.').gsub!('1', '-')
+        word.ord.to_s(2).tr!('0', '.').tr!('1', '-')
       end
     end
   end

data/lib/morse_code/encoders/english.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'morse_code/error'
-require_relative 'base'
+require 'morse_code/base'
 
 module MorseCode
   module Encoders
-    class English < Base
-
+    class English < MorseCode::Base
       def supported?
         !MorseCode::ENCODE_MAP[word].nil?
       end

data/lib/morse_code/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MorseCode
   class Error < StandardError; end
 

data/lib/morse_code/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MorseCode
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morse-code-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - YingRui Lu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,16 +158,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
 - README.md
 - bin/mc
 - lib/morse_code.rb
+- lib/morse_code/base.rb
 - lib/morse_code/cli.rb
 - lib/morse_code/decoder.rb
-- lib/morse_code/decoders/base.rb
 - lib/morse_code/decoders/chinese.rb
 - lib/morse_code/decoders/english.rb
 - lib/morse_code/encoder.rb
-- lib/morse_code/encoders/base.rb
 - lib/morse_code/encoders/chinese.rb
 - lib/morse_code/encoders/english.rb
 - lib/morse_code/error.rb
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Simple Morse Code Encode and Decode Tool

data/lib/morse_code/decoders/base.rb

@@ -1,29 +0,0 @@
-require 'morse_code/error'
-
-module MorseCode
-  module Decoders
-    class Base
-
-      def self.inherited(subclass)
-        @@subclasses ||= []
-        @@subclasses << subclass
-      end
-
-      attr_reader :word
-
-      def initialize(word = '')
-        @word = word
-      end
-
-      def supported?
-        raise NotImplementedError, 'Subclass must override supported? method'
-      end
-
-      def supported_class
-        supported_class = Array(@@subclasses).detect { |subclass| subclass.new(word).supported? }
-        puts "[WARING] Not Classs can decode this #{word}!" unless supported_class
-        supported_class
-      end
-    end
-  end
-end

data/lib/morse_code/encoders/base.rb

@@ -1,29 +0,0 @@
-require 'morse_code/error'
-
-module MorseCode
-  module Encoders
-    class Base
-
-      def self.inherited(subclass)
-        @@subclasses ||= []
-        @@subclasses << subclass
-      end
-
-      attr_reader :word
-
-      def initialize(word = '')
-        @word = word
-      end
-
-      def supported?
-        raise NotImplementedError, 'Subclass must override supported? method'
-      end
-
-      def supported_class
-        supported_class = Array(@@subclasses).detect { |subclass| subclass.new(word).supported? }
-        puts "[WARING] Not Classs can encode #{word}!" unless supported_class
-        supported_class
-      end
-    end
-  end
-end