bowtie 0.4.1 → 0.4.2

data/bowtie.gemspec

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

data/lib/bowtie/core_extensions.rb

@@ -1,15 +1,22 @@
-class String
+# if we have active support, lets use it
+# otherwise add the few needed methods to avoid loading it
 
-	def titleize
-		self.capitalize.gsub('_',' ')
-	end
+unless defined?(ActiveSupport::Inflector)
 
-	def singularize
-		self.gsub(/ies/,'y').gsub(/s$/, '')
-	end
+	class String
+
+		def titleize
+			self.capitalize.gsub('_',' ')
+		end
+
+		def singularize
+			self.gsub(/ies/,'y').gsub(/s$/, '')
+		end
+
+		def pluralize
+			self.gsub(/y$/,'ie') + "s"
+		end
 
-	def pluralize
-		self.gsub(/y$/,'ie') + "s"
 	end
 
 end

data/lib/bowtie/views/row.erb

@@ -1,9 +1,9 @@
 <tr id="resource-<%= @r.primary_key.to_s %>" class="<%= @r.state.to_s if @r.respond_to?(:state) %>">
 	<td class="<%= @model.primary_key %>-col"><a href="<%= url_for(@r) %>"><%= @r.primary_key %></a></td>
 
-	<% @r.attributes.each do |k, v| %>
-		<% next if k == @model.primary_key or k.to_s[/id$/] or k == '_type' %>
-		<td class="<%= k %>-col <%= k.class.name.downcase %> editable"><%= truncate(v, 64) || 'nil' %></td>
+	<% @model.field_names.each do |f| %>
+		<% next if f == @model.primary_key or f.to_s[/_id$/] or f.to_s == '_type' %>
+		<td class="<%= f %>-col editable"><%= truncate(@r.send(f), 64) || 'nil' %></td>
 	<% end %>
 
 	<% unless params[:association] %>

data/lib/bowtie/views/table.erb

@@ -3,14 +3,13 @@
 			<tr>
 			<th title="<%= @model.primary_key %>" class="<%= @model.primary_key %>-col"><%= @model.primary_key.to_s.upcase %></th>
 
-			<!-- filter id, _type and associations -->
-			<% @resources.first.attributes.each do |k, v| %>
-				<% next if k.to_s == 'id' or k.to_s[/id$/] or k == '_type' or v.class == Array %>
-				<th title="<%= v.class %>" class="<%= k.to_s %>-col <%= v.class.name.downcase %>"><%= k.to_s.titleize %></th>
+			<% @model.field_names.each do |f| %>
+				<% next if f == @model.primary_key or f.to_s[/_id$/] or f.to_s == '_type' %>
+				<th class="<%= f.to_s %>-col"><%= f.to_s.titleize %></th>
 			<% end %>
 
 			<% unless params[:association] %>
-			<% @resources.first.class.model_associations.each do |rel_name, assoc| %>
+			<% @model.model_associations.each do |rel_name, assoc| %>
 				<%= render_assoc_header(rel_name, assoc) %>
 			<% end %>
 			<% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"