Empact-sexy_pg_constraints 0.2.3 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+=== 0.3.0 - 05.02.2012
+
+* Added stripped and alias trimmed constraint to enforce trimmed status
+* Added not_only constraint as a keyed equivalent to not_blank
+* Added present constraint as an alias for not_blank
+
+=== 0.2.3 - 05.25.2011
+
+* Added greater_than, less_than contraints and their _or_equal_to variants
+
 === 0.1.3 - 01.19.2009
 
 * Bugfix: positive constraint fixed from >0 to >=0. Deconstrain and constrain to reapply.

data/Empact-sexy_pg_constraints.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{Empact-sexy_pg_constraints}
-  s.version = "0.2.3"
+  s.name = "Empact-sexy_pg_constraints"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maxim Chernyak", "Ben Woosley"]
-  s.date = %q{2011-05-26}
-  s.description = %q{Use migrations and simple syntax to manage constraints in PostgreSQL DB.}
-  s.email = %q{ben.woosley@gmail.com}
+  s.date = "2012-05-03"
+  s.description = "Use migrations and simple syntax to manage constraints in PostgreSQL DB."
+  s.email = "ben.woosley@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -50,35 +50,15 @@ Gem::Specification.new do |s|
     "test/support/database.yml.example",
     "test/support/models.rb",
     "test/test_helper.rb",
+    "test/trimmed_test.rb",
     "test/whitelist_test.rb",
     "test/within_test.rb",
     "test/xor_test.rb"
   ]
-  s.homepage = %q{http://github.com/maxim/sexy_pg_constraints}
+  s.homepage = "http://github.com/maxim/sexy_pg_constraints"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = "1.8.11"
   s.summary = nil
-  s.test_files = [
-    "test/alphanumeric_test.rb",
-    "test/blacklist_test.rb",
-    "test/email_test.rb",
-    "test/exact_length_test.rb",
-    "test/format_test.rb",
-    "test/general_test.rb",
-    "test/greater_less_than_test.rb",
-    "test/length_within_test.rb",
-    "test/lowercase_test.rb",
-    "test/not_blank_test.rb",
-    "test/odd_event_test.rb",
-    "test/positive_test.rb",
-    "test/reference_test.rb",
-    "test/support/assert_prohibits_allows.rb",
-    "test/support/models.rb",
-    "test/test_helper.rb",
-    "test/whitelist_test.rb",
-    "test/within_test.rb",
-    "test/xor_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -87,24 +67,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<pg>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/Gemfile

@@ -7,8 +7,6 @@ gem "pg"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "shoulda"
+  gem "jeweler"
 end

data/Gemfile.lock

@@ -1,37 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.7)
-    arel (2.0.9)
-    builder (2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    pg (0.11.0)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-    tzinfo (0.3.26)
+      rdoc
+    json (1.7.0)
+    multi_json (1.3.4)
+    pg (0.13.2)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  jeweler
   pg
-  rcov
   shoulda

data/Rakefile

@@ -31,16 +31,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/sexy_pg_constraints/constrainer.rb

@@ -1,7 +1,7 @@
 module SexyPgConstraints
   class Constrainer
     include SexyPgConstraints::Helpers
-    
+
     def initialize(table, columns = [])
       @table = table.to_s
       @columns = columns
@@ -10,23 +10,21 @@ module SexyPgConstraints
     def method_missing(column, constraints)
       self.class.add_constraints(@table, column.to_s, constraints)
     end
-    
+
     def [](*columns)
       @columns = columns.map{|c| c.to_s}
       self
     end
-    
+
     def all(constraints)
       self.class.add_constraints(@table, @columns, constraints)
     end
-    
+
     class << self
       def add_constraints(table, column, constraints)
         constraints.each_pair do |type, options|
-          sql = "alter table #{table} add constraint #{make_title(table, column, type)} " + 
-            SexyPgConstraints::Constraints.send(type, table, column, options) + ';'
-          
-          execute sql
+          execute "alter table #{table} add constraint #{make_title(table, column, type)} " \
+            + SexyPgConstraints::Constraints.send(type, table, column, options) + ';'
         end
       end
     end

data/lib/sexy_pg_constraints/constraints.rb

@@ -29,8 +29,39 @@ module SexyPgConstraints
     #   constrain :books, :title, :not_blank => true
     #
     def not_blank(table, column, options)
-      "check ( length(trim(both from #{table}.#{column})) > 0 )"
+      "check ( length(btrim(#{table}.#{column})) > 0 )"
     end
+    alias_method :present, :not_blank
+    module_function :present
+
+    ##
+    # The value must have characters other than those listed in the option string.
+    #
+    # Example:
+    #   constrain :books, :title, :not_only => 'abcd'
+    #
+    def not_only(table, column, options)
+      "check ( length(btrim(#{table}.#{column}, E'#{options}')) > 0 )"
+    end
+
+    ##
+    # The value must not have leading or trailing spaces.
+    #
+    # You can pass a string as an option to indicate what characters are trimmed.
+    #
+    # Example:
+    #   constrain :books, :title, :trimmed => true
+    #   constrain :books, :title, :trimmed => "abc"
+    #
+    def trimmed(table, column, options)
+      if options == true
+        "check (length(#{table}.#{column}) = length(btrim(#{table}.#{column})))"
+      else
+        "check (length(#{table}.#{column}) = length(btrim(#{table}.#{column}, E'#{options}')))"
+      end
+    end
+    alias_method :stripped, :trimmed
+    module_function :stripped
 
     ##
     # The numeric value must be within given range.

data/test/not_blank_test.rb

@@ -1,39 +1,33 @@
 require 'test_helper'
 
 class NotBlankTest < SexyPgConstraintsTest
-  def test_not_blank
-    ActiveRecord::Migration.constrain :books, :author, :not_blank => true
+  def assert_protects_from_blank(column, contraint)
+    ActiveRecord::Migration.constrain :books, column, contraint => true
 
-    assert_prohibits Book, :author, :not_blank do |book|
-      book.author = ' '
+    assert_prohibits Book, column, contraint do |book|
+      book.send("#{column}=", ' ')
     end
 
     assert_allows Book do |book|
-      book.author = 'foo'
+      book.send("#{column}=", 'foo')
     end
 
-    ActiveRecord::Migration.deconstrain :books, :author, :not_blank
+    ActiveRecord::Migration.deconstrain :books, column, contraint
 
     assert_allows Book do |book|
-      book.author = ' '
+      book.send("#{column}=", ' ')
     end
   end
 
-  def test_not_blank_on_a_column_whose_name_is_a_sql_keyword
-    ActiveRecord::Migration.constrain :books, :as, :not_blank => true
-
-    assert_prohibits Book, :as, :not_blank do |book|
-      book.as = ' '
-    end
-
-    assert_allows Book do |book|
-      book.as = 'foo'
-    end
+  def test_not_blank
+    assert_protects_from_blank(:author, :not_blank)
+  end
 
-    ActiveRecord::Migration.deconstrain :books, :as, :not_blank
+  def test_present
+    assert_protects_from_blank(:author, :present)
+  end
 
-    assert_allows Book do |book|
-      book.as = ' '
-    end
+  def test_not_blank_on_a_column_whose_name_is_a_sql_keyword
+    assert_protects_from_blank(:as, :not_blank)
   end
 end

data/test/support/assert_prohibits_allows.rb

@@ -8,7 +8,7 @@ module AssertProhibitsAllows
     error = assert_raise exception_type do
       book.save
     end
-    assert_match /PGError/, error.message
+    assert_match /PG::Error: ERROR:/, error.message
     assert_match /violates #{constraint_type} constraint/, error.message
     assert_match /"#{model.table_name}_#{column}_(#{Array(constraint).map {|c| c.to_s }.join('|')})"/, error.message if constraint_type == 'check'
   end

data/test/trimmed_test.rb

@@ -0,0 +1,104 @@
+require 'test_helper'
+
+class TrimmedTest < SexyPgConstraintsTest
+  DEFAULT_PROHIBITED = [' foo', 'foo ', ' foo ']
+  CONFIGURABLE_PROHIBITED = ["foo \t", "\t foo"]
+  DEFAULT_ALLOWED = ['foo', 'foo \t']
+
+  def test_trimmed
+    ActiveRecord::Migration.constrain :books, :author, :trimmed => true
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_prohibits Book, :author, :trimmed do |book|
+        book.author = prohibited
+      end
+    end
+
+    DEFAULT_ALLOWED + CONFIGURABLE_PROHIBITED.each do |allowed|
+      assert_allows Book do |book|
+        book.author = allowed
+      end
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :author, :trimmed
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_allows Book do |book|
+        book.author = prohibited
+      end
+    end
+  end
+
+  def test_stripped
+    ActiveRecord::Migration.constrain :books, :author, :stripped => true
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_prohibits Book, :author, :stripped do |book|
+        book.author = prohibited
+      end
+    end
+
+    DEFAULT_ALLOWED + CONFIGURABLE_PROHIBITED.each do |allowed|
+      assert_allows Book do |book|
+        book.author = allowed
+      end
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :author, :stripped
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_allows Book do |book|
+        book.author = prohibited
+      end
+    end
+  end
+
+  def test_trimmed_on_a_column_whose_name_is_a_sql_keyword
+    ActiveRecord::Migration.constrain :books, :as, :trimmed => true
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_prohibits Book, :as, :trimmed do |book|
+        book.as = prohibited
+      end
+    end
+
+    DEFAULT_ALLOWED + CONFIGURABLE_PROHIBITED.each do |allowed|
+      assert_allows Book do |book|
+        book.as = allowed
+      end
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :as, :trimmed
+
+    DEFAULT_PROHIBITED.each do |prohibited|
+      assert_allows Book do |book|
+        book.as = prohibited
+      end
+    end
+  end
+
+  def test_trimmed_with_a_character_list
+    ActiveRecord::Migration.constrain :books, :as, :trimmed => '\t '
+
+    DEFAULT_PROHIBITED + CONFIGURABLE_PROHIBITED.each do |prohibited|
+      p prohibited
+      assert_prohibits Book, :as, :trimmed do |book|
+        book.as = prohibited
+      end
+    end
+
+    DEFAULT_ALLOWED.each do |allowed|
+      assert_allows Book do |book|
+        book.as = allowed
+      end
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :as, :trimmed
+
+    DEFAULT_PROHIBITED + CONFIGURABLE_PROHIBITED.each do |prohibited|
+      assert_allows Book do |book|
+        book.as = prohibited
+      end
+    end
+  end
+end

metadata

@@ -1,94 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: Empact-sexy_pg_constraints
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Maxim Chernyak
 - Ben Woosley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70318625008440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70318625008440
+- !ruby/object:Gem::Dependency
   name: pg
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70318625006460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70318625006460
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70318625005160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70318625005160
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70318625003680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-description: Use migrations and simple syntax to manage constraints in PostgreSQL DB.
+  version_requirements: *70318625003680
+description: Use migrations and simple syntax to manage constraints in PostgreSQL
+  DB.
 email: ben.woosley@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - CHANGELOG.rdoc
 - Empact-sexy_pg_constraints.gemspec
 - Gemfile
@@ -122,56 +98,35 @@ files:
 - test/support/database.yml.example
 - test/support/models.rb
 - test/test_helper.rb
+- test/trimmed_test.rb
 - test/whitelist_test.rb
 - test/within_test.rb
 - test/xor_test.rb
 homepage: http://github.com/maxim/sexy_pg_constraints
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: 1636863430316657218
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1263929362253424615
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- test/alphanumeric_test.rb
-- test/blacklist_test.rb
-- test/email_test.rb
-- test/exact_length_test.rb
-- test/format_test.rb
-- test/general_test.rb
-- test/greater_less_than_test.rb
-- test/length_within_test.rb
-- test/lowercase_test.rb
-- test/not_blank_test.rb
-- test/odd_event_test.rb
-- test/positive_test.rb
-- test/reference_test.rb
-- test/support/assert_prohibits_allows.rb
-- test/support/models.rb
-- test/test_helper.rb
-- test/whitelist_test.rb
-- test/within_test.rb
-- test/xor_test.rb
+summary: ''
+test_files: []