procedural 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69df288d43e4cf1f62fcb82cc25bef57064e8d5
-  data.tar.gz: 1f155c1eed051b135bb38dd0476b41a1f6c76187
+  metadata.gz: a0645c0774ecd01207e6aa1bca6c84278def4a59
+  data.tar.gz: 97c663151905e572627d4e232b674b086f3f2dc5
 SHA512:
-  metadata.gz: ed9cb2aed0465fb453e865afae2bcedddce021267699fcd6d1acccc383b7a546533e30225a2d9a6f01ea78a5609b66394a3e1cfe697b79cc9da90072033d5e7b
-  data.tar.gz: e9bf85a221f05c18256e54d44056cb675d93815c9c29373a99e97ff0119b1ca1a831c63ff0a14c1f13e0a7276efae42ede2de683e5e24702ad8923cdc2958815
+  metadata.gz: a3f227ba958f2491aab7610897f78615ffb9801fad1890efa772049e53b0fbe29a5d06bbaff0bae87de340ec81810ad2336c2095b3cbdfafcc198047d4d0f1df
+  data.tar.gz: f9e4f1bb8e04389aaf399977286f8ae5a69bc68e08592bcae528061860397ad1370d93008bd5cdbb580b4fcfcaafa82bd2c56510f25f569a60843d74d16e75b7

data/.gitignore

@@ -1,2 +1,5 @@
 /coverage/
 /spec/database.yml
+/procedural-*.gem
+/Gemfile.lock
+/pkg/

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+sudo: false
+env:
+  - "RAILS_VERSION=4.0.0"
+  - "RAILS_VERSION=4.1.0"
+  - "RAILS_VERSION=4.2.0"
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+before_script:
+  - cp spec/database.yml.sample spec/database.yml

data/Gemfile

@@ -14,3 +14,12 @@ end
 group :test do
   gem 'simplecov',            require: false
 end
+
+version = ENV['RAILS_VERSION'] || 'default'
+
+case version
+when 'default'
+  gem 'activerecord', '>= 4.2'
+else
+  gem 'activerecord', "~> #{version}"
+end

data/README.markdown

@@ -1,4 +1,4 @@
-# Procedural
+# Procedural [![Build Status](https://travis-ci.org/andrewtimberlake/procedural.svg)](https://travis-ci.org/andrewtimberlake/procedural) [![Code Climate](https://codeclimate.com/github/andrewtimberlake/procedural/badges/gpa.svg)](https://codeclimate.com/github/andrewtimberlake/procedural)
 
 Procedural adds the ability to add functions and triggers via ActiveRecord migrations.
 
@@ -6,28 +6,32 @@ Thanks to [Spectacles](https://github.com/liveh2o/spectacles) where I took much
 
 ## Installation
 
-```
+```bash
 gem install procedural   #=> or include it in your Gemfile
 ```
 
 ## Example Migration
 
 ```ruby
-class AddCreatedAtTrigger < ActiveRecord::Migration
+class AddTimestampTriggers < ActiveRecord::Migration
   def change
-    create_procedure :created_at_trigger, language: 'plpgsql', returns: 'trigger', sql: <<-SQL
-              IF (TG_OP = 'UPDATE') THEN
-                NEW."created_at" := OLD."created_at";
-              ELSIF (TG_OP = 'INSERT') THEN
-                NEW."created_at" := CURRENT_TIMESTAMP;
-              END IF;
-              RETURN NEW;
-          SQL
-
-    create_procedure :updated_at_trigger, language: 'plpgsql', returns: 'trigger', sql: <<-SQL
-              NEW."updated_at" := CURRENT_TIMESTAMP;
-              RETURN NEW;
-          SQL
+    create_procedure :created_at_trigger, language: 'plpgsql', returns: 'trigger' do
+      <<-SQL
+        IF (TG_OP = 'UPDATE') THEN
+          NEW."created_at" := OLD."created_at";
+        ELSIF (TG_OP = 'INSERT') THEN
+          NEW."created_at" := CURRENT_TIMESTAMP;
+        END IF;
+        RETURN NEW;
+      SQL
+    end
+
+    create_procedure :updated_at_trigger, language: 'plpgsql', returns: 'trigger' do
+      <<-SQL
+        NEW."updated_at" := CURRENT_TIMESTAMP;
+        RETURN NEW;
+      SQL
+    end
 
     create_trigger :users, :users_created_at, :created_at_trigger
     create_trigger :users, :users_updated_at, :updated_at_trigger

data/lib/procedural.rb

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'active_record'
-require 'procedural/procedure'
 require 'procedural/adapters'
 
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
   alias_method(:_procedural_original_inherited, :inherited) if method_defined?(:inherited)
 
-  def self.inherited(klass)
+  def self.inherited(_klass)
     ::Procedural::load_adapters
     _procedural_orig_inherited if method_defined?(:_procedural_original_inherited)
   end

data/lib/procedural/adapters/postgresql_adapter.rb

@@ -8,7 +8,7 @@ module Procedural
         procedure_name = args.shift
         language = options.fetch(:language)
         returns = options.fetch(:returns)
-        sql = options.fetch(:sql)
+        sql = options.fetch(:sql) { yield }
 
         execute(<<-SQL)
 CREATE OR REPLACE FUNCTION #{quote_column_name(procedure_name)}()

data/lib/procedural/version.rb

@@ -1,3 +1,3 @@
 module Procedural
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -27,6 +27,19 @@ module Procedural
               END IF;
               RETURN NEW;
           SQL
+        end
+
+        it "accepts SQL from a block" do
+          sql = shared_base.create_procedure(:created_at_trigger, language: 'plpgsql', returns: 'trigger') do
+            <<-SQL
+              IF (TG_OP = 'UPDATE') THEN
+                NEW."created_at" := OLD."created_at";
+              ELSIF (TG_OP = 'INSERT') THEN
+                NEW."created_at" := CURRENT_TIMESTAMP;
+              END IF;
+              RETURN NEW;
+            SQL
+          end
 
           expect(sql).to_match(/CREATE OR REPLACE FUNCTION created_at_trigger/);
           expect(sql).to_match(/IF \(TG_OP = 'UPDATE'/);

data/spec/support/migration_helpers.rb

@@ -5,7 +5,7 @@ shared_examples_for "an adapter" do
   describe "create procedure migration" do
     create_procedure_migration = Class.new(ActiveRecord::Migration) do
       def change
-        create_procedure :test_procedure, language: 'plpgsql', returns: 'text', sql: <<-SQL.strip_heredoc
+        create_procedure :test_procedure, language: 'plpgsql', returns: 'text', sql: <<-SQL
         RETURN "Hello World";
       SQL
       end
@@ -25,8 +25,8 @@ shared_examples_for "an adapter" do
   describe "create trigger migration" do
     create_procedure_migration = Class.new(ActiveRecord::Migration) do
       def change
-        create_procedure :test_procedure, language: 'plpgsql', returns: 'trigger', sql: "RETURN NEW;"
-        create_trigger :users, :users_trigger, :test_procedure
+        create_procedure :test_procedure2, language: 'plpgsql', returns: 'trigger', sql: "RETURN NEW;"
+        create_trigger :users, :users_trigger, :test_procedure2
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procedural
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Timberlake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,8 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
 - lib/procedural.rb

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    procedural (0.0.1)
-      activerecord (>= 3.2.0)
-      activesupport (>= 3.2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    docile (1.1.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.3)
-    minitest-spec-expect (2.0.0)
-      minitest (~> 5.0)
-    pg (0.18.4)
-    rake (10.4.2)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbcpostgresql-adapter
-  minitest
-  minitest-spec-expect
-  pg
-  procedural!
-  rake
-  simplecov
-
-BUNDLED WITH
-   1.10.6