turkish_ranges 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 541ad676ae6e965932c387cc84ab9792636b640da5c5490ec0e456805a76c0d8
-  data.tar.gz: '0428644d1d5f0b167ed91235013ba23b5a465c5aad7be2150fb9c553982d4a55'
+  metadata.gz: 386efc347ab40b587cc60ad3ca10f35fd9b5e04ceb8ad96603804d8bd3e69eca
+  data.tar.gz: 6dd8c9396b8b67c7782359839a6178d23acb232846b48c95d8c9cc4b3a6f8744
 SHA512:
-  metadata.gz: 1eab65f0fc36146349dfe13dd72782f7b06e00386f83ddd8e07677b4a78b2736c9ce73bcfc85b9663fa969ca76ba4eb1e01ab0ca8be88a6ba0eb3ec7bb5fb419
-  data.tar.gz: 504e32de91f19004c41f95898da7a22f2d9a3c8b93928cd117aa424d70a5c736249e45dd3c779cb74ad2253fae4ea46a36ffd496a8a11676a650c91b536b216c
+  metadata.gz: 95f5d95590fb60fb2b752dedb9a9924bc1f508f60dae4da0ed6d3eb7357bd8926900710fd501dbad46ed7d24729b4942dcf681ae28b49b9f54653eb9f8d1f723
+  data.tar.gz: e58b346c366cf4336fcc380220190796a5d665be7caa4db1f2124e9dc6b689d9c4a3cf85466c3f4aae9bf8d0215ef6004f2c09731da5399c0dacd11039f4d2b8

data/CHANGELOG.md

@@ -1,7 +1,17 @@
-## [Version 0.0.1](https://github.com/sbagdat/turkish_ranges/releases/tag/v0.1.0) (2020-11-23)
+# Changelog
+## [Version 0.1.2](https://github.com/sbagdat/turkish_ranges/releases/tag/v0.1.1) (2020-11-24)
+### Fixed
+- Fix a bug related to string comparison [`e0a8754`](https://github.com/sbagdat/turkish_ranges/commit/e0a8754) 
+- Add an annotation to readme about current state of the project [`fbb69a4`](https://github.com/sbagdat/turkish_ranges/commit/fbb69a4)
+### Removed
+- Remove method: TrText#codepoints_sum - It was responsible for calculating total codepoints of each letter in the string [`e0a8754`](https://github.com/sbagdat/turkish_ranges/commit/e0a8754)
 
-### New features
+## [Version 0.1.1](https://github.com/sbagdat/turkish_ranges/releases/tag/v0.1.1) (2020-11-23)
+### Fixed
+- Fix paths in project's Gemfile [`001001f`](https://github.com/sbagdat/turkish_ranges/commit/001001f)
 
+## [Version 0.1.0](https://github.com/sbagdat/turkish_ranges/releases/tag/v0.1.0) (2020-11-23)
+### Added
 - Capability to create ranges containing turkish characters [`f1f4c5b`](https://github.com/sbagdat/turkish_ranges/commit/f1f4c5b)
 - Capability to compare string containing turkish characters [`f1f4c5b`](https://github.com/sbagdat/turkish_ranges/commit/f1f4c5b)
 - Creating strings with TrText#new [`f1f4c5b`](https://github.com/sbagdat/turkish_ranges/CHANGELOG.md/commit/f1f4c5b)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    turkish_ranges (0.1.1)
+    turkish_ranges (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,6 +7,9 @@
 
 Ranges and comparisons meet Turkish language. 
 
+**NOTICE:** This gem can create one-dimensional ranges like `a`..`z` and multi-dimensional ranges like `aa`..`az`. It can't 
+create complex ranges like `a`..`abc` right now. I have intended to add this feature in the near future. 
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -3,4 +3,10 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+task :cops do
+  sh 'rubocop'
+  puts '-' * 50
+  sh 'reek'
+end
+
 task default: :spec

data/lib/turkish_ranges.rb

@@ -3,8 +3,8 @@
 require 'turkish_ranges/version'
 require 'turkish_ranges/tr_text'
 
-# Responsible for generating ranges include Turkish specific chars
-# like ş, ç, ğ, ...
+# Responsible for generating ranges containing Turkish specific chars
+# like ş, ç, ğ, etc and comparing strings, they're  containing Turkish
+# specific chars, too.
 module TurkishRanges
 end
-

data/lib/turkish_ranges/tr_text.rb

@@ -7,9 +7,7 @@ module TurkishRanges
 
     # Sets the letters for the `TrText`.
     # @return [String] character sequence
-    attr_reader :letters
-
-    private :letters
+    attr_reader :letters, :letters_length
 
     # Using for character mapping
     MAP = 'DHJPTVdhiptvÈğıØşÝèĠIJøŠý'.chars.zip('ÇĞİÖŞÜçğıöşüDHJPTVdhiptv'.chars).to_h.freeze
@@ -24,14 +22,17 @@ module TurkishRanges
     # @return [TrText]
     def initialize(letters)
       @letters = letters
+      @letters_length = letters.length
     end
 
     # Using for object comparison
     #
     # @param [TrText] other
-    # # @return [Integer] 1, 0 or -1
+    # @return [Integer] 1, 0 or -1
     def <=>(other)
-      codepoints_sum <=> other.codepoints_sum
+      return 0 if letters == other.letters
+
+      compare_chars(zip_chars_with(other))
     end
 
     # Calculates codepoint of a single characacter based on ASCII_ALPHABET
@@ -41,13 +42,6 @@ module TurkishRanges
       ASCII_ALPHABET[letters] || letters&.ord.to_i
     end
 
-    # Calculates the sum of codepoints in letters
-    #
-    # @return [Integer]
-    def codepoints_sum
-      letters.chars.map { TrText.new(_1) }.map(&:code).inject(:+)
-    end
-
     # Calculates the successor string from `letters`
     #
     # @return [String]
@@ -78,7 +72,43 @@ module TurkishRanges
     def inspect
       letters
     end
+
+    protected
+
+    # Creates a zipped array from letters
+    #
+    # @param [TrText] other
+    # @return [Array] contains char pairs of each letters
+    def zip_chars_with(other)
+      max_length = [letters_length, other.letters_length].max
+      left_side = letters.ljust(max_length).chars
+      right_side = other.letters.ljust(max_length).chars
+      left_side.zip(right_side)
+    end
+
+    private
+
+    # Compares left and right side of spaceship operator
+    # If left side is bigger than right side returns 1,
+    # otherwise returns -1
+    #
+    # @param [Array] zipped_chars
+    # @return [Integer] 1 or -1
+    def compare_chars(zipped_chars)
+      zipped_chars.each do |char_pairs|
+        left, right = char_pairs
+        next if left == right
+
+        return single_char(left).code > single_char(right).code ? 1 : -1
+      end
+    end
+
+    # Creates an instance of TrText
+    #
+    # @param [String] letter
+    # @return [TrText]
+    def single_char(letter)
+      self.class.new(letter)
+    end
   end
 end
-
-(TurkishRanges::TrText.new("a")..TurkishRanges::TrText.new("z")).to_a

data/lib/turkish_ranges/version.rb

@@ -2,5 +2,5 @@
 
 module TurkishRanges
   # Version of TurkishRanges
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/tr_text_spec.rb

@@ -19,12 +19,6 @@ RSpec.describe 'TrLetterSpec' do
     end
   end
 
-  context '#codepoints_sum' do
-    it 'returns total codepoints of letters' do
-      expect(TrText.new('ABCÇ').codepoints_sum).to eq 65 + 66 + 67 + 68
-    end
-  end
-
   context 'when doing comparisons' do
     it 'can compare two letters' do
       expect(TrText.new('Ş') > TrText.new('Ğ')).to  be true
@@ -60,9 +54,9 @@ RSpec.describe 'TrLetterSpec' do
       expect(upper_case_range.to_a.join).to eq g_to_u_upper_case
     end
 
-    it 'creates ranges of mutliple characters' do
-      z_to_ad_lower_case = 'zaaabacaçad'
-      z_to_ad_upper_case = 'ZAAABACAÇAD'
+    it 'creates empty range if left side is bigger' do
+      z_to_ad_lower_case = ''
+      z_to_ad_upper_case = ''
       lower_case_range = TrText.new('z')..TrText.new('ad')
       upper_case_range = TrText.new('Z')..TrText.new('AD')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turkish_ranges
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sıtkı Bağdat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Ranges and string comparisons meet Turkish language. You can use it anywhere
   in your code, Range, Regexp, etc..