make 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714cc72109a10f3fbad6757b95cda1cdb4fd99c6
-  data.tar.gz: dd7a5ca7a7315a39e7bdc7b13cce87c190dd308d
+  metadata.gz: 6edbcf13869122e86247eb3fae3e2125536899f3
+  data.tar.gz: 4a753ba447898bb7938bf38eef4c5a0bcd24de42
 SHA512:
-  metadata.gz: 48c8421360d0b7da25cbfda6da60014b345f4974141f3969e004927c18b8f83908ae7fce48f3cc6967ce81975d371a9b6776b34f7f9e70b5b9036552c5615aaf
-  data.tar.gz: f15f7aceed3f4edce08d6c5566499fe21695f41b1b06ea56d6748d22cc00ae364676baabb2bd91979702780d06f1cfe444f3e4afa6481dfd3087674d1da5a978
+  metadata.gz: d79b384a7f41e8547da259ec3133bfab9e64540a51450850d3d31bf44c1d179982541e87d900f264c62ae9175a0fc8a6ac8875480228733d04a3d35d6b0e658d
+  data.tar.gz: e55a3771bea39a6902ed6b254070cca907aa2b88f83a7b428e114af0e90b79d6058471a9336422b1427bef04d961106ecc12af808caacd50c4c76e0a92422eb4

data/bin/make

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

data/lib/make.rb

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

data/lib/make/table.rb

@@ -6,6 +6,10 @@ class Table
 		@keys_to_ignore=['id','created_at','updated_at']
 		@keys_to_show=[]
 		@combination=[]
+		@columns=[]
+		@crud=''
+		@all_columns=[]
+		@run_make_head=true
 	end
 
 	# Assigns desired column names to be combined
@@ -15,6 +19,7 @@ class Table
 			@keys_to_ignore+=parts
 			@keys_to_show.push(result)
 		}
+		# remake_columns
 		return self
 	end
 
@@ -26,63 +31,100 @@ class Table
 
 	# Must provide model as a String, uppercase
 	def model model,*rest
-		controller=model.downcase+"s"
-		# Convert given model String into Object
-		model=model.constantize.all
-		columns=@keys_to_show+model.column_names-@keys_to_ignore
+		@controller=model.downcase.pluralize
+		# Convert given model String into Object with .constantize
+		@model=model.constantize.all
+		@all_columns=@model.column_names
+		@limit=@model.length-1
+		# remake_columns
+		return self
+	end
+
+	# Defines column(s) to ignore
+	def cut *columns
+		@keys_to_ignore+=columns
+		# remake_columns
+		return self
+	end
+
+	# Redefines columns after some change
+	def remake_columns
+		@columns=@keys_to_show+@all_columns-@keys_to_ignore
+	end
 
+	# Defines row limit
+	def limit row
+		@limit=row-1
+		return self
+	end
+
+	# Defines order
+	def order rule
+		@model=@model.order(rule)
+		return self
+	end
+
+	def make_head
 		# HEADER
 		# Makes default headers based on column names
-		columns.each {|key|
+		@columns.each {|key|
 			if key[-3..-1]=='_id'
 				key=key[0...-3]
 			end
-			@thead+="\n\t\t\t<th>"+key.gsub('_',' ').titleize+'</th>'
+			# Ignores any column name containing "password"
+			if key.include? "password"
+				@keys_to_ignore.push(key)
+			else
+				@thead+="\n\t\t\t<th>"+key.gsub('_',' ').titleize+'</th>'
+			end
 		}
 		@thead+="\n\t\t\t<th>Action</th>"
+	end
+
+	# Makes table from given model and row limit, if any
+	def make_body
+		# Set limit to custom value if not nil, 0, or @model.length
 
-		# BODY
-		# Makes table from given model and row limit, if any
-		if rest.length
-			limit=model.length-1
-			# Set limit to custom value if not nil, 0, or model.length
-			if ![nil,0,model.length].include?(rest[1])
-				limit=rest[1]-1
+
+		# Makes <tr>s from @model array until specified or default limit
+		@model[0..@limit].each {|user|
+			@tbody+="\n\t\t<tr>"
+			# Makes merged columns, if specified
+			if @combination.length!=0
+				all_vals=[]
+				@combination.each { |col| all_vals.push(user.attributes[col].to_s) }
+				@tbody+="\n\t\t\t<td>"+all_vals.join(" ")+'</td>'
 			end
 
-			# Makes <tr>s from models array until specified or default limit
-			model[0..limit].each {|user|
-				@tbody+="\n\t\t<tr>"
-				# Makes merged columns, if specified
-				if @combination.length!=0
-					all_vals=[]
-					@combination.each { |col| all_vals.push(user.attributes[col].to_s) }
-					@tbody+="\n\t\t\t<td>"+all_vals.join(" ")+'</td>'
+			# Makes <td>s
+			user.attributes.except(*@keys_to_ignore).each {|key,val|
+				# Auto connects with related table
+				if key[-3..-1]=='_id'
+					@temp=val
+					# Use '.keys' & '.values' to get certain # key or value from hash
+					# .values[1] grabs column after 'id'
+					val=key[0...-3].capitalize.constantize.find(val).attributes.values[1]
+				elsif key=='created_at' || key=='updated_at'
+					val=val.strftime("%b %d, %Y %I:%M %p")
 				end
-
-				# Makes <td>s
-				user.attributes.except(*@keys_to_ignore).each {|key,val|
-					if key[-3..-1]=='_id'
-						# Use '.keys' & '.values' to get certain # key or value from hash
-						val=key[0...-3].capitalize.constantize.find(val).attributes.values[val]
-					elsif key=='created_at' || key=='updated_at'
-						val=val.strftime("%b %d, %Y %I:%M %p")
-					end
-					@tbody+="\n\t\t\t<td>"+val.to_s+'</td>'
-				}
-
-				# Generates (C)RUD links
-				crud="\n\t\t\t<td><a href=\"/"+controller+"/"+user.id.to_s+"\">Show</a> | <a href=\"/"+controller+"/"+user.id.to_s+"/edit\">Edit</a> | <a href=\"/"+controller+"/"+user.id.to_s+"\" data-method=\"delete\">Delete</a></td>"
-				@tbody+=crud+"\n\t\t</tr>"
+				@tbody+="\n\t\t\t<td>"+val.to_s+'</td>'
 			}
-		end
-		return self
+
+			# Generates (C)RUD links
+			@tbody+="\n\t\t\t"+crud(user.id.to_s)+"\n\t\t</tr>"
+		}
+		# return self
+	end
+
+	def crud id
+		return "<td><a href=\"/"+@controller+"/"+id+"\">Show</a> | <a href=\"/"+@controller+"/"+id+"/edit\">Edit</a> | <a href=\"/"+@controller+"/"+id+"\" data-method=\"delete\">Delete</a></td>"
 	end
 
 	# Makes custom headers
 	def th *ths
 		@thead=''
 		ths.each { |custom_header| @thead+="\n\t\t\t<th>%s</th>" % custom_header }
+		@run_make_head=false
 		return self
 	end
 
@@ -105,12 +147,26 @@ class Table
 	end
 
 	# Generates for loop code in 'table_html.txt'
-	def for!
-		# "<table>\n\t<thead>\n\t\t<tr>"+@thead+"\n\t\t</tr>\n\t</thead>\n\t<tbody><% for |row| in "++"\n\t</tbody>\n</table>"
+	def for! variable
+		@columns=@all_columns
+		if @run_make_head
+			make_head
+		end
+		singular=variable[1..-1].singularize
+		tds=''
+		@all_columns.each { |col| tds+="\n\t\t\t\t<td><%= "+singular+"['"+col+"'] %></td>" if !col.include? "password" }
+		tds+="\n\t\t\t\t"+crud("<%= "+singular+"['id'] %>")
+		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>\n\t\t<% for |"+singular+"| in "+variable+" do %>\n\t\t\t<tr>"+tds+"\n\t\t\t</tr>\n\t\t<% end %>\n\t</tbody>\n</table>\n\n\n<--! PUT THE FOLLOWING LINE INTO YOUR CONTROLLER -->\n"+variable+" = "+singular.capitalize+".all")) }
+		return self
 	end
 
 	# Place table code into view
 	def now!
+		remake_columns
+		if @run_make_head
+			make_head
+		end
+		make_body
 		return ('<table><thead><tr>'+@thead+'</tr></thead><tbody>'+@tbody+'</tbody></table>').html_safe
 	end
 end

metadata

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