rein 0.8.1 → 0.8.2

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+coverage
+Gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rein.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task default: :spec

data/lib/rein.rb

@@ -5,15 +5,16 @@ end
 
 RC = Rein::Constraint
 
-require 'active_record'
-require 'active_support/core_ext/hash'
+require "active_record"
+require "active_support/core_ext/hash"
+require "active_support/inflector"
 
-require 'rein/constraint/primary_key'
-require 'rein/constraint/foreign_key'
-require 'rein/constraint/inclusion'
-require 'rein/constraint/numericality'
-require 'rein/constraint/presence'
-require 'rein/view'
+require "rein/constraint/primary_key"
+require "rein/constraint/foreign_key"
+require "rein/constraint/inclusion"
+require "rein/constraint/numericality"
+require "rein/constraint/presence"
+require "rein/view"
 
 module ActiveRecord::ConnectionAdapters
   class MysqlAdapter < AbstractAdapter

data/lib/rein/constraint/foreign_key.rb

@@ -10,8 +10,8 @@ module RC
         sql << " ADD CONSTRAINT #{name}"
         sql << " FOREIGN KEY (#{referencing_attribute})"
         sql << " REFERENCES #{referenced_table} (#{referenced_attribute})"
-        sql << " ON DELETE #{referential_action(options[:on_delete] || :restrict)}"
-        sql << " ON UPDATE #{referential_action(options[:on_update] || :restrict)}"
+        sql << " ON DELETE #{referential_action(options[:on_delete])}" if options[:on_delete].present?
+        sql << " ON UPDATE #{referential_action(options[:on_update])}" if options[:on_update].present?
       end
 
       execute(sql)
@@ -23,7 +23,6 @@ module RC
 
     def remove_foreign_key_constraint(referencing_table, referenced_table, options = {})
       referencing_attribute = options[:referencing] || "#{referenced_table.to_s.singularize}_id".to_sym
-      referenced_attribute  = "id".to_sym
 
       name = options[:name] || "#{referencing_attribute}_fk".to_sym
 
@@ -41,6 +40,8 @@ module RC
   private
     def referential_action(action)
       case action.to_sym
+      when :no_action
+        "NO ACTION"
       when :cascade
         "CASCADE"
       when :restrict

data/lib/rein/version.rb

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

data/rein.gemspec

@@ -0,0 +1,28 @@
+# encoding: utf-8
+#
+$:.push File.expand_path("../lib", __FILE__)
+
+require "rein/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rein"
+  s.version     = Rein::VERSION
+  s.author      = "Josh Bassett"
+  s.email       = "josh.bassett@gmail.com"
+  s.homepage    = "http://github.com/nullobject/rein"
+  s.summary     = "Database constraints made easy for ActiveRecord."
+  s.description = "Rein adds bunch of methods to your ActiveRecord migrations so you can easily tame your database."
+
+  s.rubyforge_project = "rein"
+
+  s.files       = `git ls-files`.split("\n")
+  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rr"
+  s.add_development_dependency "simplecov"
+
+  s.add_runtime_dependency "activerecord"
+end

data/spec/rein/constraint/foreign_key_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe RC::ForeignKey do
+  let(:adapter) do
+    Class.new do
+      include RC::ForeignKey
+    end.new
+  end
+
+  describe "#add_foreign_key_constraint" do
+    subject { adapter }
+
+    before do
+      stub(adapter).execute
+      stub(adapter).add_index
+    end
+
+    context "with no options" do
+      before { adapter.add_foreign_key_constraint(:books, :people) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id)") }
+    end
+
+    context "with a given referencing attribute" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :referencing => :author_id) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT author_id_fk FOREIGN KEY (author_id) REFERENCES people (id)") }
+    end
+
+    context "with a given referenced attribute" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :referenced => :person_id) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (person_id)") }
+    end
+
+    context "with a given referencing attribute and referenced attribute" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :referencing => :author_id, :referenced => :person_id) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT author_id_fk FOREIGN KEY (author_id) REFERENCES people (person_id)") }
+    end
+
+    context "with a given name" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :name => :foo) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT foo FOREIGN KEY (person_id) REFERENCES people (id)") }
+    end
+
+    context "with a given on delete referential action" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :cascade) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE") }
+    end
+
+    context "with a given on update referential action" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :on_update => :cascade) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON UPDATE CASCADE") }
+    end
+
+    context "with a 'cascade' on delete and update referential action" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :cascade, :on_update => :cascade) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE ON UPDATE CASCADE") }
+    end
+
+    context "with a 'no action' on delete and update referential action" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :no_action, :on_update => :no_action) }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE NO ACTION ON UPDATE NO ACTION") }
+    end
+
+    describe "with a given add_index option" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :add_index => true) }
+      it { should have_received.add_index(:books, :person_id) }
+    end
+
+    describe "with a referencing attribute and a add_index option" do
+      before { adapter.add_foreign_key_constraint(:books, :people, :referencing => :author_id, :add_index => true) }
+      it { should have_received.add_index(:books, :author_id) }
+    end
+  end
+
+  describe "#remove_foreign_key_constraint" do
+    subject { adapter }
+
+    before do
+      stub(adapter).execute
+      stub(adapter).remove_index
+    end
+
+    context "with no options" do
+      before { adapter.remove_foreign_key_constraint(:books, :people) }
+      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT person_id_fk") }
+    end
+
+    context "with a given referencing attribute" do
+      before { adapter.remove_foreign_key_constraint(:books, :people, :referencing => :author_id) }
+      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT author_id_fk") }
+    end
+
+    context "with a given name" do
+      before { adapter.remove_foreign_key_constraint(:books, :people, :name => :foo) }
+      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT foo") }
+    end
+
+    describe "with a given remove_index option" do
+      before { adapter.remove_foreign_key_constraint(:books, :people, :remove_index => true) }
+      it { should have_received.remove_index(:books, :person_id) }
+    end
+
+    describe "with a referencing attribute and a remove_index option" do
+      before { adapter.remove_foreign_key_constraint(:books, :people, :referencing => :author_id, :remove_index => true) }
+      it { should have_received.remove_index(:books, :author_id) }
+    end
+  end
+end

data/spec/rein/constraint/inclusion_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe RC::Inclusion, "#add_inclusion_constraint" do
+  let(:adapter) do
+    Class.new do
+      include RC::Inclusion
+    end.new
+  end
+
+  subject { adapter }
+
+  before { stub(adapter).execute }
+
+  context "given an array of string values" do
+    before { adapter.add_inclusion_constraint(:books, :state, :in => %w(available on_loan)) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_state CHECK (state IN ('available', 'on_loan'))") }
+  end
+
+  context "given an array of numeric values" do
+    before { adapter.add_inclusion_constraint(:books, :state, :in => [1, 2, 3]) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_state CHECK (state IN (1, 2, 3))") }
+  end
+end

data/spec/rein/constraint/numericality_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe RC::Numericality, "#add_numericality_constraint" do
+  let(:adapter) do
+    Class.new do
+      include RC::Numericality
+    end.new
+  end
+
+  subject { adapter }
+
+  before { stub(adapter).execute }
+
+  context "greater_than" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :greater_than => 1) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month > 1)") }
+  end
+
+  context "greater_than_or_equal_to" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :greater_than_or_equal_to => 2) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month >= 2)") }
+  end
+
+  context "equal_to" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :equal_to => 3) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month = 3)") }
+  end
+
+  context "not_equal_to" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :not_equal_to => 0) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month != 0)") }
+  end
+
+  context "less_than" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :less_than => 4) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month < 4)") }
+  end
+
+  context "less_than_or_equal_to" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :less_than_or_equal_to => 5) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month <= 5)") }
+  end
+
+  context "greater_than_or_equal_to and less_than_or_equal_to" do
+    before { adapter.add_numericality_constraint(:books, :published_month, :greater_than_or_equal_to => 5, :less_than_or_equal_to => 6) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_published_month CHECK (published_month >= 5 AND published_month <= 6)") }
+  end
+end

data/spec/rein/constraint/presence_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe RC::Presence, "#add_presence_constraint" do
+  let(:adapter) do
+    Class.new do
+      include RC::Presence
+    end.new
+  end
+
+  subject { adapter }
+
+  before { stub(adapter).execute }
+
+  context "given a table and attribute" do
+    before { adapter.add_presence_constraint(:books, :state) }
+    it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_state CHECK (state !~ '^\s*$')") }
+  end
+end

data/spec/rein/constraint/primary_key_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe RC::PrimaryKey, "#add_primary_key" do
+  let(:adapter) do
+    Class.new do
+      include RC::PrimaryKey
+    end.new
+  end
+
+  subject { adapter }
+
+  before { stub(adapter).execute }
+
+  context "with no options" do
+    before { adapter.add_primary_key(:books) }
+    it { should have_received.execute("ALTER TABLE books ADD PRIMARY KEY (id)") }
+  end
+end

data/spec/rein/view_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Rein::View do
+  let(:adapter) do
+    Class.new do
+      include Rein::View
+    end.new
+  end
+
+  subject { adapter }
+
+  before { stub(adapter).execute }
+
+  describe "#create_view" do
+    before { adapter.create_view(:foo, "SELECT * FROM bar") }
+    it { should have_received.execute("CREATE VIEW foo AS SELECT * FROM bar") }
+  end
+
+  describe "#drop_view" do
+    before { adapter.drop_view(:foo) }
+    it { should have_received.execute("DROP VIEW foo") }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require "rr"
+require "rr/adapters/rspec"
+require "rspec"
+require "simplecov"
+
+SimpleCov.start
+
+require "rein"
+
+RSpec.configure do |config|
+  config.mock_with :rr
+end
+
+# FIXME: This is a workaround to get RSpec 2 to play nicely with RR.
+def have_received(method = nil)
+  RR::Adapters::Rspec::InvocationMatcher.new(method)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rein
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,85 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70131003190740 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70131003190740
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: &70131003190020 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :development
-  prerelease: false
-  version_requirements: *70131003190020
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70131003189520 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131003189520
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70131003189000 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: *70131003189000
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70131003188520 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131003188520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70131003188060 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131003188060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: wirble
-  requirement: &70131003187600 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70131003187600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rein adds bunch of methods to your ActiveRecord migrations so you can
   easily tame your database.
 email: josh.bassett@gmail.com
@@ -95,7 +98,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rein/alone.rb
+- .gitignore
+- .rspec
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- lib/rein.rb
 - lib/rein/constraint/foreign_key.rb
 - lib/rein/constraint/inclusion.rb
 - lib/rein/constraint/numericality.rb
@@ -103,10 +112,14 @@ files:
 - lib/rein/constraint/primary_key.rb
 - lib/rein/version.rb
 - lib/rein/view.rb
-- lib/rein.rb
-- lib/verify_rcov.rb
-- LICENSE
-- README.md
+- rein.gemspec
+- spec/rein/constraint/foreign_key_spec.rb
+- spec/rein/constraint/inclusion_spec.rb
+- spec/rein/constraint/numericality_spec.rb
+- spec/rein/constraint/presence_spec.rb
+- spec/rein/constraint/primary_key_spec.rb
+- spec/rein/view_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/nullobject/rein
 licenses: []
 post_install_message: 
@@ -119,16 +132,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2852352367581315615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
+      segments:
+      - 0
+      hash: 2852352367581315615
 requirements: []
 rubyforge_project: rein
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Database constraints made easy for ActiveRecord.
-test_files: []
+test_files:
+- spec/rein/constraint/foreign_key_spec.rb
+- spec/rein/constraint/inclusion_spec.rb
+- spec/rein/constraint/numericality_spec.rb
+- spec/rein/constraint/presence_spec.rb
+- spec/rein/constraint/primary_key_spec.rb
+- spec/rein/view_spec.rb
+- spec/spec_helper.rb

data/lib/rein/alone.rb

@@ -1,14 +0,0 @@
-rc = "#{ENV['HOME']}/.rubyrc"
-load(rc) if File.exist?(rc)
-
-require 'rubygems'
-require 'bundler'
-
-envs = [:default]
-envs << ENV["REIN_ENV"].downcase.to_sym if ENV["REIN_ENV"]
-Bundler.setup(*envs)
-
-path = File.join(File.expand_path(File.dirname(__FILE__)), '..')
-$LOAD_PATH.unshift(path)
-
-require 'rein'

data/lib/verify_rcov.rb

@@ -1,56 +0,0 @@
-module RCov
-  # A task that can verify that the RCov coverage doesn't
-  # drop below a certain threshold. It should be run after
-  # running Spec::Rake::SpecTask.
-  class VerifyTask < Rake::TaskLib
-    # Name of the task. Defaults to :verify_rcov
-    attr_accessor :name
-
-    # Path to the index.html file generated by RCov, which
-    # is the file containing the total coverage.
-    # Defaults to 'coverage/index.html'
-    attr_accessor :index_html
-
-    # Whether or not to output details. Defaults to true.
-    attr_accessor :verbose
-
-    # The threshold value (in percent) for coverage. If the
-    # actual coverage is not equal to this value, the task will raise an
-    # exception.
-    attr_accessor :threshold
-
-    # Require the threshold value be met exactly.  This is the default.
-    attr_accessor :require_exact_threshold
-
-    def initialize(name=:verify_rcov)
-      @name = name
-      @index_html = 'coverage/index.html'
-      @verbose = true
-      @require_exact_threshold = true
-      yield self if block_given?
-      raise "Threshold must be set" if @threshold.nil?
-      define
-    end
-
-    def define
-      desc "Verify that rcov coverage is at least #{threshold}%"
-      task @name do
-        total_coverage = 0
-
-        File.open(index_html).each_line do |line|
-          if line =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/
-            total_coverage = $1.to_f
-            break
-          end
-        end
-        output_coverage(total_coverage)
-      end
-    end
-    
-    def output_coverage(total_coverage)
-      puts "Coverage: #{total_coverage}% (threshold: #{threshold}%)" if verbose
-      raise "Coverage must be at least #{threshold}% but was #{total_coverage}%" if total_coverage < threshold
-      raise "Coverage has increased above the threshold of #{threshold}% to #{total_coverage}%. You should update your threshold value." if (total_coverage > threshold) and require_exact_threshold
-    end
-  end
-end