scaffolding 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bf321296642bfb7f1adf152f6efdac163daff44
-  data.tar.gz: ee9cb3885c934a99f586235a4d5a393f68b1cc53
+  metadata.gz: 015002a5a2a74c904f082e2a86920896ac9d9512
+  data.tar.gz: 328166889e9ec9d6b4c84e9be6e009dd40757635
 SHA512:
-  metadata.gz: 48b68fe255ad2a10c1410041713fb737fc55330f8beb2bd1376cd2c621f8d641d2fbf4aae5a15ff1bea6e76859388c5599515aba72d85ebd51e1eeace7d7f61c
-  data.tar.gz: 84074b00c1634a296ca2a11aac7aa1bfb07d5eb70b66306d2273076bceab24ad805e3467c579fc8a28936904a2ca094c53a10c6f8d567c7e6c4c80224f6aaa4a
+  metadata.gz: b058669f4e0b664dcf10c5ae3f2b5047a362f026c65f3c72981670f8a4f8c3f53e62be5efb631bdf2e1ec4f526499aace4f2727b709eb8e5b2cfc047f90c9b06
+  data.tar.gz: 3fe33d0c9410b972ccde9860322c474850d11bba2904abf78724f071cb39b58fd7c4e9d9c39b8660bd8d357db7661be8c07f32ca808ad73951670e325d4faa37

data/lib/scaffolding.rb

@@ -19,11 +19,16 @@ module Scaffolding
     end
 
     def stack
+      beginning_time = Time.now
+
       @parser = parser
       @results = @parser.results
       return if errors
       generate
       import_data if migrate_database
+
+      end_time = Time.now
+      puts "#{@parser.source_name} processed in #{(end_time - beginning_time).round(2)} seconds\n\n"
     end
 
     def parser
@@ -72,7 +77,8 @@ module Scaffolding
       if @import || answer == "y"
         @results = @parser.import_data
         return if errors
-        @results.each{ |k,v| puts "#{v} records #{k}" }
+        puts "\e[32m#{@results[:saved]}\e[0m records saved"
+        puts "\e[31m#{@results[:failed]}\e[0m records failed"
       end
     end
   end

data/lib/scaffolding/parser/base.rb

@@ -9,7 +9,7 @@ module Scaffolding
         @errors = []
         return unless @data = valid_data?
         @col_seperator = col_seperator
-        @source_name = source_name
+        @source_name = clean_source_name
         @scaffolding = {}
         @row_number = 0
       end
@@ -19,10 +19,15 @@ module Scaffolding
       end
 
       def source_name
+        @source_name
+      end
+
+      def clean_source_name
         name = (@name == "" ? File.basename(@source, ".*") : @name.dup)
         name.to_s.downcase.split.join.camelize.strip.singularize
       end
 
+
       def valid_data?
         if @source == "" || @source.nil?
           @errors << "No source selected"
@@ -62,19 +67,19 @@ module Scaffolding
       def predict_row(row)
         row.each do |column, data|
           data_type = :string
-          data_type = :boolean if ["true", "false"].include?(data.to_s.downcase) rescue data_type
-          data_type = :date if Date.parse(Date.strptime(data, '%m/%d/%Y')) || Date.parse(Date.strptime(data, '%d/%m/%Y')) rescue data_type
-          data_type = :time if Time.parse(Time.strptime(data, '%H:%M:%S')) rescue data_type
-          data_type = :datetime if DateTime.parse(DateTime.strptime(data, '%m/%d/%Y %H:%M:%S')) || DateTime.parse(DateTime.strptime(data, '%d/%m/%Y %H:%M:%S')) rescue data_type
+          data_type = :boolean if ["true", "false"].include?(data.to_s.downcase)
+          data_type = :time if (data =~ /^([01]?[0-9]|2[0-3])\:[0-5][0-9]$/) == 0
+          data_type = :date if (data =~ /\A(?:0?[1-9]|[1-2]\d|3[01])\/(?:0?[1-9]|[1-2]\d|3[01])\/\d{4}\Z/) == 0
+          data_type = :datetime if (data =~ /^([0,1]?\d{1})\/([0-2]?\d{1}|[3][0,1]{1})\/([1]{1}[9]{1}[9]{1}\d{1}|[2-9]{1}\d{3})\s([0]?\d|1\d|2[0-3]):([0-5]\d):([0-5]\d)$/) == 0
           data_type = :integer if Integer(data) rescue data_type
-          data_type = :decimal if (data =~ (/[-]?\d*[,]?\d*[.]\d*[%]?$/)) == 0 rescue data_type
+          data_type = :decimal if (data =~ (/[-]?\d*[,]?\d*[.]\d*[%]?$/)) == 0
           @scaffolding[column.to_sym][data_type] += 1 unless data == ""
         end
       end
 
       def save_row(row)
          model = @source_name.classify.constantize.new(row.except!(:id))
-         model.save ? @saved += 1 : @failed += 1
+         model.save! ? @saved += 1 : @failed += 1
       end
 
       def scaffold_rank

data/lib/scaffolding/version.rb

@@ -1,3 +1,3 @@
 module Scaffolding
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jordan-deJong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Generate a rails scaffold based on a CSV file.
 test_files: []
-has_rdoc: