pgmodelgen 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4be41191539822879579ae93250a5013886577
-  data.tar.gz: 1276ce97601747801a990e69845b879d0cf7cf47
+  metadata.gz: 9660cf2dc65c39c1b5fad728e5c0fea953e90d4d
+  data.tar.gz: 6be5c386fd6f49f88353888e13d6251cbfeddda6
 SHA512:
-  metadata.gz: 5b06ef51aebdc70d06432bbb70d2d36eea17480a88e8ef5ec38887caf18c1f7e98b7a08769e191a46f056b624bb2c6cbd0424333fc7fc60ffcf52bddbc957fea
-  data.tar.gz: 3781de626266a243ef62a0e62e196af4093c6b25624ac40057b4f507d3c58e28a0da803e4ce496753736eaee90901ba6876bcbb0ca732651724e12eaa2819b26
+  metadata.gz: 4a109b7bf4fa56c82484c4a3d48fd5464f5d6bf5eb8066991e7fb50117655c9faa961d6fc59f43e8c924b0140cc1547403fcedbc8387714301061ca3fd8bc987
+  data.tar.gz: 61d7d5fb0538cdce1039e6bfa29d5ec7b3b0c5f2ea1cfde06d04268b0e39e2eb91eb16949f42842b4b33c5e472558aaf1c2434c54a028347fe586c4bfd97a605

data/lib/tasks/pgmodelgen.rake

@@ -12,6 +12,7 @@
 # TODO Update so that a unique constraint on a foreign key changes the has_many to has_one
 # TODO Add hint where a foregin key is to a many to many table
 
+# DONE Add interval syntax validation (Added basic validation. Can only handle HH:MM:SS)
 # DONE Add warning about missing index on foreign keys
 # DONE Fix foreign_key mistake
 # DONE Make the result a bit nicer
@@ -599,14 +600,26 @@ class PGGen
             
             # Regex check constraint
             match = row['condition_decleration_src'].match('\)::text ~\* \'(.*)\'::text\)$')
-            regex_ruby_style = match[1].gsub('\\\\.','').gsub('/','\/').gsub(/^\^/,"\\A").gsub(/\$$/,"\\z")
+            regex_ruby_style = match[1].gsub(/^\^/,"\\A").gsub(/\$$/,"\\z").gsub('\\\\','\\')
             models[table_name][:constraint] += "\tvalidates_format_of :#{column_rows.first["attribute_name"]}, :with => /#{regex_ruby_style}/i#{allow_nil}\n"
-            
+          elsif row['condition_decleration_src'].match('\)::text ~ \'(.*)\'::text\)$')
+
+            # Case senstaive regex check constraint
+            match = row['condition_decleration_src'].match('\)::text ~ \'(.*)\'::text\)$')
+            regex_ruby_style = match[1].gsub(/^\^/,"\\A").gsub(/\$$/,"\\z").gsub('\\\\','\\')
+            models[table_name][:constraint] += "\tvalidates_format_of :#{column_rows.first["attribute_name"]}, :with => /#{regex_ruby_style}/#{allow_nil}\n"
+        
           elsif row['condition_decleration_src'].match(/\(char_length\((.*)::text\) >= ([0-9]*)\)/)
             
             # Length constraint
             match = row['condition_decleration_src'].match(/^\(char_length\(\((.*)\)::text\) >= ([0-9]*)\)$/)
             models[table_name][:constraint] += "\tvalidates_length_of :#{match[1]}, :minimum => #{match[2]}\n"
+          
+          elsif row['condition_decleration_src'].match(/^\((.*) > ([0-9]*)\)$/)
+            
+            # Number constraint
+            match = row['condition_decleration_src'].match(/^\((.*) > ([0-9]*)\)$/)
+            models[table_name][:constraint] += "\tvalidates_numericality_of :#{match[1]}, :greater_than => #{match[2]}\n"
             
           else
             
@@ -678,7 +691,7 @@ class PGGen
     		pg_attribute.attrelid = #{oid}
     		and pg_attribute.attnum > 0
     	
-    	order by attribute_name;
+    	order by attribute_number;
     "
 
     columns_buffer = ""
@@ -733,15 +746,21 @@ class PGGen
     #
     models[table_name][:constraint] += "\n"
     result.each do |row|
-      if row['type_name'].include? "int" 
-        allow_nil = ((row['not_null_constraint'] != 't' or row['has_default_value'] == 't') ? ",:allow_nil => true" : "")
-        models[table_name][:constraint] += "\tvalidates_numericality_of :#{row['attribute_name']}, :only_integer => true #{allow_nil} \n"
-      end
+      column_name = row['attribute_name']
+      allow_nil = ((row['not_null_constraint'] != 't' or row['has_default_value'] == 't') ? ",:allow_nil => true" : "")
       
-      if row['type_name'].include? "float" 
-        allow_nil = ((row['not_null_constraint'] != 't' or row['has_default_value'] == 't') ? ",:allow_nil => true" : "")
-        models[table_name][:constraint] += "\tvalidates_numericality_of :#{row['attribute_name']} #{allow_nil} \n"
+      constraint = case row['type_name']
+        when /^(int2|int4|int8)$/
+          "validates_numericality_of :#{column_name}, :only_integer => true"
+        when /^(float4|float8)$/
+          "validates_numericality_of :#{column_name}"
+        when /^interval$/
+          "validates_format_of :#{column_name}, :with => /\\A(\\d+:\\d{1,2}(:\\d{1,2}|)|\\d+)\\z/"
+        else
+          nil
       end
+      
+      models[table_name][:constraint] += "\t#{constraint} #{allow_nil} \n" if constraint
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgmodelgen
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Bjorn Blomqvist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,12 +61,12 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- LICENSE.txt
+- README.md
 - lib/metadata_extractor.rb
 - lib/pgmodelgen.rb
 - lib/pgmodelgen/railtie.rb
 - lib/tasks/pgmodelgen.rake
-- LICENSE.txt
-- README.md
 homepage: http://github.com/bjornblomqvist/pgmodelgen
 licenses:
 - LGPL
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rake task that generates/updates activerecord models based on current schema