keytar 1.2.1 → 1.3.0

data/Gemfile

@@ -1,4 +1,5 @@
 source 'http://rubygems.org'
+ gem 'activesupport'
 
 group :development, :test do
   gem 'activerecord', '~>3.0.4' ## not needed if you're just using KeyBuilder

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/keytar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{keytar}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Schneems"]
-  s.date = %q{2011-07-06}
+  s.date = %q{2011-07-13}
   s.description = %q{
     Keytar is a Ruby on Rails wrapper for KeyBuilder.
     Use KeyBuilder to automatically generate keys based on class name instead of cluttering model
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/.DS_Store",
     "lib/keytar.rb",
     "lib/keytar/key_builder.rb",
-    "lib/keytar/key_utility.rb",
     "license.txt",
     "spec/keytar/key_builder_spec.rb",
     "spec/keytar/keytar_spec.rb",
@@ -53,6 +52,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.0.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.4"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.4"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/keytar.rb

@@ -1,8 +1,11 @@
+require 'active_support/all'
+autoload :KeyUtility, "keytar/key_utility"
+autoload :KeyBuilder, 'keytar/key_builder'
 
 module Keytar
-  autoload :KeyUtility, "keytar/key_utility"
-  autoload :KeyBuilder, 'keytar/key_builder'
-  def self.included(klass)
-    klass.class_eval {include KeyBuilder}
+  extend ActiveSupport::Concern
+
+  included do
+    include KeyBuilder
   end
 end

data/lib/keytar/key_builder.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'key_utility') ## gives us support for Object#blank, Object#present?, String.pluralize without require ActiveSupport
-
 module KeyBuilder
   DEFAULTS = {:key_delimiter => ":",
                 :key_order => [:shard, :prefix, :base, :name, :unique, :args, :suffix, :version, :v],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keytar
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Schneems
@@ -15,12 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -05:00
+date: 2011-07-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: activesupport
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +46,11 @@ dependencies:
         - 4
         version: 3.0.4
   name: activerecord
-  version_requirements: *id001
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +62,11 @@ dependencies:
         - 7
         version: 0.8.7
   name: rake
-  version_requirements: *id002
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +78,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id003
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +92,11 @@ dependencies:
         - 0
         version: "0"
   name: autotest-standalone
-  version_requirements: *id004
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +106,11 @@ dependencies:
         - 0
         version: "0"
   name: autotest-growl
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,7 +120,7 @@ dependencies:
         - 0
         version: "0"
   name: rspec
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 description: "\n    Keytar is a Ruby on Rails wrapper for KeyBuilder.\n    Use KeyBuilder to automatically generate keys based on class name instead of cluttering model\n    definitions with tons of redundant key method declarations.\n  "
 email: richard.schneeman@gmail.com
@@ -129,7 +143,6 @@ files:
 - lib/.DS_Store
 - lib/keytar.rb
 - lib/keytar/key_builder.rb
-- lib/keytar/key_utility.rb
 - license.txt
 - spec/keytar/key_builder_spec.rb
 - spec/keytar/keytar_spec.rb

data/lib/keytar/key_utility.rb

@@ -1,26 +0,0 @@
-# Monkey patches for Object#blank?, Object.present? and String#pluralize
-# If active support is required, this won't be used, but
-# we shouldn't require a ruby project to use ActiveSupport
-# just for these three simple things
-
-module KeyUtility
-  unless Object.respond_to?(:blank?)
-    Object.class_eval do
-      def blank?
-        respond_to?(:empty?) ? empty? : !self
-      end
-
-      def present?
-        !blank?
-      end
-    end
-  end
-
-  unless String.new.respond_to? :pluralize
-    String.class_eval do
-      def pluralize
-        self[(self.length - 1), 1] =~ /s/i ? self : "#{self}s"
-      end
-    end
-  end
-end