validates_im 1.0.0 → 1.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tim Morgan
+Copyright (c) 2010 Tim Morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -1,7 +1,7 @@
 h1. validates_im -- Instant messenger account validations for ActiveRecord
 
 | *Author* | Tim Morgan |
-| *Version* | 1.0 (Oct 30, 2010) |
+| *Version* | 1.1 (Aug 31, 2011) |
 | *License* | Released under the MIT license. |
 
 h2. About

data/lib/account_name_validator.rb

@@ -55,7 +55,7 @@
 #   validations.
 
 class AccountNameValidator < ActiveModel::EachValidator
-  class_inheritable_array :validations
+  class_attribute :validations
   self.validations = Array.new
 
   # @private
@@ -94,7 +94,7 @@ class AccountNameValidator < ActiveModel::EachValidator
 
   def self.add_validation(key, &block)
     return unless block_given?
-    self.validations << [ block, key ]
+    self.validations += [[ block, key ]]
   end
 
   # Enforces a minimum length on account names. Uses the "too_short" error

data/validates_im.gemspec

@@ -1,62 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{validates_im}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Morgan"]
-  s.date = %q{2010-10-30}
-  s.description = %q{Adds ActiveModel validators for common instant messenging services like Skype and AIM.}
+  s.authors = [%q{Tim Morgan}]
+  s.date = %q{2011-08-31}
+  s.description = %q{Adds ActiveModel validators for common instant messaging services like Skype and AIM.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "lib/account_name_validator.rb",
-     "lib/aim_validator.rb",
-     "lib/skype_validator.rb",
-     "lib/steam_validator.rb",
-     "lib/validates_im.rb",
-     "lib/xbox_live_validator.rb",
-     "lib/yahoo_im_validator.rb",
-     "spec/account_name_validator_spec.rb",
-     "spec/spec_helper.rb",
-     "validates_im.gemspec"
+    "LICENSE",
+    "README.textile",
+    "lib/account_name_validator.rb",
+    "lib/aim_validator.rb",
+    "lib/skype_validator.rb",
+    "lib/steam_validator.rb",
+    "lib/validates_im.rb",
+    "lib/xbox_live_validator.rb",
+    "lib/yahoo_im_validator.rb",
+    "validates_im.gemspec"
   ]
   s.homepage = %q{http://github.com/riscfuture/validates_im}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A set of Rails validators for common instant messenging services}
-  s.test_files = [
-    "spec/account_name_validator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
+  s.summary = %q{A set of Rails validators for common instant messaging services}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
     else
+      s.add_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 3.0"])
     end
   else
+    s.add_dependency(%q<activerecord>, [">= 3.1"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 3.0"])
   end
 end

metadata

@@ -1,55 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validates_im
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-30 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-31 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2167709520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2167709520
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2167708860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2167708860
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2167708280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2167708280
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &2167707660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2167707660
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2167707060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2167707060
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2167706460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-description: Adds ActiveModel validators for common instant messenging services like Skype and AIM.
+  version_requirements: *2167706460
+description: Adds ActiveModel validators for common instant messaging services like
+  Skype and AIM.
 email: git@timothymorgan.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
-- .document
-- .gitignore
-- .rspec
-- Gemfile
-- Gemfile.lock
+files:
 - LICENSE
 - README.textile
-- Rakefile
-- VERSION
 - lib/account_name_validator.rb
 - lib/aim_validator.rb
 - lib/skype_validator.rb
@@ -57,42 +95,32 @@ files:
 - lib/validates_im.rb
 - lib/xbox_live_validator.rb
 - lib/yahoo_im_validator.rb
-- spec/account_name_validator_spec.rb
-- spec/spec_helper.rb
 - validates_im.gemspec
-has_rdoc: true
 homepage: http://github.com/riscfuture/validates_im
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3410244154363929374
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 221433530893937633
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
-summary: A set of Rails validators for common instant messenging services
-test_files: 
-- spec/account_name_validator_spec.rb
-- spec/spec_helper.rb
+summary: A set of Rails validators for common instant messaging services
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,25 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.rvmrc
-.bundle
-
-## PROJECT::DOCUMENTATION
-.yardoc
-doc

data/.rspec

@@ -1 +0,0 @@
--cfs

data/Gemfile

@@ -1,12 +0,0 @@
-source :rubygems
-
-# DEPENDENCIES
-gem 'activerecord', require: 'active_record'
-
-# DEVELOPMENT
-gem 'jeweler'
-gem 'yard'
-gem 'RedCloth', require: 'redcloth'
-
-# TEST
-gem 'rspec'

data/Gemfile.lock

@@ -1,50 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.3)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
-    yard (0.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  activerecord
-  jeweler
-  rspec
-  yard

data/Rakefile

@@ -1,35 +0,0 @@
-require 'rake'
-begin
-  require 'bundler'
-rescue LoadError
-  puts "Bundler is not installed; install with `gem install bundler`."
-  exit 1
-end
-
-Bundler.require :default
-
-Jeweler::Tasks.new do |gem|
-  gem.name = "validates_im"
-  gem.summary = %Q{A set of Rails validators for common instant messenging services}
-  gem.description = %Q{Adds ActiveModel validators for common instant messenging services like Skype and AIM.}
-  gem.email = "git@timothymorgan.info"
-  gem.homepage = "http://github.com/riscfuture/validates_im"
-  gem.authors = [ "Tim Morgan" ]
-  gem.add_dependency 'activerecord', '>= 3.0'
-end
-Jeweler::GemcutterTasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-YARD::Rake::YardocTask.new('doc') do |doc|
-  doc.options << "-m" << "textile"
-  doc.options << "--protected"
-  doc.options << "-r" << "README.textile"
-  doc.options << "-o" << "doc"
-  doc.options << "--title" << "validates_im Documentation".inspect
-  
-  doc.files = [ 'lib/*_validator.rb', 'README.textile' ]
-end
-
-task(default: :spec)

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/spec/account_name_validator_spec.rb

@@ -1,115 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-module SpecSupport
-  class TestAccountNameValidator < AccountNameValidator; end
-  class FakeModel
-    extend ActiveModel::Translation
-    def errors() @errors ||= ActiveModel::Errors.new(self) end
-    def self.lookup_ancestors() [ self ] end
-    def read_attribute_for_validation(_) "mock" end
-  end
-end
-
-describe AccountNameValidator do
-  before :each do
-    SpecSupport::TestAccountNameValidator.validations.clear
-    @model = SpecSupport::FakeModel.new
-  end
-
-  describe ".error_key_prefix" do
-    it "should be the downcased name of the validator by default" do
-      SpecSupport::TestAccountNameValidator.error_key_prefix.should eql(:test_account_name)
-    end
-
-    it "should be able to be set" do
-      SpecSupport::TestAccountNameValidator.error_key_prefix(:foo)
-      SpecSupport::TestAccountNameValidator.error_key_prefix.should eql(:foo)
-      SpecSupport::TestAccountNameValidator.instance_variable_set :@error_key_prefix, nil
-    end
-  end
-
-  describe "#validate_each" do
-    it "should do nothing if given nil and :allow_nil is set" do
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, allow_nil: true).validate_each(@model, :field, nil)
-      @model.errors.should be_empty
-    end
-
-    it "should do nothing if given a blank value and :allow_blank is set" do
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, allow_blank: true).validate_each(@model, :field, "")
-      @model.errors.should be_empty
-    end
-
-    it "should add an error to the record if any validation fails" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'bar')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('test_account_name_not_foo')
-    end
-
-    it "should use a :message option for the message" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field, message: 'bar').validate_each(@model, :field, 'bar')
-      @model.errors[:field].should eql([ 'bar' ])
-    end
-    
-    it "should typecast the value to a string" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, :foo)
-      @model.errors.should be_empty
-    end
-  end
-
-  describe ".add_validation" do
-    before :each do
-      @validator = SpecSupport::TestAccountNameValidator.new(attributes: :field)
-    end
-
-    it "should add a validation block" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo) { |value| value == 'foo' }
-      @validator.validate_each(@model, :field, 'bar')
-      @model.errors[:field].should_not be_empty
-    end
-
-    it "should do nothing if no block is given" do
-      SpecSupport::TestAccountNameValidator.add_validation(:not_foo)
-      @validator.validate_each(@model, :field, 'bar')
-      @model.errors[:field].should be_empty
-    end
-  end
-
-  describe ".min_length" do
-    it "should ensure a minimum length" do
-      SpecSupport::TestAccountNameValidator.min_length 5
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, '1234')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('too_short')
-    end
-  end
-
-  describe ".max_length" do
-    it "should ensure a maximum length" do
-      SpecSupport::TestAccountNameValidator.max_length 5
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, '123456')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('too_long')
-    end
-  end
-
-  describe ".valid_chars" do
-    it "should check for invalid chars" do
-      SpecSupport::TestAccountNameValidator.valid_chars '[A-Z]'
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'A!Z')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('invalid_chars')
-    end
-  end
-
-  describe ".first_char" do
-    it "should check for an invalid first character" do
-      SpecSupport::TestAccountNameValidator.first_char '[A-Z]'
-      SpecSupport::TestAccountNameValidator.new(attributes: :field).validate_each(@model, :field, 'abc')
-      @model.errors[:field].should_not be_empty
-      @model.errors[:field].first.should include('invalid_first_char')
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-Bundler.require :default, :test
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'validates_im'
-
-RSpec.configure do |config|
-  
-end