scaffolding 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39f736ea24b0f039f8726314e93c0af29e24ad65
-  data.tar.gz: c57e952433bf79815c0664a5744c9916ad87c892
+  metadata.gz: 3bf321296642bfb7f1adf152f6efdac163daff44
+  data.tar.gz: ee9cb3885c934a99f586235a4d5a393f68b1cc53
 SHA512:
-  metadata.gz: 4e7edf14eec9f001245d3bb655b9b73eeefa5df8c2556f1ac93ff5b35fc3fc64388b88e1133104c4ed3666194df077ae4bae1a213dbb58e0e6b2c2cf1ab1f6bb
-  data.tar.gz: c3af697d5c7c78e39fc5089aaa88180fa36abf978dabe2b7955475b50c78e8b260ec4ef712b0fcc275191ebf5460179314570d4cd10ef0fdd1862a42e206bb4e
+  metadata.gz: 48b68fe255ad2a10c1410041713fb737fc55330f8beb2bd1376cd2c621f8d641d2fbf4aae5a15ff1bea6e76859388c5599515aba72d85ebd51e1eeace7d7f61c
+  data.tar.gz: 84074b00c1634a296ca2a11aac7aa1bfb07d5eb70b66306d2273076bceab24ad805e3467c579fc8a28936904a2ca094c53a10c6f8d567c7e6c4c80224f6aaa4a

data/README.md

@@ -1,6 +1,6 @@
 # Scaffolding
 
-Generate a rails scaffold from a CSV, Dat or Txt file and import the data into your rails application.
+Generate a rails scaffold from a CSV, Dat or Txt file and imports the data into your rails application.
 
 ## Installation
 

data/lib/generators/scaffolding_generator.rb

@@ -12,18 +12,16 @@ class ScaffoldingGenerator < Rails::Generators::Base
   class_option :import, :type => :boolean, :default => false, :description => "Import data from source"
 
   def analyize_sources
-    @source = source
-    @name = name
     @auto = options[:auto]
     @migrate = options[:migrate]
     @import = options[:import]
 
-    if @source == "" || @source.nil?
+    if source == "" || source.nil?
       Dir[Rails.root.join('tmp/scaffolding/*')].each do |source|
-        Scaffolding.generate(source, @name, @auto, @migrate, @import)
+        Scaffolding::Build.new(source, name, @auto, @migrate, @import).stack
       end
     else
-      Scaffolding.generate(@source, @name, @auto, @migrate, @import)
+      Scaffolding::Build.new(source, name, @auto, @migrate, @import).stack
     end
   end
 

data/lib/scaffolding.rb

@@ -2,68 +2,79 @@ require "scaffolding/version"
 
 module Scaffolding
   require 'scaffolding/railtie' if defined?(Rails)
-  require 'uri'
+  class Build
+    require 'uri'
 
-  def self.generate(source, name, auto, migrate, import)
-    @source = source
-    @name = name
-    @auto = auto
-    @migrate = migrate
-    @import = import
-    @uri = Scaffolding.uri?
+    def initialize(source, name, auto, migrate, import)
+      @source = source
+      @name = name
+      @auto = auto
+      @migrate = migrate
+      @import = import
+      @uri = uri?
+    end
 
-    results = Scaffolding.parser
-    return if Scaffolding.errors(results)
+    def uri?
+      @source =~ URI::regexp
+    end
 
-    Rails::Generators::Base.new.generate "scaffold", results
-    Scaffolding.import_data if Scaffolding.migrate_database
-  end
+    def stack
+      @parser = parser
+      @results = @parser.results
+      return if errors
+      generate
+      import_data if migrate_database
+    end
 
-  def self.uri?
-    @source =~ URI::regexp
-  end
+    def parser
+      "Scaffolding::Parser::#{class_ref}".constantize.new(@source, @name, @auto, @uri)
+    end
 
-  def self.parser(namespace="")
-    "Scaffolding::Parser#{namespace + "::" + Scaffolding.class_ref}".constantize.process(@source, @name, @auto, @uri)
-  end
+    def class_ref
+      if File.extname(@source) == ".csv" && @uri == nil
+        "Csv"
+      else
+        "Raw"
+      end
+    end
 
-  def self.class_ref
-    case File.extname(@source)
-    when ".csv" && @uri == false
-      "Csv"
-    else
-      "Raw"
+    def generate
+      Rails::Generators::Base.new.generate "scaffold", @results
     end
-  end
 
-  def self.errors(results)
-    if results.kind_of?(Array)
-      results.each do |error|
-        puts "\e[31m#{error}\e[0m"
+    def errors
+      if @results.kind_of?(Array)
+        @results.each do |error|
+          puts "\e[31m#{error}\e[0m"
+        end
+        true
       end
-      true
     end
-  end
 
-  def self.migrate_database
-    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"].reenable
-      Rake::Task["db:migrate"].invoke
-    else
-      false
+    def migrate_database
+      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"].reenable
+        Rake::Task["db:migrate"].invoke
+      else
+        false
+      end
     end
-  end
 
-  def self.import_data
-    unless @import
-      puts "\n\n\e[32mImport the data from #{@source}?(y/n)\e[0m\n"
-      answer = STDIN.gets.chomp.downcase
+    def import_data
+      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"
+        @results = @parser.import_data
+        return if errors
+        @results.each{ |k,v| puts "#{v} records #{k}" }
+      end
     end
-    Scaffolding.parser("::Importer").each{ |k,v| puts "#{v} records #{k}" } if @import || answer == "y"
   end
 
 end
@@ -71,4 +82,3 @@ end
 require 'scaffolding/parser/base'
 require 'scaffolding/parser/raw'
 require 'scaffolding/parser/csv'
-require 'scaffolding/parser/importer/base'

data/lib/scaffolding/parser/base.rb

@@ -5,32 +5,21 @@ module Scaffolding
       require 'csv'
 
       def initialize(source, name, auto, uri)
-        @source = source
-        @name = name
-        @auto = auto
-        @uri = uri
+        @source, @name, @auto, @uri = source, name, auto, uri
         @errors = []
-        @scaffolding = {}
-        @row_number = 0
-        setup
-      end
-
-      def setup
         return unless @data = valid_data?
         @col_seperator = col_seperator
-        @source_name, @scaffold_builder = source_name
+        @source_name = source_name
+        @scaffolding = {}
+        @row_number = 0
       end
 
       def errors
-        @errors
+        @errors unless @errors.count == 0
       end
 
       def source_name
-        if @name  == ""
-          name = File.basename(@source, ".*")
-        else
-          name = @name.dup
-        end
+        name = (@name == "" ? File.basename(@source, ".*") : @name.dup)
         name.to_s.downcase.split.join.camelize.strip.singularize
       end
 
@@ -39,11 +28,11 @@ module Scaffolding
           @errors << "No source selected"
           return false
         end
-        @uri ? web : file
+        @uri.nil? ? file : web
       end
 
       def web
-        `curl "#{@source}"`
+        utf8_encode(`curl "#{@source}"`)
       end
 
       def file
@@ -70,7 +59,7 @@ module Scaffolding
         seperators.max_by{|k,v| v}[0]
       end
 
-      def process_row(row)
+      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
@@ -83,6 +72,11 @@ module Scaffolding
         end
       end
 
+      def save_row(row)
+         model = @source_name.classify.constantize.new(row.except!(:id))
+         model.save ? @saved += 1 : @failed += 1
+      end
+
       def scaffold_rank
         unless @auto
           puts "\n\e[33mManually choose data types?(y/n) for #{@source_name}\e[0m"
@@ -100,24 +94,27 @@ module Scaffolding
       end
 
       def build_string
+        scaffold = @source_name.dup
         @scaffolding.each do |k, v|
-          @scaffold_builder << " #{k}:#{v}" unless k.to_s.downcase == "id"
+          scaffold << " #{k}:#{v}" unless k.to_s.downcase == "id"
         end
-        @scaffold_builder
+        scaffold
       end
 
       def results
         groom_data
-        process_data
-        return @errors unless @errors.count == 0
+        process_data "predict_row"
+        errors
         scaffold_rank
         build_string
       end
 
-      def self.process(source, name, auto, uri)
-        importer = self.new(source, name, auto, uri)
-        return importer.errors unless importer.errors.count == 0
-        importer.results
+      def import_data
+        @saved = 0
+        @failed = 0
+        process_data "save_row"
+        errors
+        {saved: @saved, failed: @failed}
       end
 
     end

data/lib/scaffolding/parser/csv.rb

@@ -13,11 +13,11 @@ module Scaffolding
         end
       end
 
-      def process_data
+      def process_data(process_row)
         CSV.parse(@data, headers: @headers, col_sep: @col_seperator, skip_blanks: true) do |row|
           @row_number += 1
           begin
-            process_row(row.inject({}){|row,(k,v)| row[k.downcase.to_sym] = v; row})
+            self.send(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

data/lib/scaffolding/parser/raw.rb

@@ -4,50 +4,49 @@ module Scaffolding
 
       def groom_data
         @data = @data.split("\n")
+        @column_count = column_count
+        bad_data
         find_headers
         setup_columns
         hashed_data
       end
 
-      def find_headers
-        hc = header_count
-        rows = 0
-        @data.map do |row|
-          rows += 1
-          if row.split(@col_seperator).count == hc
-            @headers = row.split(@col_seperator).map{ |header| header.strip.downcase.gsub(/(\W|\d)/, "") }
-            rows.times{ @data.shift }
-            return
-          end
-        end
-      end
-
-      def header_count
+      def column_count
         row_counts = []
         @data.map{ |row| row_counts << row.split(@col_seperator).count }
         row_counts.uniq.max_by{ |i| row_counts.count(i) }
       end
 
+      def bad_data
+        @data.delete_if {|row| row.split(@col_seperator).count != @column_count }
+      end
+
+      def find_headers
+        first_row = @data.map.first.split(@col_seperator)
+        @headers = first_row.map{ |header| header.strip.downcase.gsub(/(\W|\d)/, "") }
+        @data.shift
+      end
+
       def setup_columns
         @headers.each{ |column| @scaffolding[column.to_sym] = data_types }
       end
 
       def hashed_data
         @data = @data.map do |row|
-        fields  = row.split(@col_seperator)
-        hash    = {}
-        @headers.each_with_index do |header, index|
-          hash[header] = fields[index].to_s.strip
-        end
-        hash
+          fields  = row.split(@col_seperator)
+          hash    = {}
+          @headers.each_with_index do |header, index|
+            hash[header] = fields[index].to_s.strip
+          end
+          hash
         end
       end
 
-      def process_data
+      def process_data(process_row)
         @data.each do |row|
           @row_number += 1
           begin
-            process_row(row)
+            self.send(process_row, row)
           rescue => e
             @errors << "Unable to process row #{@row_number} Error: #{e}\n"
           end
@@ -55,6 +54,5 @@ module Scaffolding
       end
 
     end
-
   end
 end

data/lib/scaffolding/version.rb

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

data/lib/tasks/generators.rake

@@ -1,7 +1,14 @@
 namespace :scaffolding do
+  require 'rails'
+
   desc "Create a 'tmp/scaffolding' folder for the scaffolding gem."
   task :folder do |t|
-    require 'rails'
     Dir.mkdir(File.join(Rails.root, 'tmp/scaffolding'))
   end
+
+  # desc "Setup a production enviornemnt to import data from the files."
+  # task :production do |t|
+  #   Dir.mkdir(File.join(Rails.root, 'tmp/scaffolding'))
+  # end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jordan-deJong
@@ -57,7 +57,6 @@ files:
 - lib/scaffolding.rb
 - lib/scaffolding/parser/base.rb
 - lib/scaffolding/parser/csv.rb
-- lib/scaffolding/parser/importer/base.rb
 - lib/scaffolding/parser/raw.rb
 - lib/scaffolding/railtie.rb
 - lib/scaffolding/version.rb
@@ -84,8 +83,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/base.rb

@@ -1,30 +0,0 @@
-module Scaffolding
-  module Parser
-    module Importer
-      ["Csv", "Raw"].each do |type|
-        importer_class = Class.new("Scaffolding::Parser::#{type}".constantize) do
-
-          def initialize(source, name, auto, uri)
-            super
-            @saved = 0
-            @failed = 0
-          end
-
-          def process_row(row)
-             model = @source_name.classify.constantize.new(row.except!(:id))
-             model.save ? @saved += 1 : @failed += 1
-          end
-
-          def results
-            groom_data
-            process_data
-            return @errors unless @errors.count == 0
-            {saved: @saved, failed: @failed}
-          end
-
-        end
-        Scaffolding::Parser::Importer.const_set(type, importer_class)
-      end
-    end
-  end
-end