midwire_common 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3ea3a72051d5ddbd9d134ead5755a51d33e921
-  data.tar.gz: 888d58a8a4f03a580ed33026a27d71d6d5b86866
+  metadata.gz: 70e04bafc57480ef9e1be8a862de1884dbdb49e9
+  data.tar.gz: e9d8fdae68ba0a603013973be8ed0ba435fe47a0
 SHA512:
-  metadata.gz: 2fedc21d6d7bdec9e85588f54fb0b85498110cb4cf9d1745031f1ed119599e587c078bd559d26aeccd2c02be6152fb6ca2097110958e40772116eeb01f758812
-  data.tar.gz: 0d87037520b53b04b8f48000568196ff5c269053de77a77ef86b2690479a3a5019a7042a1118634c3f649091ae18a60f0c1a9aa99bce2e3a753c7ec590d40377
+  metadata.gz: 78c9f3ca123983e09bd591b41340eb101be591c6c5eb0b715a3ba36a49c65278af66f60dd3230cd3ce784233b688c3f0c2fc900c6a247e4055f7a0966c7a9786
+  data.tar.gz: 6b85526806618d3d4959790a879f69ba8854baa82056aa57111d5308b6bc52f6e1605ea96de78bdd3a0b645e5c634a32a2675b888607553ee04fef9e3cff1778

data/CHANGELOG

@@ -1,3 +1,14 @@
+*0.1.17* (February 01, 2016)
+
+* Fix some redundant self references in string.rb
+* Simplify the email regex in string.rb
+* Add 'snakerirze' and 'camelize' methods in string.rb
+* Fix `version:bump` rake task to use single-quote string for VERSION.
+* Remove 'pry' dependency for 'version.rake'
+* Upgrade rubocop version 
+* Update the README.
+* Add some specs to cover changes.
+
 *0.1.16* (October 13, 2015)
 
 * Add BottomlessHash

data/README.md

@@ -1,14 +1,14 @@
 # Midwire Common Gem
 
-**Version: 0.1.16**
+**Version: 0.1.17**
 
-A handy Ruby library for Midwire development
+A handy, light-weight Ruby library for Midwire development
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'midwire_common', :require => 'midwire_common'
+    gem 'midwire_common'
 
 And then execute:
 
@@ -32,12 +32,18 @@ To use the standard class extensions you must include the individual files or 'm
 To use the rake tasks simply `load` that rake file from within your main `Rakefile`:
 
     begin
-      require "midwire_common/rake_tasks"
+      require 'midwire_common/rake_tasks'
     rescue Exception => e
       puts ">>> You have to run that under 'bundle exec'"
       exit
     end
 
+Create a `CHANGELOG` file for your project.
+
+    touch CHANGELOG
+
+The `rake version:*` tasks will prompt for CHANGELOG entries. Simply type them in and hit <CTRL>-d on a blank line when finished.
+
 ## Contributing
 
 1. Fork it

data/lib/midwire_common/string.rb

@@ -1,3 +1,4 @@
+# A light-weight super String class
 class String
   class << self
     def random(count = 6, ranges = [('a'..'z'), ('A'..'Z'), ('0'..'9')])
@@ -20,7 +21,7 @@ class String
   end
 
   def left_trim!
-    self.gsub!(/^[\t\s]+/, '') || ''
+    gsub!(/^[\t\s]+/, '') || ''
   end
 
   def right_trim
@@ -29,7 +30,7 @@ class String
   end
 
   def right_trim!
-    self.gsub!(/[\t\s]+$/, '') || ''
+    gsub!(/[\t\s]+$/, '') || ''
   end
 
   def trim
@@ -39,7 +40,7 @@ class String
 
   def trim!
     # remove leading and trailing whitespace
-    self.left_trim!.right_trim! || ''
+    left_trim!.right_trim! || ''
   end
 
   # html = <<-stop.here_with_pipe(delimeter="\n")
@@ -58,51 +59,11 @@ class String
     (self =~ regex) == 0 ? true : false
   end
 
-  # rubocop:disable Metrics/LineLength
   def email_address?
-    # //Email address
-    # //Use this version to seek out email addresses in random documents and texts.
-    # //Does not match email addresses using an IP address instead of a domain name.
-    # //Does not match email addresses on new-fangled top-level domains with more than 4 letters such as .museum.
-    # //Including these increases the risk of false positives when applying the regex to random documents.
-    # '\b[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b'
-    #
-    # //Email address (anchored)
-    # //Use this anchored version to check if a valid email address was entered.
-    # //Does not match email addresses using an IP address instead of a domain name.
-    # //Does not match email addresses on new-fangled top-level domains with more than 4 letters such as .museum.
-    # //Requires the "case insensitive" option to be ON.
-    # '^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$'
-    #
-    # //Email address (anchored; no consecutive dots)
-    # //Use this anchored version to check if a valid email address was entered.
-    # //Improves on the original email address regex by excluding addresses with consecutive dots such as john@aol...com
-    # //Does not match email addresses using an IP address instead of a domain name.
-    # //Does not match email addresses on new-fangled top-level domains with more than 4 letters such as .museum.
-    # //Including these increases the risk of false positives when applying the regex to random documents.
-    # '^[A-Z0-9._%-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}$'
-    #
-    # //Email address (no consecutive dots)
-    # //Use this version to seek out email addresses in random documents and texts.
-    # //Improves on the original email address regex by excluding addresses with consecutive dots such as john@aol...com
-    # //Does not match email addresses using an IP address instead of a domain name.
-    # //Does not match email addresses on new-fangled top-level domains with more than 4 letters such as .museum.
-    # //Including these increases the risk of false positives when applying the regex to random documents.
-    # '\b[A-Z0-9._%-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}\b'
-    #
-    # //Email address (specific TLDs)
-    # //Does not match email addresses using an IP address instead of a domain name.
-    # //Matches all country code top level domains, and specific common top level domains.
-    # '^[A-Z0-9._%-]+@[A-Z0-9.-]+\.(?:[A-Z]{2}|com|org|net|biz|info|name|aero|biz|info|jobs|museum|name)$'
-    #
-    # //Email address: Replace with HTML link
-    # '\b(?:mailto:)?([A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4})\b'
-
-    email_regex = %r{^[A-Z0-9._%-]+@[A-Z0-9.-]+\.(?:[A-Z]{2}|com|org|net|biz|info|name|aero|jobs|museum|edu|pro)$}xi # Case insensitive
+    email_regex = /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
     (self =~ email_regex) == 0 ? true : false
   end
-  # rubocop:enable Metrics/LineLength
 
   def zipcode?
     self =~ %r{^(\d{5})(-\d{4})?$}x ? true : false
@@ -126,7 +87,7 @@ class String
   end
 
   def sanitize!
-    self.gsub!(/[^a-z0-9,! \-\(\)\:\;\.\&\$]+/i, '')
+    gsub!(/[^a-z0-9,! \-\(\)\:\;\.\&\$]+/i, '')
   end
 
   def shorten(maxcount = 30)
@@ -151,4 +112,16 @@ class String
   def escape_double_quotes
     gsub(/["]/, '\\\\\"')
   end
+
+  def snakerize
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
+  end
+
+  def camelize
+    gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+  end
 end

data/lib/midwire_common/version.rb

@@ -1,6 +1,6 @@
 original_verbosity = $VERBOSE
 $VERBOSE = nil
 module MidwireCommon
-VERSION = "0.1.16"
+  VERSION = '0.1.17'
 end
 $VERBOSE = original_verbosity

data/lib/tasks/version.rake

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'rake'
 require 'readline'
 require 'fileutils'
-require 'pry'
 require 'midwire_common/string'
 
 module Bundler
@@ -47,10 +46,8 @@ namespace :version do
     Rake::Task['version:changes'].invoke
   end
 
-  # rubocop:disable Style/Blocks
   desc 'Alias for :bump_patch'
   task bump: :bump_patch do; end
-  # rubocop:enable Style/Blocks
 
   desc 'Increment the minor version and write changes to the changelog'
   task :bump_minor do
@@ -81,9 +78,9 @@ namespace :version do
   end
 
   def module_name
-    if PROJECT_NAME.match(/-/)
+    if PROJECT_NAME =~ /-/
       PROJECT_NAME.split('-').map(&:capitalize).join('::')
-    elsif PROJECT_NAME.match(/_/)
+    elsif PROJECT_NAME =~ /_/
       PROJECT_NAME.split('_').map(&:capitalize).join
     else
       PROJECT_NAME.capitalize
@@ -98,7 +95,7 @@ namespace :version do
 
   def write_version(version_array)
     version = version_array.join('.')
-    new_version = %(VERSION = "#{version}")
+    new_version = %(  VERSION = '#{version}')
     lines = File.readlines(version_file_path)
     File.open(version_file_path, 'w') do |f|
       lines.each do |line|
@@ -115,7 +112,7 @@ namespace :version do
     # read current changelog
     old = File.read("#{PROJECT_ROOT}/CHANGELOG").to_s.chomp
     text_array.push(old)
-    File.open("#{PROJECT_ROOT}/CHANGELOG", 'w')  do |f|
+    File.open("#{PROJECT_ROOT}/CHANGELOG", 'w') do |f|
       text_array.flatten.each do |line|
         f.puts(line)
       end
@@ -158,7 +155,7 @@ namespace :version do
     return true unless current_branch == 'master'
     puts(branch_warning_message)
     while (line = $stdin.gets.chomp)
-      return true if line.match(/[yY]/)
+      return true if line =~ /[yY]/
       puts 'Aborting version bump.'
       return false
     end

data/midwire_common.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-bundler', '~> 2.1'
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'guard-rubocop', '~> 1.2'
-  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-nav', '~> 0.2'
   spec.add_development_dependency 'rake', '~> 10.1'
-  spec.add_development_dependency 'rubocop', '~> 0.28'
+  spec.add_development_dependency 'rubocop', '~> 0.36'
 
   spec.add_dependency 'thor', '~> 0.19'
 end

data/spec/lib/midwire_common/string_spec.rb

@@ -3,9 +3,9 @@
 # rubocop:disable Metrics/LineLength
 require 'spec_helper'
 
-describe String do
+RSpec.describe String do
   it 'is a String' do
-    String.new.should be_a String
+    ''.should be_a String
   end
 
   it 'generates a random string' do
@@ -61,7 +61,7 @@ describe String do
         |<script type="text/javascript">
         |</script>
       STOP
-      html.should == "<!-- Begin: comment  --> <script type=\"text/javascript\"> </script>"
+      html.should == '<!-- Begin: comment  --> <script type="text/javascript"> </script>'
     end
 
     it 'here_with_pipe - with linefeeds' do
@@ -79,7 +79,7 @@ describe String do
         |<script type="text/javascript">
         |</script>
       STOP
-      html.should == "<!-- Begin: comment  --><script type=\"text/javascript\"></script>"
+      html.should == '<!-- Begin: comment  --><script type="text/javascript"></script>'
     end
 
     it 'format_phone returns a formatted phone number string' do
@@ -124,7 +124,7 @@ describe String do
 
       it 'escapes double quotes' do
         expect('this is a "test"'.escape_double_quotes)
-          .to eq("this is a \\\\\"test\\\\\"")
+          .to eq('this is a \\\\"test\\\\"')
       end
     end
   end
@@ -141,7 +141,6 @@ describe String do
     it 'knows if it is an email address or not' do
       'abcd_9191'.email_address?.should eq(false)
       'abcd@9191'.email_address?.should eq(false)
-      'abcd@9191.poop'.email_address?.should eq(false)
       'abcd@9191.info'.email_address?.should eq(true)
       'abcd-asdf@9191.com'.email_address?.should eq(true)
       'abcd_asdf@9191.com'.email_address?.should eq(true)
@@ -170,5 +169,25 @@ describe String do
       ' 12341.  '.numeric?.should eq(false)
     end
   end
+
+  context '.snakerize' do
+    it 'changes CamelCased string to snake_cased' do
+      expect('CamelCased'.snakerize).to eq('camel_cased')
+    end
+
+    it 'handles doulbe-colon' do
+      expect('Camel::CasedTwo'.snakerize).to eq('camel/cased_two')
+    end
+  end
+
+  context '.camelize' do
+    it 'changes snake cased string to camelized' do
+      expect('camel_cased'.camelize).to eq('CamelCased')
+    end
+
+    it 'handles slash' do
+      expect('camel/cased_two'.camelize).to eq('Camel::CasedTwo')
+    end
+  end
 end
 # rubocop:enable Metrics/LineLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midwire_common
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.36'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement