rein 0.2.0 → 0.2.1

data/lib/rein/constraint/foreign_key.rb

@@ -1,14 +1,16 @@
 module RC
   module ForeignKey
     def add_foreign_key_constraint(referencing_table, referenced_table, options = {})
-      referencing_attribute = options[:referencing] || "#{referenced_table.to_s.singularize}_id"
-      referenced_attribute  = "id"
-      constraint_name       = options[:name] || "#{referencing_attribute}_fk"
+      referencing_attribute = options[:referencing] || "#{referenced_table.to_s.singularize}_id".to_sym
+      referenced_attribute  = "id".to_sym
+      constraint_name       = options[:name] || "#{referencing_attribute}_fk".to_sym
 
       sql = "ALTER TABLE #{referencing_table} ADD CONSTRAINT #{constraint_name} FOREIGN KEY (#{referencing_attribute}) REFERENCES #{referenced_table} (#{referenced_attribute})"
       sql << " ON DELETE #{referential_action(options[:on_delete])}" if options[:on_delete]
       sql << " ON UPDATE #{referential_action(options[:on_update])}" if options[:on_update]
 
+      add_index(referencing_table, referencing_attribute) if options[:index] == true
+
       execute(sql)
     end
 

data/lib/rein/constraint/numericality.rb

@@ -14,10 +14,9 @@ module RC
         [attribute, operator, value].join(" ")
       end
 
-      conditions_sql = conditions.map {|condition| "(#{condition})" }.join(" AND ")
-      conditions_sql = "(#{conditions_sql})" if conditions.length > 1
+      conditions = conditions.join(" AND ")
 
-      execute "ALTER TABLE #{table} ADD CONSTRAINT #{attribute} CHECK #{conditions_sql}"
+      execute "ALTER TABLE #{table} ADD CONSTRAINT #{attribute} CHECK (#{conditions})"
     end
   end
 end

data/lib/rein/version.rb

@@ -1,3 +1,3 @@
 module Rein
-  VERSION = "0.2.0" unless defined?(Rein::VERSION)
+  VERSION = "0.2.1" unless defined?(Rein::VERSION)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Josh Bassett
@@ -19,6 +19,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,113 +32,7 @@ dependencies:
         - rc
         version: 3.0.0.rc
   type: :runtime
-  prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hirb
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rr
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: wirble
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: *id008
 description: Rein adds bunch of methods to your ActiveRecord migrations so you can easily tame your database.
 email: josh.bassett@gmail.com
 executables: []
@@ -168,7 +63,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1844054734367271197
       segments: 
       - 0
       version: "0"