scaffolding 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355825294b6b132b799b92de494ae2826282a2bf
-  data.tar.gz: 311726f03fd61b9f432ee7b71610c3548f95551e
+  metadata.gz: f5ce20351a558fc76a04a4004abe7ea395a73895
+  data.tar.gz: bf50688193b8c54d0ffe2628952f23147b6a7973
 SHA512:
-  metadata.gz: 8dc1ae05c8c1c6588b0cb16fed8eb9adb10bc318b5b57421b77a1c678cde72804f329a22b42d7ab6147ae4cc7dfafb50695ca9ea2d371fff09f4a697ba864345
-  data.tar.gz: 471bbe20b664be7a4cf3674ccd68c02d7e279ab00dfcd7086d1483178b7f3acc80df7c99e35a5da6b2089114b66749dd1301f25c903132c50d240901085bb43a
+  metadata.gz: 4cb6567c6668c59e8ed64e2a1e1767d76a76d24eba13f2044c6ce539f82f01e78f506136b57a65200bc0484710a1f28aad0bf63c716386923253549c187db4a6
+  data.tar.gz: c3602deae91862cc32ea65b82260bd7946034c025ca92d935b84f1142e3a21bb0f6fa3969cb64c9c22d1000a8a00258c742e72d50fbd3ab1296def3f8cf5f35d

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-    $ rake g:scaffold
+    $ rails generate/g scaffolding path/to/file.csv
 
 ## Development
 

data/Rakefile

@@ -1,5 +1,4 @@
 require "bundler/gem_tasks"
-require 'csv'
 
 #C:\Users\jdejong\Desktop\Windows.csv
 #C:\Users\jdejong\Desktop\data.xlsx

data/lib/generators/scaffolding_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators'
+require 'rake'
+Rails.application.load_tasks
+require 'scaffolding'
+
+class ScaffoldingGenerator < Rails::Generators::Base
+  argument :file, :type => :string, :default => ""
+
+  def generate_scaffold
+    results = Scaffolding.generate(file)
+
+    if results.kind_of?(Array)
+      results.each do |error|
+        puts "\e[31m#{error}\e[0m"
+      end
+      return
+    end
+
+    Rails::Generators::Base.new.generate "scaffold", results
+
+    puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
+    if STDIN.gets.chomp == "y"
+      Rake::Task["db:migrate"].invoke
+
+      puts "\n\n\e[32mImport the data from #{file}?(y/n)\e[0m\n"
+      if STDIN.gets.chomp == "y"
+        Scaffolding.import_data(file).each do |k,v|
+          puts "#{v} records #{k}"
+        end
+      end
+    end
+  end
+
+end

data/lib/scaffolding/parser/base.rb

@@ -39,6 +39,12 @@ module Scaffolding
         {string: 0, date: 0, integer: 0, boolean: 0, decimal: 0, time: 0, datetime: 0}
       end
 
+      def col_seperator
+        seperators = {}
+        [",","\t"].each {|seperator| seperators[seperator] = @data.count(seperator)}
+        seperators.max_by{|k,v| v}[0]
+      end
+
       def self.process(file)
         importer = self.new(file)
         return importer.errors unless importer.errors.count == 0

data/lib/scaffolding/parser/csv.rb

@@ -8,12 +8,6 @@ module Scaffolding
         @row_number = 0
       end
 
-      def col_seperator
-        seperators = {}
-        [",","\t"].each {|seperator| seperators[seperator] = @data.count(seperator)}
-        seperators.max_by{|k,v| v}[0]
-      end
-
       def process_data(data = @data)
         CSV.parse(data, headers: @headers, col_sep: col_seperator, skip_blanks: true) do |row|
           setup_columns(row.to_h.keys) if @row_number == 0
@@ -51,16 +45,13 @@ module Scaffolding
       def scaffold_rank
         puts "\n\e[33mManually choose data types?(y/n)\e[0m"
         @manual = STDIN.gets.chomp
-
         @scaffolding.each do |scaffold, data_types|
           data_type = data_types.max_by{|k,v| v}[0]
-
           if @manual == "y"
             puts "\n\e[32m#{scaffold}\e[0m is a \e[33m#{data_type}\e[0m? (y/string/integer/date ect)"
             answer = STDIN.gets.chomp
             data_type = answer unless answer == "y"
           end
-
           @scaffolding[scaffold] = data_type
         end
       end

data/lib/scaffolding/railtie.rb

@@ -3,9 +3,11 @@ require 'rails'
 
 module Scaffolding
   class Generators < Rails::Railtie
-    rake_tasks do
-      # load "../scaffolding/lib/scaffolding/tasks/generators.rake"
-      load "tasks/generators.rake"
+    # rake_tasks do
+    #   load "tasks/generators.rake"
+    # end
+    generators do
+      require "generators/scaffolding_generator.rb"
     end
   end
 end

data/lib/scaffolding/version.rb

@@ -1,3 +1,3 @@
 module Scaffolding
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/tasks/generators.rake

@@ -16,7 +16,6 @@ namespace :g do
     end
 
     results = Scaffolding.generate(file)
-    
     if results.kind_of?(Array)
       results.each do |error|
         puts "\e[31m#{error}\e[0m"
@@ -25,23 +24,18 @@ namespace :g do
       next
     end
 
-    puts "\n\n\n\e[32mWould you like to generate the scaffold now?(y/n)\e[0m"
+    Rails::Generators::Base.new.generate "scaffold", results
+
+    puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
     if STDIN.gets.chomp == "y"
-      Rails::Generators::Base.new.generate "scaffold", results
+      Rake::Task["db:migrate"].invoke
 
-      puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
+      puts "\n\n\e[32mImport the data from #{file}?(y/n)\e[0m\n"
       if STDIN.gets.chomp == "y"
-        Rake::Task["db:migrate"].invoke
-
-        puts "\n\n\e[32mImport the data from #{file}?(y/n)\e[0m\n"
-        if STDIN.gets.chomp == "y"
-          Scaffolding.import_data(file)
-
+        Scaffolding.import_data(file).each do |k,v|
+          puts "#{v} records #{k}"
         end
       end
-    else
-      puts "Heres the code:"
-      puts "rails g scaffold" + results.to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jordan-deJong
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/generators/scaffolding_generator.rb
 - lib/scaffolding.rb
 - lib/scaffolding/parser/base.rb
 - lib/scaffolding/parser/csv.rb