junk_drawer 0.0.1 → 0.0.2

data/lib/core_extensions/kernel.rb

@@ -3,6 +3,6 @@ module Kernel
   def time(message, &block)
     start_time = Time.now
     yield
-    puts "#{message} - #{"%0.3f" % (Time.now - start_time)} seconds"
+    puts "#{message}: #{"%0.3f" % (Time.now - start_time)} seconds"
   end
 end

data/lib/core_extensions/object_id.rb

@@ -1,4 +1,4 @@
-require 'all_your_base/are/belong_to_us'
+require 'all_your_base'
 
 module BSON
   class ObjectID
@@ -6,7 +6,8 @@ module BSON
     # The reverse operation is String#to_oid.
     # Requires the all-your-base gem.
     def to_display
-      to_s.reverse.to_i(16).to_base_62
+      number = to_s.reverse.to_i(16)
+      ::AllYourBase::Are.convert_from_base_10 number, :radix => 62
     end
   end
 end

data/lib/core_extensions/string.rb

@@ -1,25 +1,31 @@
-require 'all_your_base/are/belong_to_us'
-
 class String
   class << self
     # Build a url/human-friendly random string. Defaults to 25 characters long.
     def friendly(length = 25)
-      @friendly_characters ||= ['0'..'9', 'a'..'z', 'A'..'Z'].map(&:to_a).flatten!
-      (1..length).map{@friendly_characters.sample}.join
+      (1..length).map{ friendly_characters.sample }.join
     end
 
     # Build a completely unfriendly random string. Defaults to 25 characters long.
     def crazy(length = 25)
-      @crazy_characters ||= ['0'..'9', 'a'..'z', 'A'..'Z'].map(&:to_a).flatten! + ["\\"] +
-        ['(', ')', ' '] + %w(~ ` ! @ # $ % ^ & * _ - + = [ ] { } | ; : ' " , < . > / ?)
-      (1..length).map{@crazy_characters.sample}.join
+      (1..length).map{ crazy_characters.sample }.join
+    end
+
+    private
+
+    def friendly_characters
+      @friendly_characters ||= ['0'..'9', 'a'..'z', 'A'..'Z'].map(&:to_a).flatten!
+    end
+
+    def crazy_characters
+      @crazy_characters ||= friendly_characters + ["\\", '(', ')', ' ', '`', '#', '"', "'", '?'] + 
+        %w(~ ! @ $ % ^ & * _ - + = [ ] { } | ; : , < . > /)
     end
   end
 
   # Translate a human-readable representation of an ObjectID instance back to an ObjectID.
   # Requires the all-your-base gem.
   def to_oid
-    string = from_base_62.to_s(16)
+    string = ::AllYourBase::Are.convert_to_base_10(self, :radix => 62).to_s(16)
 
     # replace leading zeroes that were lost during the hex conversion
     until string.length == 24
@@ -36,6 +42,6 @@ class String
 
   # Convenience method, for whenever you need to pepper something.
   def peppered
-    self + ENV['PEPPER']
+    self + ENV['PASSWORD_PEPPER']
   end
 end

data/lib/junk_drawer/version.rb

@@ -1,3 +1,3 @@
 module JunkDrawer
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: junk_drawer
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Hanks
@@ -15,24 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2010-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: all-your-base
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 description: A collection of Ruby core extensions and other goodies.
 email: 
@@ -44,14 +42,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/core_extensions/array.rb
+- lib/junk_drawer/version.rb
 - lib/core_extensions/object_id.rb
-- lib/core_extensions/time.rb
-- lib/core_extensions/kernel.rb
+- lib/core_extensions/array.rb
 - lib/core_extensions/object.rb
+- lib/core_extensions/kernel.rb
 - lib/core_extensions/string.rb
+- lib/core_extensions/time.rb
 - lib/junk_drawer.rb
-- lib/junk_drawer/version.rb
 - LICENSE
 - README.md
 - ROADMAP.md
@@ -70,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -680439407
       segments: 
       - 0
       version: "0"
@@ -79,7 +77,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3