finishing_moves 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56bf8257e6c87e6b608472cb3aa7aaafe5aa921
-  data.tar.gz: e0f8790fb33d1b2b613429a133cb77725a90d011
+  metadata.gz: 69a404faf013aed724182275a9161c727b342964
+  data.tar.gz: 5aa8ac458731e843686630cb0c17684f3057a03c
 SHA512:
-  metadata.gz: f406d28dbe0a08825c828aa3c856a7e7fd3910fc20cbda106babb058e4fff488feec211d0dceb06044f7e72978203034219c8b13a64db583d7122536ddae8aae
-  data.tar.gz: eb8715f761ddb6a4b7871591ab8e5118901736f1b6371305bfaccca7be01f972b892cf4610444c8097ca4e282b8bb9ba047a81fd073eb7df9efbc9c534bfd3e5
+  metadata.gz: e8efc6183a72dfa6d7608442151d9e47a933e986dae04f069a48783cedc3319868dc74bb664182b122813dc8415d917830723bea57cdbaca0935595d376e7995
+  data.tar.gz: 164284b79295232351b67a00abb58afb106050bbe9f5b8ef69fe737a017c828838d613230a66d8f6ded2230ff32623c6c32087c90a394d0406713af82e281d1d

data/README.md

@@ -49,6 +49,7 @@ Tested against **`2.0.0` and above**. Probably works in `1.9.3`.
   - [`Object#is_an?`](https://github.com/forgecrafted/finishing_moves/wiki/Object#objectis_an)
   - [`String#dedupe`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringdedupe)
   - [`String#keyify`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringkeyify)
+  - [`String#slugify`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringslugify) *<-- new in 0.6.0!*
   - [`String#match?`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringmatch)
   - [`String#nl2br`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringnl2br)
   - [`String#remove_whitespace`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringremove_whitespace)

data/lib/finishing_moves/string.rb

@@ -5,46 +5,23 @@ class String
   end
 
   def keyify
-    result = nil_chain do
-      the_key = self.clone
-
-      # strip all non-alphanumerics
-      the_key.gsub!(/[^0-9a-z]+/i, '_')
-
-      # borrowing some logic from Rails method underscore
-      # http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-underscore
-      if the_key =~ /[A-Z-]|::/
-        the_key.gsub!(/::/, '_')
-        the_key.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-        the_key.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      end
-
-      # Strip any leading numbers and underscores
-      the_key.lstrip_all!('0-9_')
-      # Strip trailing underscores
-      the_key.rstrip_all!('_')
-      # Combine multiple concurrent underscores
-      the_key.dedupe!('_')
-      # lowercase
-      the_key.downcase!
-      next the_key
-    end
-    return nil if result.nil? || result == ''
-    result.to_sym
+    _prep_key_or_slug(true)
   end
 
   def keyify!
-    result = self.keyify
+    result = _prep_key_or_slug(true)
     raise ArgumentError, "#{self.inspect} cannot be keyified, no valid characters" if result.nil?
     result
   end
 
   def slugify
-    _slugify_gsub(self.keyify)
+    _prep_key_or_slug(false)
   end
 
   def slugify!
-    _slugify_gsub(self.keyify!)
+    result = _prep_key_or_slug(false)
+    raise ArgumentError, "#{self.inspect} cannot be slugified, no valid characters" if result.nil?
+    result
   end
 
   def strip_all(chars = nil)
@@ -122,9 +99,40 @@ class String
       expr << ' '
     end
 
-    def _slugify_gsub(str)
-      return nil if str.nil?
-      str.to_s.gsub('_', '-')
+    def _prep_key_or_slug(keyified = true)
+      result = nil_chain do
+        the_key = self.clone
+
+        # strip all non-alphanumerics
+        the_key.gsub!(/[^0-9a-z]+/i, '_')
+
+        # borrowing some logic from Rails method underscore
+        # http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-underscore
+        if the_key =~ /[A-Z-]|::/
+          the_key.gsub!(/::/, '_')
+          the_key.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+          the_key.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        end
+
+        # Strip any leading numbers (keyify only)
+        the_key.lstrip_all!('0-9') if keyified
+        # Strip any leading or trailing underscores
+        the_key.strip_all!('_')
+        # Combine multiple concurrent underscores
+        the_key.dedupe!('_')
+        # lowercase
+        the_key.downcase!
+        # replace underscore with dashes (slugify only)
+        the_key.gsub!('_', '-') unless keyified
+        next the_key
+      end
+      case
+        when result.nil? || result == ''
+          nil
+        when keyified
+          result.to_sym
+        else result
+      end
     end
 
 end

data/lib/finishing_moves/version.rb

@@ -1,3 +1,3 @@
 module FinishingMoves
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/string_spec.rb

@@ -162,10 +162,8 @@ describe String do
     expect(:FooBarBaz.slugify).to eq 'foo-bar-baz'
     expect("Foo-Bar'Baz".slugify).to eq 'foo-bar-baz'
     expect('(Foo*&Bar!Baz?'.slugify).to eq 'foo-bar-baz'
-    expect('1234FooBAR'.slugify).to eq 'foo-bar'
     expect('!@#$Foo0987'.slugify).to eq 'foo0987'
     expect('!@#$%^'.slugify).to eq nil
-    expect('12345678'.slugify).to eq nil
     expect("Bill O'Shea".slugify).to eq 'bill-o-shea'
     expect("Bill O Shea".slugify).to eq 'bill-o-shea'
     expect("Bill O   Shea".slugify).to eq 'bill-o-shea'
@@ -174,11 +172,16 @@ describe String do
     str = 'FooBarBaz'
     expect(str.slugify).to eq 'foo-bar-baz'
     expect(str).to eq 'FooBarBaz'
+
+    # we permit leading numbers, unlike keyify
+    expect('!1234FooBAR'.slugify).to eq '1234-foo-bar'
+    expect('1234FooBAR'.slugify).to eq '1234-foo-bar'
+    expect('12345678'.slugify).to eq '12345678'
   end
 
   it '#slugify!' do
     expect{ '!@#$%^'.slugify! }.to raise_error(ArgumentError)
-    expect{ '12345678'.slugify! }.to raise_error(ArgumentError)
+    expect{ '12345678'.slugify! }.not_to raise_error
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finishing_moves
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Frank Koehl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline