rearmed 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a547fa7cd7259d77eee0a4707cd1cf9589e9aa2
-  data.tar.gz: a0be2f3e5e61f6c6ffb8da8213bfd9dd7b767b6d
+  metadata.gz: 8cd8b9873096a342bb640e7bab688970350bf050
+  data.tar.gz: 84ac122091acba8d89b1c4f1b99bf2e9ff3896e2
 SHA512:
-  metadata.gz: f4fff0c4782edd10fee028e471469fa73ab5f8a0b8c0fa6a91f6debe23a9451e2afe7e45fe09c34ef9c6ad3b38686d5cb5f9fee199108706c6f86766279f429b
-  data.tar.gz: a6ba345629c2076c05c8fd219eddc4c4fe63772ebd683d81f967328759e1a88c1f862b636a27330f34df8dd0c5086901f74d0956ec68a7ce15cb8d98c9697183
+  metadata.gz: 704335a6f2403d194b54bfbca86c6660d49f3c6a5eab6eb2031d813032e9c7d62ea7b03f35d11dd6a11adf251a6b15c706e39046e2fb298f093d2904e313ddd7
+  data.tar.gz: d8d2552250bacd242eac8e83d492d6cde941a0177d4cbbc8888fececb7ffe568b7f336fa553bcc18746214dc02836744f3542aa34c998ba4694f8ea820e170fd

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 ---------
 
+- **1.3.1 - Sept 2, 2017**
+  - Add `Enumerable#select_map`
+  - Add `String#casecmp?` for Ruby 2.3.x and below
+  - Fix ruby 1.9.3 lambda syntax cannot contain space between stab and parenthesis
 - **1.3.0 - Feb 28, 2017**
   - Remove Rails and Minitest methods. Those methods moved to https://github.com/westonganger/rearmed_rails
   - Change methods names of Rearmed namespaced hash methods to convey better meaning

data/README.md

@@ -1,17 +1,18 @@
-# Rearmed Ruby
-<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='32' style='border:0px;height:32px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
+# Rearmed Ruby <a href='https://travis-ci.org/westonganger/rearmed-rb' target='_blank'><img src='https://api.travis-ci.org/westonganger/rearmed-rb.svg?branch=master' border='0' alt='Build Status' /></a> 
 
-A collection of helpful methods and monkey patches for Objects, Strings, Enumerables, Arrays, Hash, Dates
+<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='32' style='border:0px;height:32px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
 
-I have recently extracted the Rails and Minitest monkey patches to another gem https://github.com/westonganger/rearmed_rails because the Rails methods are getting quite extensive.
+A collection of helpful methods and monkey patches for Arrays, Hash, Enumerables, Strings, Objects & Dates in Ruby. [Rearmed is a collection of plugins](https://github.com/westonganger?utf8=%E2%9C%93&tab=repositories&q=rearmed) which are driven by making life easier & coding more natural.
 
 The difference between this library and others is that all monkey patching is performed in an opt-in way because you shouldnt be using methods you dont know about anyways. 
 
 When possible I have placed the method implementations inside the Rearmed module so if you don't like monkey patching or are working on the project with a team then you can use these methods instead. You can then skip the config and see how to use each implementation below the relevant methods documentation.
 
-```ruby
-# Gemfile
 
+# Install
+
+Add the following line to your gemfile:
+```ruby
 gem 'rearmed'
 ```
 
@@ -33,7 +34,8 @@ Rearmed.enabled_patches = {
   },
   enumerable: {
     natural_sort: false,
-    natural_sort_by: false
+    natural_sort_by: false,
+    select_map: false
   },
   hash: {
     compact: false,
@@ -48,6 +50,7 @@ Rearmed.enabled_patches = {
   },
   string: {
     begins_with: false,
+    casecmp?: false
     ends_with: false,
     starts_with: false,
     to_bool: false,
@@ -72,7 +75,7 @@ puts array # => [4,1]
 
 array.not_empty? # => true
 
-# Only available on array and hash in Ruby 2.2.x or below
+# Only monkey patched if using Ruby 2.2.x or below as this method was added to Ruby core in 2.3.0
 items = [{foo: ['foo','bar']}, {test: 'thing'}]
 items.dig(0, :foo, 1) # => 'bar'
 # or without monkey patch: Rearmed.dig(items, 0, :foo, 1)
@@ -88,6 +91,10 @@ items.natural_sort(reverse: true) # because natural_sort does not accept a block
 items = [{version: "1.1"}, {version: "1.11"}, {version: "1.2"}]
 items.natural_sort_by{|x| x[:version]} 
 # or without monkey patch: Rearmed.natural_sort_by(items){|x| x[:version]}
+
+items = [{version: "1.1"}, {version: nil}, {version: false}]
+items.select_map{|x| x[:version]} #=> [{version: "1.1"}]
+# or without monkey patch: Rearmed.select_map(items){|x| x[:version]}
 ```
 
 ## Date
@@ -108,12 +115,12 @@ hash.only!(:foo, :bar)
 hash.to_struct
 # or without monkey patch: Rearmed.hash_to_struct(hash)
 
-# Only available on array and hash in Ruby 2.2.x or below
+# Only monkey patched if using Ruby 2.2.x or below as this method was added to Ruby core in 2.3.0
 items = [{foo: ['foo','bar']}, {test: 'thing'}]
 items.dig(0, :foo, 1) # => 'bar'
 # or without monkey patch: Rearmed.dig(items, 0, :foo, 1)
 
-# Only available on array and hash in Ruby 2.3.x or below
+# Only monkey patched if using Ruby 2.3.x or below as this method was added to Ruby core in 2.4.0
 hash.compact
 # or without monkey patch: Rearmed.hash_compact(hash)
 hash.compact!
@@ -123,7 +130,7 @@ hash.compact!
 ```ruby
 my_var.not_nil?
 
-# In ActiveSupport / Rails this is not patched as this method is already defined there
+# Only monkey patched if not using ActiveSupport / Rails as this method is already defined there
 my_var.in?([1,2,3])
 my_var.in?(1,2,3) # or with splat arguments
 ```
@@ -143,6 +150,11 @@ my_var.in?(1,2,3) # or with splat arguments
 'foo'.starts_with?('fo') # => true
 'foo'.begins_with?('fo') # => true
 'bar'.ends_with?('ar') # => true
+
+# Only monkey patched if using Ruby 2.3.x or below as this method was added to Ruby core in 2.4.0
+'foo'.casecmp?('FOO') #=> true
+'foo'.casecmp?('FOOBAR') #=> false
+# or without monkey patch: Rearmed.casecmp?('foo', 'FOO')
 ```
 
 # Contributing / Todo
@@ -154,6 +166,11 @@ If you want to contribute here are a couple of things you could do:
 
 
 # Credits
-Created by Weston Ganger - @westonganger
+Created by Weston Ganger - [@westonganger](https://github.com/westonganger)
 
-<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='32' style='border:0px;height:32px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
+For any consulting or contract work please contact me via my company website: [Solid Foundation Web Development](https://solidfoundationwebdev.com)
+
+## Similar Libraries Created By Me
+- [Rearmed Rails](https://github.com/westonganger/rearmed_rails)
+- [Rearmed-JS](https://github.com/westonganger/rearmed-js)
+- [Rearmed-CSS](https://github.com/westonganger/rearmed-css)

data/lib/rearmed/default_enabled_patches.hash

@@ -9,7 +9,8 @@
   },
   enumerable: {
     natural_sort: false,
-    natural_sort_by: false
+    natural_sort_by: false,
+    select_map: false
   },
   hash: {
     compact: false,
@@ -24,6 +25,7 @@
   },
   string: {
     begins_with: false,
+    casecmp?: false,
     ends_with: false,
     starts_with: false,
     to_bool: false,

data/lib/rearmed/methods.rb

@@ -1,5 +1,11 @@
 module Rearmed
 
+  def self.casecmp?(str1, str2)
+    if str1.is_a?(String) && str2.is_a?(String)
+      str1.casecmp(str2) == 0
+    end
+  end
+
   def self.dig(collection, *values)
     current_val = nil
     current_collection = collection
@@ -35,11 +41,13 @@ module Rearmed
     return current_val
   end
 
+  def self.hash_compact(hash)
+    hash.reject{|_, value| value.nil?}
+  end
+
   def self.hash_join(hash, delimiter=', ', &block)
     unless block_given?
-      block = -> (k,v) {
-        "#{k}: #{v}"
-      }
+      block = ->(k,v){ "#{k}: #{v}" }
     end
 
     str = ""
@@ -59,15 +67,24 @@ module Rearmed
     return str
   end
 
-  def self.natural_sort_by(array)
-    array.sort_by{|x| self.naturalize_str(yield(x))}
+  def self.hash_only(hash, *keys)
+    keys.map!{|key| hash.convert_key(key)} if hash.respond_to?(:convert_key, true)
+    keys.each_with_object(hash.class.new){|k, new_hash| new_hash[k] = hash[k] if hash.has_key?(k)}
+  end
+
+  def self.hash_to_struct(hash)
+    Struct.new(*hash.keys).new(*hash.values)
+  end
+
+  def self.natural_sort_by(collection)
+    collection.sort_by{|x| self.naturalize_str(yield(x))}
   end
 
-  def self.natural_sort(array, options={})
+  def self.natural_sort(collection, options={})
     if block_given?
       Rearmed::Exceptions::BlockFoundError
     else
-      array.sort do |a,b| 
+      collection.sort do |a,b| 
         if options[:reverse] == true
           self.naturalize_str(b.to_s) <=> self.naturalize_str(a.to_s)
         else
@@ -76,14 +93,13 @@ module Rearmed
       end
     end
   end
-  
-  def self.hash_compact(hash)
-    hash.reject{|_, value| value.nil?}
-  end
 
-  def self.hash_only(hash, *keys)
-    keys.map!{|key| hash.convert_key(key)} if hash.respond_to?(:convert_key, true)
-    keys.each_with_object(hash.class.new){|k, new_hash| new_hash[k] = hash[k] if hash.has_key?(k)}
+  def self.select_map(collection)
+    if block_given?
+      collection.select{|x| yield(x) }.map{|x| yield(x) }
+    else
+      collection.select.map
+    end
   end
 
   def self.to_bool(str)
@@ -104,10 +120,6 @@ module Rearmed
     str =~ /(^(\d+)(\.)?(\d+)?$)|(^(\d+)?(\.)(\d+)$)/ ? true : false
   end
 
-  def self.hash_to_struct(hash)
-    Struct.new(*hash.keys).new(*hash.values)
-  end
-
   private
   
   def self.naturalize_str(str)

data/lib/rearmed/monkey_patches/date.rb

@@ -1,9 +1,13 @@
-date_enabled = Rearmed.enabled_patches[:date] == true
+if Rearmed.enabled_patches[:date] == true || Rearmed.dig(Rearmed.enabled_patches, :date, :now)
+
+  require 'date'
+
+  Date.class_eval do
 
-Date.class_eval do
-  if date_enabled || Rearmed.dig(Rearmed.enabled_patches, :date, :now)
     def self.now
       DateTime.now.to_date
     end
+
   end
+
 end

data/lib/rearmed/monkey_patches/enumerable.rb

@@ -16,4 +16,14 @@ Enumerable.module_eval do
       end
     end
   end
+
+  if enumerable_enabled || Rearmed.dig(Rearmed.enabled_patches, :enumerable, :select_map)
+    def select_map
+      if block_given?
+        Rearmed.select_map(self){|x| yield(x)}
+      else
+        Rearmed.select_map(self)
+      end
+    end
+  end
 end

data/lib/rearmed/monkey_patches/string.rb

@@ -1,6 +1,18 @@
 string_enabled = Rearmed.enabled_patches[:string] == true
 
 String.class_eval do
+  if !''.respond_to?(:casecmp?) && (string_enabled || Rearmed.dig(Rearmed.enabled_patches, :string, :casecmp?))
+    def casecmp?(str)
+      Rearmed.casecmp?(self, str)
+    end
+  end
+
+  if string_enabled || Rearmed.dig(Rearmed.enabled_patches, :string, :to_bool)
+    def to_bool
+      Rearmed.to_bool(self)
+    end
+  end
+
   if string_enabled || Rearmed.dig(Rearmed.enabled_patches, :string, :valid_integer)
     def valid_integer?
       Rearmed.valid_integer?(self)
@@ -13,12 +25,6 @@ String.class_eval do
     end
   end
 
-  if string_enabled || Rearmed.dig(Rearmed.enabled_patches, :string, :to_bool)
-    def to_bool
-      Rearmed.to_bool(self)
-    end
-  end
-
   if string_enabled || Rearmed.dig(Rearmed.enabled_patches, :string, :starts_with)
     alias_method :starts_with?, :start_with?
   end

data/lib/rearmed/version.rb

@@ -1,3 +1,3 @@
 module Rearmed
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/test/tc_rearmed.rb

@@ -42,6 +42,10 @@ class TestRearmed < MiniTest::Test
     str = '32a'
     eql(str.valid_integer?, false)
 
+
+    str = '12'
+    eql(Rearmed.valid_integer?(str), true)
+
     str = '132.2'
     eql(str.valid_float?, true)
 
@@ -51,6 +55,10 @@ class TestRearmed < MiniTest::Test
     str = '12.1a'
     eql(str.valid_float?, false)
 
+    str = '1.2'
+    eql(Rearmed.valid_float?(str), true)
+
+
     str = 'true'
     eql(str.to_bool, true)
 
@@ -60,15 +68,29 @@ class TestRearmed < MiniTest::Test
     str = 'not true'
     assert_nil(str.to_bool)
 
-
     str = 'true'
     eql(Rearmed.to_bool(str), true)
 
-    str = '12'
-    eql(Rearmed.valid_integer?(str), true)
 
-    str = '1.2'
-    eql(Rearmed.valid_float?(str), true)
+    str1 = 'foo'
+    str2 = 'foo'
+    eql(str1.casecmp?(str2), true)
+
+    str1 = 'foo'
+    str2 = 'FOO'
+    eql(str1.casecmp?(str2), true)
+
+    str1 = 'foo'
+    str2 = 'foobar'
+    eql(str1.casecmp?(str2), false)
+
+    str1 = 'foo'
+    str2 = 'fo'
+    eql(str1.casecmp?(str2), false)
+
+    str1 = 'foo'
+    str2 = 'foo'
+    eql(Rearmed.casecmp?(str1, str2), true)
   end
 
   def test_date
@@ -77,36 +99,21 @@ class TestRearmed < MiniTest::Test
 
   def test_enumerable
     items = ['1.1', '1.11', '1.2']
-
     eql(items.natural_sort, ['1.1','1.2','1.11'])
-
     eql(items.natural_sort(reverse: true), ['1.11','1.2','1.1'])
-
     eql(Rearmed.natural_sort(items), ['1.1','1.2','1.11'])
-
     eql(Rearmed.natural_sort(items, reverse: true), ['1.11','1.2','1.1'])
 
-
     items = [{version: "1.1"}, {version: "1.11"}, {version: "1.2"}]
-    
     eql(items.natural_sort_by{|x| x[:version]}, [{version: "1.1"}, {version: "1.2"}, {version: "1.11"}])
-    
     eql(Rearmed.natural_sort_by(items){|x| x[:version]}, [{version: "1.1"}, {version: "1.2"}, {version: "1.11"}])
 
+    items = [0, 1, 2, 3, nil, false]
+    eql(items.select_map{|x| x}, [0,1,2,3])
+    eql(Rearmed.select_map(items){|x| x}, [0,1,2,3])
 
-    # Only available on array and hash in Ruby 2.2.x or below
-    array = [{foo: ['foo','bar']}, {test: 'thing'}]
-
-    eql(array.dig(0, :foo, 1), 'bar')
-    assert_nil(array.dig(0, :foo, 2))
-
-    eql(Rearmed.dig(array, 1, :test), 'thing')
-    assert_nil(Rearmed.dig(array, 1, :bar))
-
-    hash = {a: {foo: ['bar']}, b: {c: 'c'}}
-    
-    eql(hash.dig(:a, :foo, 0), 'bar')
-    eql(Rearmed.dig(hash, :b, :c), 'c')
+    assert items.select_map.is_a?(Enumerator)
+    assert Rearmed.select_map(items).is_a?(Enumerator)
   end
 
   def test_array
@@ -123,6 +130,12 @@ class TestRearmed < MiniTest::Test
     eql(array, [1,2,1,3,4,1])
 
     eql(array.not_empty?, true)
+
+    array = [{foo: ['foo','bar']}, {test: 'thing'}]
+    eql(array.dig(0, :foo, 1), 'bar')
+    assert_nil(array.dig(0, :foo, 2))
+    eql(Rearmed.dig(array, 1, :test), 'thing')
+    assert_nil(Rearmed.dig(array, 1, :bar))
   end
   
   def test_hash
@@ -164,6 +177,10 @@ class TestRearmed < MiniTest::Test
     assert(struct.is_a?(Struct))
     eql(struct.foo, :bar)
     eql(struct.bar, 'foo')
+
+    hash = {a: {foo: ['bar']}, b: {c: 'c'}}
+    eql(hash.dig(:a, :foo, 0), 'bar')
+    eql(Rearmed.dig(hash, :b, :c), 'c')
   end
 
   def test_object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rearmed
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake