postgresql-check 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1048872dde6eb9e2fe0bdbce34da53c019ecc62
-  data.tar.gz: 223f215b01978b726f72d21146cb3c5dcca3ccb8
+  metadata.gz: 3f3dc30a6f85cf5072a81f21125ec4bba9a527b9
+  data.tar.gz: 819358b14d23000061fff2a17e4531bd74efe768
 SHA512:
-  metadata.gz: e09208d765f0717700ca88e88da3d3b5ea17c477e511fccd053ecaecd0d0d77e60c30130c4e3e0f8efe8c173e6d8d518f47a1d94ed8c128b6fa44a133dd679e2
-  data.tar.gz: dce6d419be2203db356b60ae728378c868ecd9eaac878a493fef165645ec25360073c6bc2ebf9b01ad2e0f002ef3868fca2d67c0aa33df497db4604db5950ccc
+  metadata.gz: 845c9557db6a072a53c2046f2f08dd0b9c1bedfc46468aa386395a9d4d58753ba662efaba39a8742697d11e9f62ae218a02e91cf9d26818379a57e807f7370ca
+  data.tar.gz: e44349720d60291552b1e96ad39b6a545690746133178c7ab3cb7dec170ed1a7c8bec847936c85c094f17445b78f42b4043d1a452b546f14df6ecf5675cedd9c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Alexei Mikhailov
+Copyright (c) 2015 Alexei Mikhailov
 
 MIT License
 

data/README.md

@@ -31,21 +31,21 @@ Or install it yourself as:
 
 Two new methods are introduced to migrations:
 
-* `add_check(table_name, condition, :name => constraint_name)`
-* `remove_check(table_name, :name => constraint_name)`
+* `add_check table_name, condition, name: constraint_name`
+* `remove_check table_name, name: constraint_name`
 
 Given the following model:
 
 ```ruby
 class Product < ActiveRecord::Base
-  validates :price, :numericality => {:greater_than => 0}
+  validates :price, numericality: { greater_than: 0 }
 end
 ```
 
 You can add a check constraint in your migration:
 
 ```ruby
-add_check :products, 'price > 0', :name => 'products_price_check'
+add_check :products, 'price > 0', name: 'products_price_check'
 ```
 
 The code above generates following SQL:
@@ -59,7 +59,7 @@ ALTER TABLE "products" ADD CONSTRAINT "products_price_check" (price > 0)
 To remove constraint use `remove_check` method:
 
 ```ruby
-remove_check :products, :name => 'products_price_check'
+remove_check :products, name: 'products_price_check'
 ```
 
 ## Change Table methods
@@ -68,8 +68,8 @@ This gem adds extra methods to `create_table` and `change_table`:
 
 ```ruby
 create_table :products do |t|
-  t.decimal :price, :null => false
-  t.check 'price > 0', :name => 'products_price_check'
+  t.decimal :price, null: false
+  t.check 'price > 0', name: 'products_price_check'
 end
 ```
 
@@ -77,7 +77,7 @@ Remove a check constraint:
 
 ```ruby
 change_table :products do |t|
-  t.remove_check :name => 'products_price_check'
+  t.remove_check name: 'products_price_check'
 end
 ```
 
@@ -89,7 +89,7 @@ end
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/postgresql-check/fork )
+1. Fork it ( https://github.com/take-five/postgresql-check/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/lib/postgresql/check/schema_definitions.rb

@@ -2,7 +2,7 @@ module Postgresql
   module Check
     module SchemaDefinitions
       def self.included(base)
-        if ActiveRecord::VERSION::STRING > "4.2"
+        if ActiveRecord::VERSION::STRING > '4.2'
           ActiveRecord::ConnectionAdapters::PostgreSQL::Table.class_eval do
             include Postgresql::Check::Table
           end

data/lib/postgresql/check/schema_dumper.rb

@@ -8,27 +8,27 @@ module Postgresql
       end
 
       def table_with_checks(table, stream)
-        table_without_checks(table, stream)
-        check_constraints(table, stream)
+        table_without_checks table, stream
+        check_constraints table, stream
       end
 
       private
       def check_constraints(table, stream)
         if (checks = @connection.checks(table)).any?
           definitions = checks.map do |check|
-            dump_check_constraint(check)
+            dump_check_constraint check
           end
 
-          stream.puts
           stream.puts definitions.join("\n")
-          stream.puts
+          stream.puts "\n"
         end
       end
 
       def dump_check_constraint(check)
-        '  add_check ' + remove_prefix_and_suffix(check.table_name).inspect + ', '+
-            check.condition.inspect + ', name: ' + check.name.inspect
+        <<-RUBY.chomp
+  add_check "#{remove_prefix_and_suffix(check.table_name)}", "#{check.condition}", name: "#{check.name}"
+        RUBY
       end
     end
   end
-end
+end

data/lib/postgresql/check/schema_statements.rb

@@ -12,10 +12,10 @@ module Postgresql
       # by +:name+ options in +options+ argument.
       #
       # @example
-      #   add_check :products, 'price > 0', :name => 'products_price_chk'
+      #   add_check :products, 'price > 0', name: 'products_price_check'
       #
       #   # Generates:
-      #   # ALTER TABLE products ADD CONSTRAINT products_price_chk CHECK (price > 0)
+      #   # ALTER TABLE products ADD CONSTRAINT products_price_check CHECK (price > 0)
       #
       # @note +:name+ option is mandatory.
       #
@@ -26,11 +26,11 @@ module Postgresql
       def add_check(table_name, condition, options)
         name = options.fetch(:name) { raise 'add_check, :name option required' }
 
-        sql = "ALTER TABLE #{quote_table_name(table_name)} " +
-            "ADD CONSTRAINT #{quote_column_name(name)} " +
-            "CHECK (#{condition})"
-
-        execute(sql)
+        execute <<-SQL
+          ALTER TABLE #{quote_table_name(table_name)}
+          ADD CONSTRAINT #{quote_column_name(name)}
+          CHECK (#{condition})
+        SQL
       end
 
       # Remove constraint with given name from table. Constraint name
@@ -48,38 +48,39 @@ module Postgresql
       def remove_check(table_name, options)
         name = options.fetch(:name) { raise 'remove_check, :name option required' }
 
-        sql = "ALTER TABLE #{quote_table_name(table_name)} " +
-            "DROP CONSTRAINT #{quote_column_name(name)}"
-
-        execute(sql)
+        execute <<-SQL
+          ALTER TABLE #{quote_table_name(table_name)}
+          DROP CONSTRAINT #{quote_column_name(name)}
+        SQL
       end
 
       # @api private
-      def create_table_with_checks(table_name, *args, &block)
+      def create_table_with_checks(table_name, *args)
         definition = nil
 
         create_table_without_checks(table_name, *args) do |td|
           definition = td # trick to get the definition
-          block.call(td) unless block.nil?
+          yield td if block_given?
         end
 
         definition.checks.each do |condition, options|
-          add_check(table_name, condition, options)
+          add_check table_name, condition, options
         end
       end
 
       # @api private
       def checks(table_name)
-        checks_info = select_all %{
+        checks_info = select_all <<-SQL
           SELECT c.conname, c.consrc
           FROM pg_constraint c
-          JOIN pg_class t ON c.conrelid = t.oid
+          INNER JOIN pg_class t
+            ON c.conrelid = t.oid
           WHERE c.contype = 'c'
             AND t.relname = '#{table_name}'
-        }
+        SQL
 
         checks_info.map do |row|
-          Constraint.new(table_name, row['conname'], row['consrc'])
+          Constraint.new table_name, row['conname'], row['consrc']
         end
       end
     end

data/lib/postgresql/check/table.rb

@@ -2,17 +2,17 @@ module Postgresql
   module Check
     module Table
       def check(condition, options)
-        @base.add_check(check_table_name, condition, options)
+        @base.add_check check_table_name, condition, options
       end
 
       def remove_check(options)
-        @base.remove_check(check_table_name, options)
+        @base.remove_check check_table_name, options
       end
 
       private
       # @api private
       def check_table_name
-        if ActiveRecord::VERSION::STRING > "4.2"
+        if ActiveRecord::VERSION::STRING > '4.2'
           @name
         else
           @table_name

data/lib/postgresql/check/table_definition.rb

@@ -6,7 +6,7 @@ module Postgresql
       # Example:
       #   create_table :goods do |t|
       #     t.float :price
-      #     t.check 'price > 0', :name => 'price_gt_0'
+      #     t.check 'price > 0', :name => 'goods_price_gt_0_check'
       #   end
       def check(condition, options)
         checks << [condition, options]

data/lib/postgresql/check/version.rb

@@ -1,5 +1,5 @@
 module Postgresql
   module Check
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql-check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord