shift_cipher 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62a19e3156396b6ae9b8e03e92147b6afa6939eb
-  data.tar.gz: 0a127d219db38403c298c6a6ec059c7db5fca804
+SHA256:
+  metadata.gz: 87ae282c5d202c988b9b263d2f36ee535670c8fe64e6505d87189ee43d0bf66f
+  data.tar.gz: 7bf8d7cf8071fa62afc459d6fdfbb621beca9c831bd42881cacd1f370e72c2fe
 SHA512:
-  metadata.gz: 6afa30e0afb2236a92659fa775b6bede6652d6d668628e0e05b0fbc55aa6f9342d18fac8611033a94297a8d81d6bb9422b0be759ef66d233677d3e63beb8f6c0
-  data.tar.gz: 726d3a52c26e4fb3dffbb1ecef70110ec70e38c11bccb33109daa69f5db79c08fe683cbf91fc8e6e874829ca5596e93affb5b3696a110894215d023a8d9c18dc
+  metadata.gz: f06e85cc27dc998ab730ae3dabe9bc479234bcda5755a90d3d323e6a835cdb690ea605e634a1078482d327e5d873dc91e6717262b5c23fb69b9d103592dea19d
+  data.tar.gz: 96ebd739e5923a9f51f628ae4f1702c8cce3412785c391b07260ce236b6e5ec45a4301175703a8aec4bea9bffa907d78b3470707802a5cbb75f379e82232f386

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.1
+  - 2.5.1

data/README.md

@@ -43,29 +43,16 @@ Encrypt a message:
 
 ```
   encrypted_message = cipher.encrypt('hello world') 
-  p encrypted_message # => "khoor zruog"
+  p encrypted_message # => "khoorzruog"
 ```
 
 Decrypt a message:
 
 ```
-  decrypted_message = cipher.decrypt('khoor zruog') 
-  p decrypted_message # => "hello world"
+  decrypted_message = cipher.decrypt('khoorzruog') 
+  p decrypted_message # => "helloworld"
 ```
 
-### Using the CLI tool:
-
-````
-  shift_cipher [options] text
-````
-
-#### Options
-   ```-h, --help```                Displays help message
-   ```-o, --offset OFFSET```       Sets the alphabet offset
-   ```-s, --start START```         Sets the starting letter of the shifted alphabet
-   ```-d, --decrypt```             Decrypts the given message    Decrypt
-
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/shift_cipher/caesar.rb

@@ -1,58 +1,46 @@
 module ShiftCipher
   class Caesar
-    attr_accessor :offset
-
-    def initialize(start = 0)
-
-      # set default
-      @offset = 0
-
-      # have we got a string?
-      if start.respond_to?(:ord)
+    DEFAULT_OFFSET = 0
 
-        # is it alphabetic?
-        if ('A'..'Z').include?(start)
-          @offset = start.downcase.ord - 97
-        elsif ('a'..'z').include?(start)
-          @offset = start.ord - 97
+    FIRST_UNICODE_CODEPOINT = 97
+    LAST_UNICODE_CODEPOINT = 123
 
-        # is it numeric & in range?
-        elsif (1..26).include?(start.to_i.abs)
-          @offset = start.to_i
-        end
-
-      # have we got a number
-      elsif start.respond_to?(:to_i)
-        # is it in range?
-        if (1..26).include?(start.to_i)
-          @offset = start.to_i
-        end
-      end
+    attr_accessor :offset
 
-      # raise an error ... 
-      # what about case when start set to 0?
+    def initialize(start = 0)
+      @offset = calculate_offset(start)
     end
 
     def encrypt(message)
-      shift(message, @offset)
+      shift(message, offset)
     end
 
     def decrypt(message)
-      shift(message, - @offset)
+      shift(message, -offset)
     end
 
     private
+
     def shift(message, directional_offset)
-      shifted_message = ""
-      message.downcase.split("").each do |character|
+      return unless message
+
+      message.downcase.split("").map do |character|
         if is_alpha?(character)
-          shifted_character = shift_character(character, directional_offset)
-          shifted_message += shifted_character
-        elsif is_numeric?(character) #or is_whitespace?(character)
-          shifted_message += character
+          character_for(character.ord + directional_offset)
+        elsif is_numeric?(character)
+          character
         end
-      end if message
-      shifted_message.squeeze(' ')
+      end.join("").squeeze(" ")
+    end
+
+    def calculate_offset(character)
+      if ("A".."z").include?(character)
+        character.downcase.ord - FIRST_UNICODE_CODEPOINT
+      elsif (0..26).include?(character.to_i.abs)
+        character.to_i
+      else
+        DEFAULT_OFFSET
+      end
     end
 
     def is_alpha?(character)
@@ -63,18 +51,17 @@ module ShiftCipher
       character.match(/^[[:digit:]]$/)
     end
 
-    def is_whitespace?(character)
-      character.match(/^\s$/)
-    end
-
-    def shift_character(character, offset)
-      shifted_ord = character.ord + offset
-      if shifted_ord < 97
-        shifted_ord = 123 - (97 - shifted_ord)
-      elsif shifted_ord > 122
-        shifted_ord = 97 + (shifted_ord - 123)
+    # Given the shifted order for a char, returns the corresponding character
+    # If the offset takes us past 123 ('z'), we wrap around to 97 ('A')
+    #
+    # Returns Char
+    def character_for(unicode_codepoint)
+      if unicode_codepoint < FIRST_UNICODE_CODEPOINT
+        unicode_codepoint = LAST_UNICODE_CODEPOINT - (FIRST_UNICODE_CODEPOINT - unicode_codepoint)
+      elsif unicode_codepoint >= LAST_UNICODE_CODEPOINT
+        unicode_codepoint = FIRST_UNICODE_CODEPOINT + (unicode_codepoint - LAST_UNICODE_CODEPOINT)
       end
-      shifted_ord.chr
+      unicode_codepoint.chr
     end
   end
-end
+end

data/lib/shift_cipher/version.rb

@@ -1,3 +1,3 @@
 module ShiftCipher
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/shift_cipher.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ["shift_cipher"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 
   # testing
-  spec.add_development_dependency "rspec", "~> 3.2", ">= 3.2.3"
-  spec.add_development_dependency "pry", "~> 0.10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,77 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: shift_cipher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - elsapet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 description: encrypt and de-crypt messages using a simple Caesar cipher, given an
   offset
 email: 
@@ -92,7 +86,6 @@ files:
 - bin/shift_cipher
 - lib/shift_cipher.rb
 - lib/shift_cipher/caesar.rb
-- lib/shift_cipher/caeser.rb
 - lib/shift_cipher/version.rb
 - shift_cipher.gemspec
 homepage: https://github.com/elsapet/shift_cipher
@@ -115,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: encrypt and de-crypt messages

data/lib/shift_cipher/caeser.rb

@@ -1,80 +0,0 @@
-module ShiftCipher
-  class Caeser
-    attr_accessor :offset
-
-    def initialize(start = 0)
-
-      # set default
-      @offset = 0
-
-      # have we got a string?
-      if start.respond_to?(:ord)
-
-        # is it alphabetic?
-        if ('A'..'Z').include?(start)
-          @offset = start.downcase.ord - 97
-        elsif ('a'..'z').include?(start)
-          @offset = start.ord - 97
-
-        # is it numeric & in range?
-        elsif (1..26).include?(start.to_i)
-          @offset = start.to_i
-        end
-
-      # have we got a number
-      elsif start.respond_to?(:to_i)
-        # is it in range?
-        if (1..26).include?(start.to_i)
-          @offset = start.to_i
-        end
-      end
-
-      # raise an error ... 
-      # what about case when start set to 0?
-    end
-
-    def encrypt(message)
-      shift(message, @offset)
-    end
-
-    def decrypt(message)
-      shift(message, - @offset)
-    end
-
-    private
-    def shift(message, directional_offset)
-      shifted_message = ""
-      message.downcase.split("").each do |character|
-        if is_alpha?(character)
-          shifted_character = shift_character(character, directional_offset)
-          shifted_message += shifted_character
-        elsif is_numeric?(character) or is_whitespace?(character)
-          shifted_message += character
-        end
-      end if message
-      shifted_message.squeeze(' ')
-    end
-
-    def is_alpha?(character)
-      character.match(/^[[:alpha:]]$/)
-    end
-
-    def is_numeric?(character)
-      character.match(/^[[:digit:]]$/)
-    end
-
-    def is_whitespace?(character)
-      character.match(/^\s$/)
-    end
-
-    def shift_character(character, offset)
-      shifted_ord = character.ord + offset
-      if shifted_ord < 97
-        shifted_ord = 123 - (97 - shifted_ord)
-      elsif shifted_ord > 122
-        shifted_ord = 97 + (shifted_ord - 123)
-      end
-      shifted_ord.chr
-    end
-  end
-end