bowtie 0.3.1 → 0.3.2

data/bowtie.gemspec

@@ -1,13 +1,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomás Pollak"]
   s.date = %q{2010-06-06}
   s.description = %q{Admin scaffold for DataMapper models, on Sinatra.}
-  s.email = %q{tomas@usefork.com}
+  s.email = %q{tomas@forkhq.com}
   s.extra_rdoc_files = ["lib/bowtie.rb", "lib/bowtie/admin.rb", "lib/bowtie/core_extensions.rb", "lib/bowtie/helpers.rb"]
   s.files = ["README.rdoc", "bowtie.gemspec", "lib/bowtie.rb", "lib/bowtie/admin.rb", "lib/bowtie/core_extensions.rb", "lib/bowtie/helpers.rb", "lib/bowtie/views/errors.erb", "lib/bowtie/views/field.erb", "lib/bowtie/views/flash.erb", "lib/bowtie/views/form.erb", "lib/bowtie/views/index.erb", "lib/bowtie/views/layout.erb", "lib/bowtie/views/new.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/show.erb", "lib/bowtie/views/subtypes.erb", "lib/bowtie/views/table.erb", "lib/bowtie/views/row.erb", "lib/bowtie/public/css/bowtie.css", "lib/bowtie/public/js/bowtie.js", "lib/bowtie/public/js/jquery.tablesorter.pack.js", "lib/bowtie/public/js/jquery.jeditable.pack.js"]
   s.homepage = %q{http://github.com/tomas/bowtie}

data/lib/bowtie/admin.rb

@@ -33,7 +33,8 @@ module Bowtie
 		end
 
 		get '/' do
-			redirect ''
+		  # redirect '' results in an endless redirect on the current version of sinatra/rack
+			redirect '/' + @models.first.pluralize
 		end
 
 		get '' do

data/lib/bowtie/helpers.rb

@@ -48,7 +48,7 @@ module Bowtie
 		# views, paths
 
 		def partial(name, *args)
-			erb(name, :layout => false, *args)
+			erb(name, {:layout => false}, *args)
 		end
 
 		def model_path(m = current_model)
@@ -60,6 +60,10 @@ module Bowtie
 			model_path(object.class) + '/' + object.id.to_s
 		end
 
+		def truncate(str, length)
+			str.to_s.length > length ? str.to_s[0..length] + '…' : str.to_s
+		end
+
 	end
 
 end

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

@@ -183,22 +183,43 @@ table .check-column{
 	text-align: center;
 }
 
+/* good states
+---------------------------*/
+
+table tr.ok,
 table tr.active,
 table tr.enabled{
 	border-left: 5px solid #528e00;
 }
 
+table tr.ok td,
 table tr.active td,
 table tr.enabled td{
-	background: #ebf9eb;
+	background: #EFFFF0;
+}
+
+/* "middle" states
+---------------------------*/
+
+table tr.pending{
+/*	border-left: 5px solid #ffcc00;*/
 }
 
+table tr.pending td{
+/*	background: #ebf9eb;*/
+}
+
+/* bad states
+---------------------------*/
+
+table tr.deleted,
 table tr.cancelled,
 table tr.disabled,
 table tr.suspended{
 	border-left: 5px solid #a00;
 }
 
+table tr.deleted td,
 table tr.cancelled td,
 table tr.disabled td,
 table tr.suspended td{

data/lib/bowtie/views/row.erb

@@ -2,7 +2,7 @@
 	<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 %>
-	<td class="<%= a[0] %>-col editable"><%= a[1] || 'nil' %></td>
+	<td class="<%= a[0] %>-col editable"><%= truncate(a[1], 64) || 'nil' %></td>
 	<% end %>
 	<% unless params[:association] %>
 	<% @model.relationships.each do |rel| %>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -21,9 +22,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
@@ -35,9 +38,11 @@ dependencies:
   name: dm-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 10
@@ -49,9 +54,11 @@ dependencies:
   name: dm-aggregates
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 10
@@ -63,9 +70,11 @@ dependencies:
   name: dm-pager
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -74,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 description: Admin scaffold for DataMapper models, on Sinatra.
-email: tomas@usefork.com
+email: tomas@forkhq.com
 executables: []
 
 extensions: []
@@ -122,16 +131,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -139,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bowtie
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Bowtie Admin