scaffolding 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8671e3427494760d1568c7846a1728f05bd7eec5
-  data.tar.gz: cfb03213051ffb7ccf930f4380ffa10be042985a
+  metadata.gz: 39f736ea24b0f039f8726314e93c0af29e24ad65
+  data.tar.gz: c57e952433bf79815c0664a5744c9916ad87c892
 SHA512:
-  metadata.gz: 8cf10c9d7692cb5554ed704119f68e5f6475e80563c8154cbca6f98d1da1e3053c1db8dae485e9b76119e6efaeede7ecda16a407c0d4cb39e2e75f4aa679ed11
-  data.tar.gz: b44127223ecc9063cb35d05135626cdb20330ebf7da09eee9998919c4555ded9c1b450456f8de467ef90701b57be224ac44a6365a7b9021052432e7def349304
+  metadata.gz: 4e7edf14eec9f001245d3bb655b9b73eeefa5df8c2556f1ac93ff5b35fc3fc64388b88e1133104c4ed3666194df077ae4bae1a213dbb58e0e6b2c2cf1ab1f6bb
+  data.tar.gz: c3af697d5c7c78e39fc5089aaa88180fa36abf978dabe2b7955475b50c78e8b260ec4ef712b0fcc275191ebf5460179314570d4cd10ef0fdd1862a42e206bb4e

data/README.md

@@ -20,19 +20,34 @@ Or install it yourself as:
 
 ## Usage
 
-Ensure your file name is the same as the resource/model name you wish to generate.
+    $ rails g scaffolding [source] [name]
 
-    $ rails g/generate scaffolding path/to/file.csv
+You can pass either a path/to/the/file or a URL as the [source].    
 
-Or
+If a [name] is not passed, the scaffold will be named from the source:
+
+    $ rails g scaffolding path/to/file.csv
+
+Will generate a scaffold named file
+
+    $ rails g scaffolding path/to/file.csv purchase_orders
+
+Will generate a scaffold named purchase_orders
+
+
+#### Multiple
+
+To generate multiple scaffolds at the same time setup a scaffolding folder
 
     $ rake scaffolding:folder
 
 then add files to the 'tmp/scaffolding' directory and process them all with:
 
-    $ rails g/generate scaffolding
+    $ rails g scaffolding
+
+The scaffold's will be named the same as there respective files names.
 
-### Options:
+#### Options
 (You will be asked these at the terminal if not specified)
 
 Automatically determine the data types of each column:

data/lib/generators/scaffolding_generator.rb

@@ -6,21 +6,24 @@ require 'scaffolding'
 class ScaffoldingGenerator < Rails::Generators::Base
   desc "This generator generates a scaffold based on a CSV, Dat or Txt file and imports the data"
   argument :source, :type => :string, :default => ""
+  argument :name, :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_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, @auto, @migrate, @import)
+        Scaffolding.generate(source, @name, @auto, @migrate, @import)
       end
     else
-      Scaffolding.generate(source, @auto, @migrate, @import)
+      Scaffolding.generate(@source, @name, @auto, @migrate, @import)
     end
   end
 

data/lib/scaffolding/parser/base.rb

@@ -4,8 +4,9 @@ module Scaffolding
       require 'rails'
       require 'csv'
 
-      def initialize(source="", auto, uri)
+      def initialize(source, name, auto, uri)
         @source = source
+        @name = name
         @auto = auto
         @uri = uri
         @errors = []
@@ -17,14 +18,22 @@ module Scaffolding
       def setup
         return unless @data = valid_data?
         @col_seperator = col_seperator
-        @source_name = File.basename(@source, ".*" ).to_s.split.join.camelize.strip.singularize
-        @scaffold_builder = @source_name
+        @source_name, @scaffold_builder = source_name
       end
 
       def errors
         @errors
       end
 
+      def source_name
+        if @name  == ""
+          name = File.basename(@source, ".*")
+        else
+          name = @name.dup
+        end
+        name.to_s.downcase.split.join.camelize.strip.singularize
+      end
+
       def valid_data?
         if @source == "" || @source.nil?
           @errors << "No source selected"
@@ -105,8 +114,8 @@ module Scaffolding
         build_string
       end
 
-      def self.process(source, auto, uri)
-        importer = self.new(source, auto, uri)
+      def self.process(source, name, auto, uri)
+        importer = self.new(source, name, auto, uri)
         return importer.errors unless importer.errors.count == 0
         importer.results
       end

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

@@ -4,7 +4,7 @@ module Scaffolding
       ["Csv", "Raw"].each do |type|
         importer_class = Class.new("Scaffolding::Parser::#{type}".constantize) do
 
-          def initialize(file="", auto, uri)
+          def initialize(source, name, auto, uri)
             super
             @saved = 0
             @failed = 0

data/lib/scaffolding/version.rb

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

data/lib/scaffolding.rb

@@ -1,11 +1,12 @@
 require "scaffolding/version"
 
 module Scaffolding
-  require 'scaffolding/railtie'
+  require 'scaffolding/railtie' if defined?(Rails)
   require 'uri'
 
-  def self.generate(source, auto, migrate, import)
+  def self.generate(source, name, auto, migrate, import)
     @source = source
+    @name = name
     @auto = auto
     @migrate = migrate
     @import = import
@@ -23,7 +24,7 @@ module Scaffolding
   end
 
   def self.parser(namespace="")
-    "Scaffolding::Parser#{namespace + "::" + Scaffolding.class_ref}".constantize.process(@source, @auto, @uri)
+    "Scaffolding::Parser#{namespace + "::" + Scaffolding.class_ref}".constantize.process(@source, @name, @auto, @uri)
   end
 
   def self.class_ref

metadata

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