corelib 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40273d8345128c15662dbb6b8405b9cbe478f33
-  data.tar.gz: 10e8b878e22f4bb36d968b528726e56b998dce83
+  metadata.gz: c0ac87a91fb82f694988f255c4be34ef9c573435
+  data.tar.gz: e455b0b884bdea156b1546bcf651b7f91d540c50
 SHA512:
-  metadata.gz: c3eed0d06beb744ac7105a1a6bf9b6755735d8db87cce9929b71569299c301934b84559b5df2e15e2a2e776953234e0a204090ebc630a0a28ff970f6ae64a724
-  data.tar.gz: 865b337465c7d99d0c8d91e1c5747ce4df155f1399c65317529732d8190f8887b6d9448c7070e259d6dcb759f90de89ef1a79333a7d17ed1defb3e146e53b75d
+  metadata.gz: cadb1a59d488749bbf0a67614262556374489506788a49e3a2cd0687c84521904ec3180aa5769c6c36514eff337ebc94fa7918e64e092449cdef4b35c9330f22
+  data.tar.gz: 90f8e2a12a538c73ad8006ffc3fd0971e9952806dabab9362fde193f57ec3d095f99ca89ea81ad161847456829ecd3b768d96817e38a201f108b77e0b5c77a8f

data/corelib.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'activesupport', '>= 4.0.2'
+
   gem.add_development_dependency 'rspec'
 end

data/lib/corelib.rb

@@ -13,4 +13,6 @@ require "corelib/hash/core"
 require "corelib/nil/core"
 require "corelib/object/core"
 require "corelib/numeric/core"
-require "corelib/string/core"
+require "corelib/string/core"
+
+require "active_support/all"

data/lib/corelib/array/core.rb

@@ -1,5 +1,9 @@
 class Array
 
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end
+
 	def to_yes_no(options={})
     self.collect {|e| e.to_yes_no(options)}
   end

data/lib/corelib/string/core.rb

@@ -2,38 +2,29 @@ class String
 
   #TODO - Needs Tests
   def last
-    return nil if self.empty?
-    self[-1,1]
+    self.empty? ? nil : self[-1,1]
   end
 
   #TODO - Needs Tests
   def first
-    return nil if self.empty?
-    self[0,1]
+    self.empty? ? nil : self[0,1]
   end
 
   #TODO - Needs Tests
   # Combines two strings together with a separator.
-  def combine(str, options={})
-    strip = options.fetch(:strip, true)
-    (return strip ? self.strip : self.dup) if str.nil? or str.empty?
-    (return strip ? str.strip : str.dup) if self.empty?
-    separator = options.fetch(:separator, " ")
-
-    if strip
-      pre = self.strip
-      post = str.strip
-    else
-      pre = self.dup
-      post = str.dup
-    end
-
-    return pre + post if separator.empty?
-
-    # TODO - Support other separators other than spaces.  For instance if someone wanted to join with a comma
-    # and pre ended with a comma, we could have an option to disallow repeating
-    pre + separator + post
-
+  def combine(*args)
+    options = args.extract_options!
+    raise ArgumentError, "You need to supply at least one string" if args.empty?
+    str = self
+    args.each { |val| str = str.priv_combine(val, options) }
+
+    return options.fetch(:if_empty, "") if str.blank?
+
+    prefix = options.fetch(:prefix, nil)
+    str = "#{prefix}#{str}"  if options.fetch(:wrap, "true") and (prefix.not_nil?)
+    suffix = options.fetch(:suffix, nil)
+    str = "#{str}#{suffix}" if options.fetch(:wrap, "true") and (suffix.not_nil?)
+    str
   end
 
   #Does the same thing as String#contact, but allows a separator to be inserted between the
@@ -46,13 +37,13 @@ class String
   end
 
   def to_yes_no(options={})
-		self.to_bool(options).to_yes_no(options)
-	end
+    self.to_bool(options).to_yes_no(options)
+  end
 
-	#true will always be returned if we can clearly match one of the true cases
-	#In unstrict mode, the string is assumed false if we cannot match true
-	#In strict mode, the string must clearly match a false condition to return false
-	#otherise an error is raised
+  #true will always be returned if we can clearly match one of the true cases
+  #In unstrict mode, the string is assumed false if we cannot match true
+  #In strict mode, the string must clearly match a false condition to return false
+  #otherise an error is raised
   def to_bool(options={})
     strip = options.fetch(:strip, true)
     strict = options.fetch(:strict, false)
@@ -61,7 +52,7 @@ class String
 
     if strict
       return false if str.empty? || str =~ /\A(false|f|no|n|0)\Z/i
-        raise ArgumentError.new("cannot convert \"#{str}\" to boolean")
+      raise ArgumentError.new("cannot convert \"#{str}\" to boolean")
     end
 
     false
@@ -96,4 +87,27 @@ class String
     idx
   end
 
+protected
+
+    def priv_combine(str, options={})
+      strip = options.fetch(:strip, true)
+      (return strip ? self.strip : self.dup) if str.nil? or str.empty?
+      (return strip ? str.strip : str.dup) if self.empty?
+      separator = options.fetch(:separator, " ")
+
+      if strip
+        pre = self.strip
+        post = str.strip
+      else
+        pre = self.dup
+        post = str.dup
+      end
+
+      return pre + post if separator.empty?
+
+      # TODO - Support other separators other than spaces.  For instance if someone wanted to join with a comma
+      # and pre ended with a comma, we could have an option to disallow repeating
+      pre + separator + post
+    end
+
 end

data/lib/corelib/version.rb

@@ -1,3 +1,3 @@
 module Corelib
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/string/core_spec.rb

@@ -1,11 +1,22 @@
 require 'spec_helper'
 
 describe String do
+
   describe "#combine" do
     it 'defaults work' do
       "test".combine("test2").should == "test test2"
       "".combine("test2").should=="test2"
       "test".combine("").should == "test"
+      "test".combine("me", "out").should == "test me out"
+    end
+    it "setting prefix & suffix works" do
+      "test".combine("me", :prefix => "(").should == "(test me"
+      "test".combine("me", :suffix => ")").should == "test me)"
+      "test".combine("me", :prefix => "(", :suffix => ")").should == "(test me)"
+      "test".combine("me", :prefix => "(", :suffix => ")", :wrap => false).should == "test me"
+    end
+    it "if_empty option works" do
+      "".combine("", :if_empty => "-").should == "-"
     end
   end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: corelib
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Corlew Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement