make 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61865a3ac907f64b4728d84efceaa07aea2fe97f
-  data.tar.gz: b82392c918b182f522d09a4afabb49ad74b85e8c
+  metadata.gz: 79ac078514af6ee434000d2190d1849f5bbba72b
+  data.tar.gz: 4f02f085249edbe40ed8747f415e3fcf5236f2b7
 SHA512:
-  metadata.gz: b5c7d6c5b9ac2dfe6c99652bc90dc5fc62c47e552f562a84bcaf8bb58284f085a01286167b146f238a874c99a828637bd966905825d7f755f493ff5dfe7dc94d
-  data.tar.gz: cb77279d01346b1c5805584d82e1a0c6cda46a6653ae116db3072ce8b9711140a8cca39c08107bd08351d6d162fda9ae8736a7db4a201840297f8fc4d163f59f
+  metadata.gz: 4b2cb3222c3e2a46764c4374e93d82855bc786245e82ab2a8cd16642f0a90e765604e936ff261d7f7505f92e81868d5c73d26a81a73da77e13e195c0cdadfd08
+  data.tar.gz: 0c11cd30284a5342cf65b656a13877401ef598f654ab5c5e8411a9a460f333265a0daf2c54036dfd3f631dc38eaad085937aaca7571adb79c8054812ec2c36d3

data/bin/make

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'sarawong'
-puts Sarawong.hi(ARGV[0])
+require 'make'
+puts make.header(ARGV[0])

data/lib/make/form.rb

@@ -7,7 +7,7 @@ class Form
 		@formMethodHidden=nil
 		@formStart=''
 		@formMiddle=[]
-		@formEnd='<input id="authenticity_token" name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>"><input type="submit" value="Submit"></form>'
+		@formEnd='\n\t<input id="authenticity_token" name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>">\n\t<input type="submit" value="Submit">\n</form>'
 		@default_keys_to_ignore = ['id', 'created_at', 'updated_at']
 		@potential_keys_to_ignore = ['salt']
 		@defaults = {}
@@ -58,19 +58,19 @@ class Form
 	# Similar to default, but instead of a hidden specific value you pass in an array and create a select/option field.
 	def select column, array, assoc = false
 		columnName = column.titleize
-		input = '<label>' + columnName + '</label><select name="' + @modelName + '[' + column + ']">'
+		input = '\n\t<label>' + columnName + '\n\t</label>\n\t<select name="' + @modelName + '[' + 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>'
+				input += '\n\t\t\t<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>'
+				input += '\n\t\t\t<option value="' + item.to_s + '">' + item.to_s + '</option>'
 			end
 		end
 		@potential_keys_to_ignore.push(column)
-		input += '</select>'
+		input += '\n\t</select>'
 		@formMiddle.push(input)
 		return self
 	end
@@ -78,7 +78,7 @@ class Form
 	def starter
 		if @formMethodHidden
 			@formStart = '<form class="' + @formClass + '" action="' + @formAction + '/'+ @id.to_s + '" method="' + @formMethod + '">'
-			@formStart += '<input name="_method" type="hidden" value="' + @formMethodHidden + '">'				
+			@formStart += '\n\t<input name="_method" type="hidden" value="' + @formMethodHidden + '">'				
 		else
 			@formStart = '<form class="' + @formClass + '" action="' + @formAction + '" method="' + @formMethod + '">'			
 		end
@@ -95,19 +95,19 @@ class Form
 		# Create text input labels
 		@columns.each do |column|
 			if column.include? 'password'
-				input = '<label>Password</label><input type="text" name="' + @modelName + '[password]">'
+				input = '\n\t<label>Password</label>\n\t<input type="text" name="' + @modelName + '[password]">'
 				@formMiddle.push(input)
 				if @password_confirmation 
-					input = '<label>Confirm Password</label><input type="text"' + @modelName + '[password_confirmation]">'
+					input = '\n\t<label>Confirm Password</label>\n\t<input type="text"' + @modelName + '[password_confirmation]">'
 					@formMiddle.push(input)			
 				end
 			else
-				input = '<label>' + column.titleize + '</label><input type="text" name="' + @modelName + '[' + column + ']">'
+				input = '\n\t<label>' + column.titleize + '\n\t</label>\n\t<input type="text" name="' + @modelName + '[' + column + ']">'
 				@formMiddle.push(input)
 			end
 		end
 		@defaults.each_pair do |key, value|
- 			input = '<input type="hidden" name="'+ @modelName + '[' + key.to_s + ']" value="' + value.to_s + '">'
+ 			input = '\n\t<input type="hidden" name="'+ @modelName + '[' + key.to_s + ']" value="' + value.to_s + '">'
  			puts input
  			puts @formMiddle
  			@formMiddle.push(input)

data/lib/make/table.rb

@@ -10,6 +10,7 @@ class Table
 		@crud=''
 		@all_columns=[]
 		@run_make_head=true
+		@file=false
 	end
 
 	# Assigns desired column names to be combined
@@ -141,7 +142,13 @@ class Table
 	end
 
 	# Writes table html code to 'table_html.txt' file located in application's root folder
-	def file
+	def file!
+		remake_columns
+		if @run_make_head
+			make_head
+		end
+		make_body
+		@file=true
 		File.open('table_html.txt', 'w') { |f| f.write(("<table>\n\t<thead>\n\t\t<tr>"+@thead+"\n\t\t</tr>\n\t</thead>\n\t<tbody>"+@tbody+"\n\t</tbody>\n</table>")) }
 		return self
 	end
@@ -162,11 +169,13 @@ class Table
 
 	# Place table code into view
 	def now!
-		remake_columns
-		if @run_make_head
-			make_head
-		end
-		make_body
+		if !@file
+			remake_columns
+			if @run_make_head
+				make_head
+			end
+			make_body
+		end	
 		return ('<table><thead><tr>'+@thead+'</tr></thead><tbody>'+@tbody+'</tbody></table>').html_safe
 	end
 end

data/lib/make.rb

@@ -14,7 +14,4 @@ module Make
 	def self.table
 		Table.new
 	end
-	def self.ctable
-		Ctable.new
-	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sara Wong
@@ -15,7 +15,7 @@ description: A gem that shortcuts typing out forms for SQL users. Assuming your
   is named Model_Name, just type <%= Make.form(Model) %> wherever in your Rails view
   and it will return an html-safe string from your column names for creating a new
   record. In addition, you can type <%= Make.table.model("Table_Name").now! %> to
-  automatically generate a table. More functions to follow!
+  automatically generate a table. Use <%= Make.header("Title") to make a default header.
 email:
 - swong2@wellesley.edu
 - utemoc@gmail.com