scaffolding 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0e33312192955ef93ef14f8a70b85fbf489854
-  data.tar.gz: 395291f2f6aa3fb94922d30d414ec3fc0de3a8ce
+  metadata.gz: 7db66db198a6e54944b9b8bd4a74949f9d2fa0af
+  data.tar.gz: b4624c9d80eecd21f76b3b8f43bf38cb76755dd6
 SHA512:
-  metadata.gz: 9d7da6ded6b7b291abd37a4f4cc7ea7d802bd3ec07515006f88d580af72113d01be0e4deb6c58fc483724f03920112c74fac54a5aea83a34cccaf3a3085f517f
-  data.tar.gz: 55b97414004d457c91f47099f9f5a7dca904ba242c834b01cf11c25bd764ef71428153bc16ec044ddb1e967ab316f97ecad443a1bddc103e2c7fcd58dfc2b19f
+  metadata.gz: 921de695c8568b7086924dc5d1fffa782d7782319e57d506efe89dd6dd6106dfd4f62aef4b90df7afe51a137b161da9ab7118dbe3cf5984b27418b99a9080b53
+  data.tar.gz: 64b84c22c0fb91242ddd7221fceed21dce0e8d215aba6ef610a62e1d57a36613fbc5b34b76fdc22ea1c96bfa1ab65fafea143122226727a743724ec79f42153a

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in scaffolding.gemspec
 gemspec
-gem 'pry'

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-
+    $ rake g:scaffold
 
 ## Development
 

data/Rakefile

@@ -3,42 +3,8 @@ require 'csv'
 
 #C:\Users\jdejong\Desktop\Windows.csv
 #C:\Users\jdejong\Desktop\data.xlsx
+# /Users/Jordandejong/Desktop/ht.csv
 
-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/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
+# 
+# task :b do |t|
+# end

data/lib/scaffolding.rb

@@ -6,7 +6,12 @@ module Scaffolding
   def self.generate(file)
     Scaffolding::Parser::Csv.process(file)
   end
+
+  def self.import_data(file)
+    Scaffolding::Parser::Importer::CsvData.process(file)
+  end
 end
 
 require 'scaffolding/parser/base'
 require 'scaffolding/parser/csv'
+require 'scaffolding/parser/importer/csvdata'

data/lib/scaffolding/parser/base.rb

@@ -2,12 +2,13 @@ module Scaffolding
   module Parser
     class Base
       require 'rails'
+      require 'csv'
 
       def initialize(file="")
         @errors = []
         @data = valid_data?(file)
-        @file_name = File.basename(file, ".*" ).to_s.split.join.camelize
-        @code_string = "rails g scaffold #{@file_name}"
+        @file_name = File.basename(file, ".*" ).to_s.split.join.camelize.strip.singularize
+        @scaffold_builder = @file_name
         @scaffolding = {}
       end
 
@@ -17,7 +18,8 @@ module Scaffolding
 
       def valid_data?(file)
         unless file == ""
-          if [".csv", ".xls", ".xlsx"].include? File.extname(file)
+          # if [".csv", ".xls", ".xlsx"].include? File.extname(file)
+          if File.extname(file) == ".csv"
             File.read(utf8_encode(file))
           else
             @errors << "Unknown file type: #{File.extname(file)}"
@@ -33,14 +35,6 @@ module Scaffolding
         s.force_encoding(Encoding::ISO_8859_1).encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
       end
 
-      def code_string
-        process_data
-        @scaffolding.each do |k, v|
-          @code_string << " #{k}:#{v}"
-        end
-        @code_string
-      end
-
       def data_types
         {string: 0, date: 0, integer: 0, boolean: 0, decimal: 0, time: 0, datetime: 0}
       end
@@ -48,7 +42,7 @@ module Scaffolding
       def self.process(file)
         importer = self.new(file)
         return importer.errors unless importer.errors.count == 0
-        importer.code_string.to_s
+        importer.process_data
       end
 
     end

data/lib/scaffolding/parser/csv.rb

@@ -22,10 +22,11 @@ module Scaffolding
             process_row(row.inject({}){|row,(k,v)| row[k.downcase.to_sym] = v; row})
           rescue => e
             @errors << "Unable to process row #{@row_number} Error: #{e}\n"
-          end #rescue block
+          end
         end
+        return @errors unless @errors.count == 0
         scaffold_rank
-        @errors
+        results
       end
 
       def setup_columns(columns)
@@ -48,12 +49,27 @@ module Scaffolding
       end
 
       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]
-          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)
+
+          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
+
+      def results
+        @scaffolding.each do |k, v|
+          @scaffold_builder << " #{k}:#{v}" unless k.to_s.downcase == "id"
         end
+        @scaffold_builder
       end
 
     end

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

@@ -0,0 +1,27 @@
+module Scaffolding
+  module Parser
+    module Importer
+      class CsvData < Scaffolding::Parser::Csv
+
+        def initialize(file="")
+          super
+          @saved = 0
+          @failed = 0
+        end
+
+        def process_row(row)
+           model = @file_name.classify.constantize.new(row.except!(:id))
+           model.save ? @saved += 1 : @failed += 1
+        end
+
+        def scaffold_rank
+        end
+
+        def results
+          {saved: @saved, failed: @failed}
+        end
+
+      end
+    end
+  end
+end

data/lib/scaffolding/railtie.rb

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

data/lib/scaffolding/version.rb

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

data/lib/tasks/generators.rake

@@ -0,0 +1,78 @@
+namespace :g do
+  desc 'generate a scaffold from a csv file'
+  task :scaffold do |t|
+    # require 'rails/generators'
+    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 "You are currently here: #{Dir.pwd}\n\n"
+    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\e[32mWould you like to generate the scaffold now?(y/n)\e[0m"
+    if STDIN.gets.chomp == "y"
+      executions = ""
+
+      puts "\n\e[32mMigrate the database?(y/n)\e[0m\n"
+      if STDIN.gets.chomp == "y"
+        executions << "; rake db:migrate"
+
+        puts "\n\e[32mImport the data from #{file}?(y/n)\e[0m\n"
+        if STDIN.gets.chomp == "y"
+          executions << "; rake import:csv:data[#{file}]"
+        end
+      end
+      exec "rails g scaffold " + results.to_s + executions
+    else
+
+    # puts "\n\n\n\e[32mWould you like to generate the scaffold now?(y/n)\e[0m"
+    # if STDIN.gets.chomp == "y"
+    #   Rails::Generators.invoke("active_record:model", 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)
+    #
+    #     end
+    #   end
+    # else
+
+      puts "Heres the code:"
+      puts "rails g scaffold" + results.to_s
+    end
+  end
+end
+
+namespace :import do
+  namespace :csv do
+    desc 'Import data from CSV file'
+    task :data, [:file]  => :environment do |t, args|
+      results = Scaffolding.import_data(args[:file])
+      if results.kind_of?(Array)
+        results.each do |error|
+          puts "\e[31m#{error}\e[0m"
+        end
+        puts ""
+        next
+      else
+        results.each do |k,v|
+          puts "#{v} records #{k}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Jordan-deJong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,10 +56,10 @@ files:
 - lib/scaffolding.rb
 - lib/scaffolding/parser/base.rb
 - lib/scaffolding/parser/csv.rb
-- lib/scaffolding/parser/importer/excel.rb
+- lib/scaffolding/parser/importer/csvdata.rb
 - lib/scaffolding/railtie.rb
-- lib/scaffolding/tasks/generators.rake
 - lib/scaffolding/version.rb
+- lib/tasks/generators.rake
 - scaffolding.gemspec
 homepage: https://github.com/Jordan-deJong/scaffolding
 licenses:
@@ -81,8 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate a rails scaffold based on a CSV file.
 test_files: []
+has_rdoc: 

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

@@ -1,18 +0,0 @@
-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,40 +0,0 @@
-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