scaffolding 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de39c3a7619be0d0c9173b999fe40d1e6971e3c
-  data.tar.gz: 63e285a88d98335514e29ddb15b55b16d099d4d9
+  metadata.gz: 6b8a09c0c41340385e00f79f271df39ee3633ee5
+  data.tar.gz: 1f3697d662598ede094f721f789568775a475e66
 SHA512:
-  metadata.gz: 341fce1e416a01d3b2c509f88ff22e0fd0606a47a866fc4281c24f7640664d599dc68a5f780282a755b3cd2c5359861a526638a0692f6830ff35789832c4cd25
-  data.tar.gz: d34ec144c4500ffca17c7643b4ff298665b85d82cd6e73da85d2eba5abc55eeaeca14811db2caaa7edabc4f5f4b47df408f53ab1192489355cbaba35a6254142
+  metadata.gz: 6a7a4b55d969f4a318266fb3a377396f6b2c986726336a2757fc914f69c6097cb3b4c1caec65aaec478aa6ea07d2f46a31509e48db8db09b8f2ef1c66c0c0c17
+  data.tar.gz: 75f1ea1d54033388ea00a426bd20015141075df92d513939fdb5ca6ec3a62cbf8bd95f818cc2fceb97633356102de2ce8f07e38b2c544c3b53c5e7e654031314

data/README.md

@@ -1,6 +1,6 @@
 # Scaffolding
 
-Generate a rails scaffold from a CSV and import the data into your rails application.
+Generate a rails scaffold from a CSV file and import the data into your rails application.
 
 ## Installation
 
@@ -20,12 +20,28 @@ Or install it yourself as:
 
 ## Usage
 
+Ensure your file name is the same as the resource/model name you wish to generate.
+
     $ rails g/generate scaffolding path/to/file.csv
 
 Or add CSV files to the tmp/scaffolding directory and process them all with:
 
     $ rails g/generate scaffolding
 
+Options (You will be asked these at the terminal if you do not specify):
+
+Automatically determine the data types of each column.
+
+    --auto
+
+Migrate the database after the scaffold has been generated.
+
+    --migrate
+
+Import the data from the data source into the development database.
+
+    --import
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/generators/scaffolding_generator.rb

@@ -4,15 +4,19 @@ Rails.application.load_tasks
 require 'scaffolding'
 
 class ScaffoldingGenerator < Rails::Generators::Base
-  argument :file, :type => :string, :default => ""
+  desc "This generator generates a scaffold based on a CSV file and imports the data"
+  argument :source, :type => :string, :default => ""
+  class_option :auto, :type => :boolean, :default => false, :description => "Automatically choose data types"
+  class_option :migrate, :type => :boolean, :default => false, :description => "Migrate the database"
+  class_option :import, :type => :boolean, :default => false, :description => "Import data from source"
 
-  def analyize_files
-    if file == "" || file.nil?
-      Dir[Rails.root.join('tmp/scaffolding/*')].each do |file|
-        Scaffolding.generate(file)
+  def analyize_sources
+    if source == "" || source.nil?
+      Dir[Rails.root.join('tmp/scaffolding/*')].each do |source|
+        Scaffolding.generate(source, options[:auto], options[:migrate], options[:import])
       end
     else
-      Scaffolding.generate(file)
+      Scaffolding.generate(source, options[:auto], options[:migrate], options[:import])
     end
   end
 

data/lib/scaffolding/parser/base.rb

@@ -4,11 +4,12 @@ module Scaffolding
       require 'rails'
       require 'csv'
 
-      def initialize(file="")
+      def initialize(file="", auto)
         @errors = []
         @data = valid_data?(file)
         @file_name = File.basename(file, ".*" ).to_s.split.join.camelize.strip.singularize
         @scaffold_builder = @file_name
+        @auto = auto
         @scaffolding = {}
       end
 
@@ -49,17 +50,17 @@ module Scaffolding
         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')) 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')) 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 = :integer if Integer(data) rescue data_type
           data_type = :decimal if ((data.to_f - data.to_i).abs > 0.0) rescue data_type
           @scaffolding[column.to_sym][data_type] += 1 unless data == ""
         end
       end
 
-      def self.process(file)
-        importer = self.new(file)
+      def self.process(file, auto)
+        importer = self.new(file, auto)
         return importer.errors unless importer.errors.count == 0
         importer.results
       end

data/lib/scaffolding/parser/csv.rb

@@ -2,7 +2,7 @@ module Scaffolding
   module Parser
     class Csv < Scaffolding::Parser::Base
 
-      def initialize(file = "")
+      def initialize(file = "", auto)
         super
         @headers = true
         @row_number = 0
@@ -26,15 +26,17 @@ module Scaffolding
       end
 
       def scaffold_rank
-        puts "\n\e[33mManually choose data types?(y/n)\e[0m"
-        @manual = STDIN.gets.chomp
+        unless @auto
+          puts "\n\e[33mManually choose data types?(y/n)\e[0m"
+          manual = STDIN.gets.chomp
+        end
         @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" || answer == ""
-          end
+            unless @auto || 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.downcase
+              data_type = answer unless answer == "y" || answer == ""
+            end
           @scaffolding[scaffold] = data_type
         end
       end

data/lib/scaffolding/parser/importer/csvdata.rb

@@ -3,7 +3,7 @@ module Scaffolding
     module Importer
       class CsvData < Scaffolding::Parser::Csv
 
-        def initialize(file="")
+        def initialize(file="", auto)
           super
           @saved = 0
           @failed = 0

data/lib/scaffolding/version.rb

@@ -1,3 +1,3 @@
 module Scaffolding
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/scaffolding.rb

@@ -3,12 +3,14 @@ require "scaffolding/version"
 module Scaffolding
   if defined?(Rails)
     require 'scaffolding/railtie'
-    # Dir.mkdir(File.join(Rails.root, 'tmp/scaffolding'))
+    # Dir.mkdir(source.join(Rails.root, 'tmp/scaffolding'))
   end
 
-  def self.generate(file)
-    @file = file
-    results = Scaffolding::Parser::Csv.process(@file)
+  def self.generate(source, auto, migrate, import)
+    @source = source
+    @migrate = migrate
+    @import = import
+    results = Scaffolding::Parser::Csv.process(@source, auto)
     return if Scaffolding.errors(results)
     Rails::Generators::Base.new.generate "scaffold", results
     Scaffolding.import_data if Scaffolding.migrate_database
@@ -24,8 +26,11 @@ module Scaffolding
   end
 
   def self.migrate_database
-    puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
-    if STDIN.gets.chomp == "y"
+    unless @migrate
+      puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
+      answer = STDIN.gets.chomp.downcase
+    end
+    if @migrate || answer == "y"
       Rake::Task["db:migrate"].invoke
     else
       false
@@ -33,9 +38,12 @@ module Scaffolding
   end
 
   def self.import_data
-    puts "\n\n\e[32mImport the data from #{@file}?(y/n)\e[0m\n"
-    if STDIN.gets.chomp == "y"
-      Scaffolding::Parser::Importer::CsvData.process(@file).each do |k,v|
+    unless @import
+      puts "\n\n\e[32mImport the data from #{@source}?(y/n)\e[0m\n"
+      answer = STDIN.gets.chomp.downcase
+    end
+    if @import || answer == "y"
+      Scaffolding::Parser::Importer::CsvData.process(@source, false).each do |k,v|
         puts "#{v} records #{k}"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Jordan-deJong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler