make 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358db4322a2767db4c9dd0c00e99ee89ca7951a1
-  data.tar.gz: b50babfd88a375ca57b3d86a7844e442a9c59c0d
+  metadata.gz: d9859b1011471276787c7de7c4bea66ba257db0c
+  data.tar.gz: 92d00aa9ef8415f62387577cdbed417d6f0ee036
 SHA512:
-  metadata.gz: 51f33682f3ec11e429d66a596ccf475741fc91940b23fd88a48f56284fbf65af61218215527b11fdb0e24afb9954f56373ec39f8dcba5297adede38a46727732
-  data.tar.gz: 53c09c37b3e70b2456c529610c7e85b8be709c06b73b75caeb2c40856132e000ae40fb5da1792b41c5fb3794e7b19b54cb8a4946bc74745bedfcb0f7e9e701fd
+  metadata.gz: 1ff5eace2e3a8faa6fb6d2cbabb1076eac85780d016db77d00d36d110094286c4d86c25f00e9e571d04a0e5655a68890a1ad3911c26e91c69f682e0610cd9f5a
+  data.tar.gz: 21e46222eddbf85b2fb6bcd58dca215ef77e77380180ffbcfa81769aa52a2c4ebd6b70ba887885dea1a9bdd214f94211eb6e778115d2866304470536b7a3f093

data/bin/make

@@ -1,4 +1,13 @@
 #!/usr/bin/env ruby
 
-require 'sarawong'
-puts Sarawong.hi(ARGV[0])
+require 'make'
+puts print "Please input your Model name"
+model = gets
+puts print "Would you like a table or form? (t or f)"
+type = gets
+if type == 't'
+	result = Make.model(model).now!
+else	
+	result = Make.form(model).now!
+end
+print result

data/lib/make/form.rb

@@ -1,28 +1,90 @@
-module Form
-	def self.form(model, columnNames, options = {})
+class Form
+	def initialize
 		# Convert given model into String
-		controller=model.to_s.downcase+"s"
-		# Set form action and method to create using REST conventions
-		form = '<form action="/' + controller + '" method="post">'
-		# if default optional parameters are passed in, make hidden inputs
-		if options[:default]
-			options[:default].each_pair do |key, value|
-				form = form + '<input type="hidden" name="'+key.to_s+'" value="'+value.to_s+'">'
-				# remove the created inputs from the columns Array (columnNames).
-				columnNames.delete(key.to_s)
+		@formClass='make-form'
+		# By default, set form action and method to create using REST conventions
+		@formMethod='post'
+		@formStart=''
+		@formMiddle=[]
+		@formEnd='<input id="authenticity_token" name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>"><input type="submit" value="Submit"></form>'
+		@default_keys_to_ignore = ['id', 'created_at', 'updated_at']
+		@potential_keys_to_ignore = ['salt']
+		@defaults = {}
+		@keys_to_show=[]
+		@selections = []
+		@password_confirmation = true
+		@model = {}
+		@columns = []
+	end
+	def default column, value
+		@defaults = @defaults.merge({column => value})
+ 		# remove the created inputs from the columns Array (columnNames).
+ 		@potential_keys_to_ignore.push(column.to_s)
+	 	return self
+	end
+	def confirm change
+		@password_confirmation = false
+		return self
+	end
+	def model model
+		@formAction = '/' + model.downcase+"s"
+		@model = model.constantize
+		return self
+	end
+	def select column, array, assoc = false
+		columnName = column.titleize
+		input = '<label>' + columnName + '</label><select name="' + column + '" value="' + column + '">'
+		if assoc		#if association is checked true
+			array.each do |id|
+				val = column[0...-3].capitalize.constantize.find(id).attributes.values[1]
+				input += '<option value="' + id.to_s + '">' + val.to_s + '</option>'
+			end
+		else			#if no associations exist for array
+			array.each do |item| 
+				input += '<option value="' + item.to_s + '">' + item.to_s + '</option>'
 			end
 		end
-		# These are some typical form keys to ignore when rendering form
-		toRemove = ['id', 'created_at', 'updated_at', 'salt', 'encrypted_password']
-		toRemove.each do |item|
-			columnNames.delete(item)
+		@potential_keys_to_ignore.push(column)
+		input += '</select>'
+		@formMiddle.push(input)
+		return self
+	end
+	# Build code from class variables
+	def starter
+		@formStart = '<form class="' + @formClass + '" action="' + @formAction + '" method="' + @formMethod + '">'
+	end
+	def middle
+		@columns = @keys_to_show + @model.column_names - @default_keys_to_ignore
+		@potential_keys_to_ignore.each do |item|
+			puts 'got in potential'
+			@columns.delete(item)
+			puts @columns
+			puts @item
 		end
-		# Create text input labels for simple form creation
-		columnNames.each do |column|
-			form = form + '<label>' + column.titleize + '</label><input type="text" name="'+column+'">'
+		# Create text input labels
+		@columns.each do |column|
+			if column.include? 'password'
+				input = '<label>Password</label><input type="text" name="password">'
+				@formMiddle.push(input)
+				if @password_confirmation 
+					input = '<label>Confirm Password</label><input type="text" name="password_confirmation">'
+					@formMiddle.push(input)			
+				end
+			else
+				input = '<label>' + column.titleize + '</label><input type="text" name="'+column+'">'
+				@formMiddle.push(input)
+			end
 		end
-		# Add authentication to each form requested
-		form += '<input id="authenticity_token" name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>"><input type="submit" value="Submit"></form>'
-		return form
+		@defaults.each_pair do |key, value|
+ 			input = '<input type="hidden" name="'+key.to_s+'" value="'+value.to_s+'">'
+ 			puts input
+ 			puts @formMiddle
+ 			@formMiddle.push(input)
+ 		end
+ 	end
+	def now!
+		starter
+		middle
+		return (@formStart+@formMiddle.join+@formEnd).html_safe
 	end
 end

data/lib/make.rb

@@ -8,12 +8,10 @@ module Make
 		string = string.html_safe
 		return string
 	end
-	def self.form(input, options = {})
-		string = Form.form(input.to_s, input.column_names, options)
-		string = string.html_safe
-		return string
+	def self.form
+		Form.new
 	end
 	def self.table
-		return Table.new
+		Table.new
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sara Wong