bowtie 0.3 → 0.3.1

data/bowtie.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.3"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomás Pollak"]

data/lib/bowtie/admin.rb

@@ -67,7 +67,7 @@ module Bowtie
 		end
 
 		post "/:model" do
-			@resource = model.create(params[:resource].normalize)
+			@resource = model.create(params[:resource].prepare_for_query(model))
 			if @resource.valid? and @resource.save
 				redirect "/#{model.pluralize}?notice=created"
 			else
@@ -94,11 +94,15 @@ module Bowtie
 		end
 
 		put "/:model/:id" do
-			if resource.update(params[:resource].normalize)
-				request.xhr? ? resource.to_json : redirect("/#{model.pluralize}/#{params[:id]}?notice=saved")
-			else
-				if request.xhr?
+			if request.xhr? # dont pass through hooks or put the boolean stuff
+				if resource.update!(params[:resource].filter_inaccessible_in(model).normalize)
+					resource.to_json
+				else
 					false
+				end
+			else # normal request
+				if resource.update(params[:resource].prepare_for_query(model))
+					redirect("/#{model.pluralize}/#{params[:id]}?notice=updated")
 				else
 					@resource = resource
 					erb :show

data/lib/bowtie/core_extensions.rb

@@ -20,6 +20,14 @@ class Class
 		self.to_s.pluralize
 	end
 
+	def field_names
+		self.properties.collect{|p| p.name }
+	end
+
+	def boolean_fields
+		self.properties.map{|a| a.name if a.class == DataMapper::Property::Boolean}.compact
+	end
+
 	def searchable_fields
 		self.properties.map{|a| a.name if a.class == DataMapper::Property::String}.compact
 	end
@@ -45,10 +53,29 @@ end
 
 class Hash
 
+	def prepare_for_query(model)
+		self.filter_inaccessible_in(model).include_missing_booleans_in(model).normalize
+	end
+
+	def filter_inaccessible_in(model)
+		fields = model.field_names
+		self.delete_if { |key,val| !fields.include?(key.to_sym) }
+	end
+
+	def include_missing_booleans_in(model)
+		model.boolean_fields.each do |bool|
+			self[bool] = false unless self.has_key?(bool.to_s)
+		end
+		self
+	end
+
 	# this is for checkboxes which give us a param of 'on' on the params hash
 	def normalize
+		replacements = { 'on' => true, '' => nil}
 		normalized = {}
-		self.each_pair {|k,v| normalized[k] = v == 'on' ? true : v }
+		self.each_pair do |key,val|
+			normalized[key] = replacements.has_key?(val) ? replacements[val] : val
+		end
 		normalized
 	end
 

data/lib/bowtie/public/css/bowtie.css

@@ -141,10 +141,6 @@ table{
 	text-align: left;
 }
 
-table tr:hover{
-	background: #efefef;
-}
-
 table tr td, table tr th {
 	border:1px solid #ccc;
 	padding:6px;
@@ -187,21 +183,35 @@ table .check-column{
 	text-align: center;
 }
 
-table tr.good{
-/*	background: green;*/
+table tr.active,
+table tr.enabled{
+	border-left: 5px solid #528e00;
+}
+
+table tr.active td,
+table tr.enabled td{
+	background: #ebf9eb;
 }
 
-table tr.bad td, table .error{
+table tr.cancelled,
+table tr.disabled,
+table tr.suspended{
+	border-left: 5px solid #a00;
+}
+
+table tr.cancelled td,
+table tr.disabled td,
+table tr.suspended td{
 /*	background-color: #fbf5dc;*/
 	background-color: #FFEFEF;
 }
 
 table th.rel{
 	background: #999;
-	color: #fff
+	color: #fff;
 }
 table td.rel {
-	background: #fafafa;
+	background: #eee;
 }
 
 table .icon{
@@ -211,6 +221,10 @@ table .icon{
 	margin-top: -3px;
 }
 
+table tr:hover td{
+	background: #ffffed;
+}
+
 /* forms
 -------------------------------------------------------------*/
 

data/lib/bowtie/views/field.erb

@@ -2,7 +2,11 @@
 
 	html =''
 	name = @p.name.to_s
-	value = @resource.send(@p.name).to_s
+	begin
+		value = @resource.send(@p.name)
+	rescue NoMethodError
+		value = ''
+	end
 
 	case @p.class.to_s.gsub("DataMapper::Property::",'')
 		when "Array", /Class/ # weird how datamapper names enum classes
@@ -13,10 +17,10 @@
 			end
 			html += '</select>'
 		when "TrueClass", "FalseClass", /Boolean/
-			checked = (value == 'n' || value.blank?) ? '' : 'checked="checked"'
+			checked = value == true ? 'checked="checked"' : ''
 			html += '<input name="resource['+name+']" type="checkbox" '+checked+' />'
 		else
-			html += '<input class="string" type="text" name="resource['+name+']" value="'+value+'" />'
+			html += '<input class="string" type="text" name="resource['+name+']" value="'+value.to_s+'" />'
 	end
 	html
 

data/lib/bowtie/views/form.erb

@@ -8,7 +8,7 @@
 	<% unless [:created_at, :id].include?(p.name) %>
 	<% @p = p %>
 	<tr>
-		<td class="left-col"><%= p.name.to_s.titleize %> <small>(<%= p.class.name.to_s.gsub("DataMapper::Property::",'') %>)</small></td>
+		<td class="left-col"><%= p.name.to_s.titleize %> <small>(<%= p.class.name.to_s.gsub("DataMapper::Property::",'') || 'Enum' %>)</small></td>
 		<td class="right-col"><%= partial(:field) %></td>
 	</tr>
 	<% end %>

data/lib/bowtie/views/row.erb

@@ -1,4 +1,4 @@
-<tr id="resource-<%= @r.key.first.to_s %>" class="<%= @r.ok? ? 'good' : 'bad' if @r.respond_to?('ok?') %>">
+<tr id="resource-<%= @r.key.first.to_s %>" class="<%= @r.state.to_s if @r.respond_to?(:state) %>">
 	<td class="<%= @model.key.first.name.to_s %>-col"><a href="<%= url_for(@r) %>"><%= @r.key.first.to_s %></a></td>
 	<% @r.attributes.each do |a| %>
 	<% next if a[0] == @model.key.first.name %>

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  version: "0.3"
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"