scaffolding 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b87f1c11a168517dd90f66edf6c57fcb93d4ce
-  data.tar.gz: 51619f5ac2e9e8bd618225a7712917e113a4bfec
+  metadata.gz: ea0e33312192955ef93ef14f8a70b85fbf489854
+  data.tar.gz: 395291f2f6aa3fb94922d30d414ec3fc0de3a8ce
 SHA512:
-  metadata.gz: 20cc2b5ae69b746313a3de5de60ff09ba32391efad98043e36bb9f53f53ba9fbd0e75387c0fe79c5fecf1a416ea6bd681f983fdb9d2e4b7086612dedd3f541af
-  data.tar.gz: 625be29badfb58c49752cfc87b67b15456fe81bafd0aa2817f3716f9e448bd00e857c179556b81199b085f7bacfe65dbc7e66eea065a422c0e99aa0dc5de0c8b
+  metadata.gz: 9d7da6ded6b7b291abd37a4f4cc7ea7d802bd3ec07515006f88d580af72113d01be0e4deb6c58fc483724f03920112c74fac54a5aea83a34cccaf3a3085f517f
+  data.tar.gz: 55b97414004d457c91f47099f9f5a7dca904ba242c834b01cf11c25bd764ef71428153bc16ec044ddb1e967ab316f97ecad443a1bddc103e2c7fcd58dfc2b19f

data/README.md

@@ -30,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/scaffolding. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Jordan-deJong/scaffolding. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -1,16 +1,44 @@
 require "bundler/gem_tasks"
+require 'csv'
 
-task :gscaffold do |t|
+#C:\Users\jdejong\Desktop\Windows.csv
+#C:\Users\jdejong\Desktop\data.xlsx
+
+task :b do |t|
   require 'scaffolding'
 
   system "clear" or system "cls"
   puts "\n***** Scaffolding Gem *****\n\n\n"
   puts "\e[32mEnter a relative file name to build the scaffold\e[0m\n"
   puts "Example:"
-  puts '../../../../desktop/ht.csv'
-  puts 'C:\Users\jdejong\Desktop\Windows.csv'
+  puts '../../../../desktop/mac.csv'
+  puts 'C:\Users\username\Desktop\Windows.csv'
   puts ""
-  file = STDIN.gets.chomp
+  @file = STDIN.gets.chomp
+
+  results = Scaffolding.generate(@file)
+  if results.kind_of?(Array)
+    results.each do |error|
+      puts "\e[31m#{error}\e[0m"
+    end
+    puts ""
+    next
+  end
+
+  puts "\n\n\n\e[32mWould you like to generate the scaffold now?(y/n)\e[0m"
+
+  if STDIN.gets.chomp == "y"
+    puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
+
+    if STDIN.gets.chomp == "y"
+      exec results.to_s + "; rake db:migrate"
+    else
+      exec results.to_s
+    end
+
+  else
+    puts "\nHeres the code:"
+    puts results.to_s
+  end
 
-  Scaffolding.build(file)
 end

data/lib/scaffolding.rb

@@ -3,18 +3,10 @@ require "scaffolding/version"
 module Scaffolding
   require 'scaffolding/railtie' if defined?(Rails)
 
-  def self.build(file)
-    results = Scaffolding::Importer::Excel.process(file)
-    if results.kind_of?(Array)
-      results.each do |error|
-        puts "\e[31m#{error}\e[0m"
-      end
-      puts ""
-    else
-      exec results.to_s
-    end
+  def self.generate(file)
+    Scaffolding::Parser::Csv.process(file)
   end
 end
 
-require 'scaffolding/importer/base'
-require 'scaffolding/importer/excel'
+require 'scaffolding/parser/base'
+require 'scaffolding/parser/csv'

data/lib/scaffolding/{importer → parser}/base.rb

@@ -1,11 +1,12 @@
 module Scaffolding
-  module Importer
+  module Parser
     class Base
+      require 'rails'
 
       def initialize(file="")
         @errors = []
         @data = valid_data?(file)
-        @file_name = File.basename(file, ".*" ).to_s.split.join.downcase
+        @file_name = File.basename(file, ".*" ).to_s.split.join.camelize
         @code_string = "rails g scaffold #{@file_name}"
         @scaffolding = {}
       end
@@ -32,18 +33,6 @@ module Scaffolding
         s.force_encoding(Encoding::ISO_8859_1).encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
       end
 
-    #   def camelize(term, uppercase_first_letter = true)
-    #    string = term.to_s
-    #    if uppercase_first_letter
-    #      string = string.sub(/^[a-z\d]*/) { inflections.acronyms[$&] || $&.capitalize }
-    #    else
-    #      string = string.sub(/^(?:#{inflections.acronym_regex}(?=\b|[A-Z_])|\w)/) { $&.downcase }
-    #    end
-    #    string.gsub!(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{inflections.acronyms[$2] || $2.capitalize}" }
-    #    string.gsub!(/\//, '::')
-    #    string
-    #  end
-
       def code_string
         process_data
         @scaffolding.each do |k, v|
@@ -52,10 +41,14 @@ module Scaffolding
         @code_string
       end
 
+      def data_types
+        {string: 0, date: 0, integer: 0, boolean: 0, decimal: 0, time: 0, datetime: 0}
+      end
+
       def self.process(file)
         importer = self.new(file)
         return importer.errors unless importer.errors.count == 0
-        importer.code_string.to_s + "; rake db:migrate"
+        importer.code_string.to_s
       end
 
     end

data/lib/scaffolding/{importer/excel.rb → parser/csv.rb}

@@ -1,16 +1,21 @@
 module Scaffolding
-  module Importer
-    class Excel < Scaffolding::Importer::Base
+  module Parser
+    class Csv < Scaffolding::Parser::Base
 
       def initialize(file = "")
         super
         @headers = true
-        @col_seperator = ","
         @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|
+        CSV.parse(data, headers: @headers, col_sep: col_seperator, skip_blanks: true) do |row|
           setup_columns(row.to_h.keys) if @row_number == 0
           @row_number += 1
           begin
@@ -25,22 +30,29 @@ module Scaffolding
 
       def setup_columns(columns)
         columns.each do |column|
-          @scaffolding[column.downcase.to_sym] = {string: 0, date: 0, integer: 0}
+          @scaffolding[column.downcase.to_sym] = data_types
         end
       end
 
       def process_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(data) rescue data_type
+          data_type = :time if Time.parse(data) rescue data_type
+          data_type = :datetime if DateTime.parse(data) 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
         end
       end
 
       def scaffold_rank
         @scaffolding.each do |scaffold, data_types|
-          @scaffolding[scaffold] = data_types.max_by{|k,v| v}[0]
+          data_type = data_types.max_by{|k,v| v}[0]
+          puts "\n\e[32m#{scaffold}\e[0m is a \e[33m#{data_type}\e[0m? (y/string/integer/date ect)"
+          answer = STDIN.gets.chomp
+          @scaffolding[scaffold] = (answer == "y" ? data_type : answer)
         end
       end
 

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

@@ -0,0 +1,18 @@
+module Scaffolding
+  module Parser
+    module Importer
+      class ExcelData < Scaffolding::Parser::Excel
+
+        def process_row(row)
+          row.each do |column, data|
+            data_type = :string
+            data_type = :date if Date.parse(data) rescue data_type
+            data_type = :integer if Integer(data) rescue data_type
+            @scaffolding[column.to_sym][data_type] += 1
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/scaffolding/tasks/generators.rake

@@ -1,15 +1,40 @@
-desc 'generate a scaffold from file'
-task :gscaffold do |t|
-  require 'scaffolding'
-
-  system "clear" or system "cls"
-  puts "\n***** Scaffolding Gem *****\n\n\n"
-  puts "\e[32mEnter a relative file name to build the scaffold\e[0m\n"
-  puts "Example:"
-  puts '../../../../desktop/ht.csv'
-  puts 'C:\Users\username\Desktop\Windows.csv'
-  puts ""
-  file = STDIN.gets.chomp
-
-  Scaffolding.build(file)
+namespace :g do
+  desc 'generate a scaffold from file'
+  task :scaffold do |t|
+    require 'scaffolding'
+
+    system "clear" or system "cls"
+    puts "\n***** Scaffolding Gem *****\n\n\n"
+    puts "\e[32mEnter a relative file name to build the scaffold\e[0m\n"
+    puts "Example:"
+    puts '../../../../desktop/mac.csv'
+    puts 'C:\Users\username\Desktop\Windows.csv'
+    puts ""
+    @file = STDIN.gets.chomp
+
+    results = Scaffolding.generate(@file)
+    if results.kind_of?(Array)
+      results.each do |error|
+        puts "\e[31m#{error}\e[0m"
+      end
+      puts ""
+      next
+    end
+
+    puts "\n\n\n\e[32mWould you like to generate the scaffold now?(y/n)\e[0m"
+
+    if STDIN.gets.chomp == "y"
+      puts "\n\n\e[32mMigrate the database?(y/n)\e[0m\n"
+
+      if STDIN.gets.chomp == "y"
+        exec results.to_s + "; rake db:migrate"
+      else
+        exec results.to_s
+      end
+
+    else
+      puts "\nHeres the code:"
+      puts results.to_s
+    end
+
 end

data/lib/scaffolding/version.rb

@@ -1,3 +1,3 @@
 module Scaffolding
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Jordan-deJong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,8 +54,9 @@ files:
 - bin/console
 - bin/setup
 - lib/scaffolding.rb
-- lib/scaffolding/importer/base.rb
-- lib/scaffolding/importer/excel.rb
+- lib/scaffolding/parser/base.rb
+- lib/scaffolding/parser/csv.rb
+- lib/scaffolding/parser/importer/excel.rb
 - lib/scaffolding/railtie.rb
 - lib/scaffolding/tasks/generators.rake
 - lib/scaffolding/version.rb