Empact-sexy_pg_constraints 0.2.1 → 0.2.2

data/README.rdoc

@@ -4,10 +4,11 @@ If you're on PostgreSQL and see the importance of data-layer constraints - this
 
 == Install
 As a gem
-  gem install maxim-sexy_pg_constraints --source http://gems.github.com
+  gem install Empact-sexy_pg_constraints
 or as a plugin
-  script/plugin install git://github.com/maxim/sexy_pg_constraints.git
-	
+  script/plugin install git://github.com/Empact/sexy_pg_constraints.git
+or in bundler
+  gem 'Empact-sexy_pg_constraints', :require => 'sexy_pg_constraints'
 
 One more thing. Make sure that in your environment.rb file you have the following line uncommented.
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/sexy_pg_constraints/constraints.rb

@@ -38,11 +38,24 @@ module SexyPgConstraints
     # Example:
     #   constrain :books, :year, :within => 1980..2008
     #   constrain :books, :year, :within => 1980...2009
-    # (the two lines above do the same thing)
+    #   constrain :books, :year, :within => {:range => 1979..2008, :exclude_beginning => true}
+    #   constrain :books, :year, :within => {:range => 1979..2009, :exclude_beginning => true, :exclude_end => true}
+    # (the four lines above do the same thing)
     #
     def within(table, column, options)
       column_ref = column.to_s.include?('.') ? column : "#{table}.#{column}"
-      "check (#{column_ref} >= #{options.begin} and #{column_ref} #{options.exclude_end? ? ' < ' : ' <= '} #{options.end})"
+      if options.respond_to?(:to_hash)
+        options = options.to_hash
+        options.assert_valid_keys(:range, :exclude_end, :exclude_beginning)
+        range = options.fetch(:range)
+        exclude_end = options.has_key?(:exclude_end) ? options.fetch(:exclude_end) : range.exclude_end?
+        exclude_beginning = options.has_key?(:exclude_beginning) ? options.fetch(:exclude_beginning) : false
+      else
+        range = options
+        exclude_end = range.exclude_end?
+        exclude_beginning = false
+      end
+      "check (#{column_ref} >#{'=' unless exclude_beginning} #{range.begin} and #{column_ref} <#{'=' unless exclude_end} #{range.end})"
     end
 
     ##

data/test/sexy_pg_constraints_test.rb

@@ -212,6 +212,50 @@ class SexyPgConstraintsTest < Test::Unit::TestCase
     end
   end
 
+  def test_within_exclude_beginning
+    ActiveRecord::Migration.constrain :books, :from, :within => {:range => 5...11, :exclude_beginning => true}
+
+    assert_prohibits Book, :from, :within do |book|
+      book.from = 11
+    end
+
+    assert_prohibits Book, :from, :within do |book|
+      book.from = 5
+    end
+
+    assert_allows Book do |book|
+      book.from = 10
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :from, :within
+
+    assert_allows Book do |book|
+      book.from = 5
+    end
+  end
+
+  def test_within_exclude_end_overrides_range
+    ActiveRecord::Migration.constrain :books, :from, :within => {:range => 5...11, :exclude_end => false}
+
+    assert_prohibits Book, :from, :within do |book|
+      book.from = 12
+    end
+
+    assert_prohibits Book, :from, :within do |book|
+      book.from = 4
+    end
+
+    assert_allows Book do |book|
+      book.from = 11
+    end
+
+    ActiveRecord::Migration.deconstrain :books, :from, :within
+
+    assert_allows Book do |book|
+      book.from = 12
+    end
+  end
+
   def test_length_within_inclusive
     ActiveRecord::Migration.constrain :books, :title, :length_within => 5..11
 

metadata

@@ -2,7 +2,7 @@
 name: Empact-sexy_pg_constraints
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Maxim Chernyak
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 Z
+date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1726302836925487223
+      hash: -864157024733078018
       segments: 
       - 0
       version: "0"