bowtie 0.3.2 → 0.4

data/README.md

@@ -0,0 +1,68 @@
+## Bowtie: Zeroconf admin scaffold for your MongoMapper & DataMapper models
+
+Bowtie reads the information on your models and creates a nice panel in which you can view, edit and destroy records easily.
+
+## How does it look?
+
+![Bowtie!](https://github.com/tomas/bowtie/raw/master/screenshot.png)
+
+## Installation
+
+Include it in your Gemfile and update your bundle:
+
+    source 'rubygems.org'
+    ..
+    gem 'bowtie'
+  
+Or install it by hand:
+
+    $ gem install bowtie
+
+## Configuration
+
+Mount Bowtie wherever you want by editing your config.ru file, after loading your models. You can optionally include the admin/pass combination for the panel.
+
+    require 'my_app' # models are loaded
+    require 'bowtie'
+
+    BOWTIE_AUTH = {:user => 'admin', :pass => '12345' }
+
+    app = Rack::Builder.new {
+      map "/admin" do
+        run Bowtie::Admin
+      end
+
+      map '/' do
+        run MyApp
+      end
+    }
+
+    run app
+
+Now you can go to /admin in your app's path and try out Bowtie using your user/pass combination. If not set, it defaults to admin/bowtie.
+
+## Important notes
+
+Bowtie requires a few gems but they're not included in the gemspec to prevent forcing your from installing unneeded gems. Therefore you need to make sure that Bowtie will have the following gems to work with: 
+
+For DataMapper models: 
+
+ * dm-core
+ * dm-validations
+ * dm-aggregates
+ * dm-pager
+
+For MongoMapper models:
+ 
+ * mongo_mapper
+
+From version 0.3, Bowtie is meant to be used from DataMapper 1.0.0 on. For previous versions please install with -v=0.2.5.
+
+## TODO
+
+ * Better handling of types (Text, JSON, IPAddress) in #show
+ * Better handling of relationships in #show
+
+## Copyright
+
+(c) 2010-2011 - Tomás Pollak for Fork Ltd. Released under the MIT license.

data/bowtie.gemspec

@@ -1,21 +1,48 @@
-
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.3.2"
+  s.version = "0.4"
 
   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.description = %q{Simple admin scaffold for MongoMapper and DataMapper models.}
   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.extra_rdoc_files = [ "lib/bowtie.rb", 
+                         "lib/bowtie/admin.rb", 
+                         "lib/bowtie/core_extensions.rb", 
+                         "lib/bowtie/helpers.rb" ]
+
+  s.files = [ "README.md", 
+              "bowtie.gemspec", 
+              "lib/bowtie.rb", 
+              "lib/bowtie/adapters/datamapper.rb", 
+              "lib/bowtie/adapters/mongomapper.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/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}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bowtie", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{bowtie}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Bowtie Admin}
+  s.summary = %q{Bowtie Admin Scaffold}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -23,19 +50,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<dm-aggregates>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<dm-pager>, [">= 1.0.1"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<dm-core>, [">= 0.10.2"])
-      s.add_dependency(%q<dm-aggregates>, [">= 0.10.2"])
-      s.add_dependency(%q<dm-pager>, [">= 1.0.1"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<dm-core>, [">= 0.10.2"])
-    s.add_dependency(%q<dm-aggregates>, [">= 0.10.2"])
-    s.add_dependency(%q<dm-pager>, [">= 1.0.1"])
   end
 end

data/lib/bowtie.rb

@@ -1,10 +1,18 @@
-libdir = File.dirname(__FILE__)
+libdir = File.expand_path(File.dirname(__FILE__)) + '/bowtie'
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-%w(sinatra dm-core dm-aggregates dm-pager bowtie/helpers bowtie/core_extensions bowtie/admin).each {|lib| require lib}
-
-begin
-	repository(:default).adapter
-rescue DataMapper::RepositoryNotSetupError
-	puts ' ** You need to set up your DataMapper adapter for Bowtie to work. **'
+if defined?(DataMapper)
+	begin
+		%w(dm-core dm-validations dm-aggregates dm-pager json adapters/datamapper).each {|lib| require lib}
+	rescue Gem::LoadError => e
+		raise Gem::LoadError, "Seems you have an outdated version of one of the following gems: dm-core dm-validations dm-aggregates dm-pager"
+	rescue LoadError => e
+		raise Gem::LoadError, "Error loading DataMapper gems. Make sure the all the following gems are available: dm-core dm-validations dm-aggregates dm-pager"
+	end
+elsif defined?(MongoMapper)
+	%w(mongo_mapper adapters/mongomapper).each {|lib| require lib}
+else
+	raise Gem::LoadError, "No adapters found. You need to require MongoMapper (mongo_mapper) or DataMapper (dm-core) before requiring Bowtie."
 end
+
+%w(sinatra helpers core_extensions admin).each {|lib| require lib}

data/lib/bowtie/adapters/datamapper.rb

@@ -0,0 +1,126 @@
+module Bowtie
+
+	def self.models
+		DataMapper::Model.descendants.to_a
+	end
+
+	def self.search(params, page)
+		query1, query2 = [], []
+		params.each do |key, val|
+			query1 << "#{model}.all(:#{key} => '#{val}')"
+		end
+		model.searchable_fields.each do |field|
+			query2 << "#{model}.all(:#{field}.like => '%#{params[:q]}%')"
+		end
+		query = query1.any? ? [query1.join(' & '), query2.join(' + ')].join(' & ') : query2.join(' + ')
+		@resources = eval(query).page(page, :per_page => PER_PAGE)
+		@subtypes = model.subtypes
+	end
+
+	def self.get_many(model, params, page)
+		add_paging(model.all(params), page)
+	end
+	
+	def self.get_one(model, id)
+		model.get(id) 
+	end
+	
+	def self.create(model, params)
+		model.create(params)
+	end
+
+	def self.get_associated(model, params)
+		res = model.get(params[:id]).send(params[:association])
+		# if model.associations[params[:association]].type == :many
+		# 	add_paging(res, params)
+		# end
+	end
+	
+	# doesnt trigger validations or callbacks
+	def self.update!(resource, params)
+		resource.update!(params)
+	end
+
+	def self.update(resource, params)
+		resource.update(params)
+	end
+
+	def self.add_paging(resources, page)
+		resources.respond_to?(:page) ? resources.page(page, :per_page => PER_PAGE) : resources
+	end
+	
+	def self.belongs_to_association?(assoc)
+		assoc.class == DataMapper::Associations::ManyToOne::Relationship
+	end
+
+	def self.has_one_association?(assoc)
+		assoc.class == DataMapper::Associations::OneToOne::Relationship
+	end
+
+	module Helpers
+
+		def total_entries(resources)
+			resources.respond_to?(:pager) ? resources.pager.total : resources.count
+		end
+		
+		def show_pager(resources, path)
+			resources.pager.to_html(base_path + path) if resources.respond_to?(:pager)
+		end
+		
+	end
+
+end
+
+class Object
+	def primary_key
+		send(self.class.primary_key)
+	end
+
+	def to_json
+		attributes.to_json
+	end
+
+end
+
+class Class
+
+	def primary_key
+		key.first.name
+	end
+
+	def model_associations
+		h = {}
+		relationships.map {|r| h[r.name] = r }
+		h
+	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
+
+	def subtypes
+		begin
+			self.validators.first.last.map{|a,b| b = {a.field_name => a.options[:set]} if a.class == DataMapper::Validate::WithinValidator}.compact
+		rescue NoMethodError
+			# puts ' -- dm-validations gem not included. Cannot check subtypes for class.'
+			[]
+		end
+	end
+
+	def options_for_subtype(field)
+		self.validators.first.last.map{|a| a.options[:set] if a.class == DataMapper::Validate::WithinValidator && a.field_name == field}.compact.reduce
+	end
+
+	def relation_keys_include?(property)
+		self.relationships.map {|rel| true if property.to_sym == rel[1].child_key.first.name}.reduce
+	end
+
+end

data/lib/bowtie/adapters/mongomapper.rb

@@ -0,0 +1,122 @@
+module Bowtie
+
+	def self.models
+		models = MongoMapper::Document.descendants.to_a.uniq
+#		models.each {|m| models = models + m.subclasses}
+#		models
+	end
+
+	def self.search(params, page)
+		puts "Search not implemented yet in MongoMapper!"
+		return []
+	end
+
+	def self.get_many(model, params, page)
+		add_paging(model.where(params), page)
+	end
+
+	def self.get_one(model, id)
+		model.find(id) 
+	end
+
+	def self.create(model, params)
+		model.create(params)
+	end
+
+	def self.get_associated(model, params)
+		model.find(params[:id]).send(params[:association])
+	end
+
+	def self.add_paging(resources, page)
+		resources.skip((page.to_i || 0)*PER_PAGE).limit(PER_PAGE).sort('id asc')
+	end
+
+	# doesnt trigger validations or callbacks
+	def self.update!(resource, params)
+		resource.update_attributes!(params)
+	end
+
+	def self.update(resource, params)
+		resource.update_attributes(params)
+	end
+
+	def self.belongs_to_association?(assoc)
+		assoc.class == MongoMapper::Plugins::Associations::BelongsToAssociation
+	end
+	
+	def self.has_one_association?(assoc)
+		assoc.class == MongoMapper::Plugins::Associations::OneAssociation
+	end
+
+	module Helpers
+
+		def total_entries(resources)
+			resources.count
+		end
+
+		def get_page(counter)
+			i = (params[:page].to_i || 0) + counter
+			i == 0 ? '' : "?page=#{i}"
+		end
+
+		def show_pager(resources, path)
+			path = base_path + path.gsub(/[?|&]page=\d+/,'') # remove page from path
+			nextlink = "<li><a class='next' href='#{path}#{get_page(1)}'>Next &rarr;</a></li>"
+			prevlink = "<li><a class='prev' href='#{path}#{get_page(-1)}'>&larr; Prev</a></li>"
+			s = params[:page] ? prevlink + nextlink : nextlink
+			"<ul class='pager'>" + s + "</ul>"
+		end
+
+	end
+
+end
+
+class Object
+
+	def primary_key
+		send(self.class.primary_key)
+	end
+
+end
+
+class Class
+
+	def primary_key
+		'id'
+	end
+
+	def model_associations
+		associations
+	end
+
+	def field_names
+		self.keys.keys.collect { |f| f.to_sym }
+	end
+
+	def boolean_fields
+		s = []
+		self.keys.each {|k,v| s << k if v.type == Boolean}
+		s.compact
+	end
+
+	def searchable_fields
+		s = []
+		self.keys.each {|k,v| s << k if v.type == String}
+		s.compact
+	end
+
+	def subtypes
+		s = []
+		self.keys.each {|k,v| s << k if v.type.class == Array}
+		s.compact
+	end
+
+	def options_for_subtype(field)
+		self.keys[field].type
+	end
+
+	def relation_keys_include?(key)
+		self.associations.map {|rel| true if key.to_sym == rel[0]}.reduce
+	end
+
+end

data/lib/bowtie/admin.rb

@@ -1,8 +1,8 @@
 module Bowtie
 
-	class Admin < Sinatra::Base
+	PER_PAGE = 25
 
-		PER_PAGE = 25
+	class Admin < Sinatra::Base
 
 		use Rack::Auth::Basic do |username, password|
 			begin
@@ -25,7 +25,7 @@ module Bowtie
 
 		before do
 			@app_name = ENV['APP_NAME'] ? [self.class.name, ENV['APP_NAME']].join(' > ') : self.class.name
-			@models = DataMapper::Model.descendants.to_a
+			@models = Bowtie.models
 		end
 
 		get '/*.js|css|png|jpg' do
@@ -34,30 +34,22 @@ module Bowtie
 
 		get '/' do
 		  # redirect '' results in an endless redirect on the current version of sinatra/rack
-			redirect '/' + @models.first.pluralize
+			redirect '/' + @models.first.linkable
 		end
 
 		get '' do
-			redirect '/' + @models.first.pluralize
+			redirect '/' + @models.first.linkable
 		end
 
 		get '/search*' do
 			redirect('/' + params[:model] ||= '') if params[:q].blank?
-			query1, query2 = [], []
-			clean_params.each do |key, val|
-				query1 << "#{model}.all(:#{key} => '#{val}')"
-			end
-			model.searchable_fields.each do |field|
-				query2 << "#{model}.all(:#{field}.like => '%#{params[:q]}%')"
-			end
-			query = query1.any? ? [query1.join(' & '), query2.join(' + ')].join(' & ') : query2.join(' + ')
-			@resources = eval(query).page(params[:page], :per_page => PER_PAGE)
+			@resources = Bowtie.search(clean_params, params[:page])
 			@subtypes = model.subtypes
 			erb :index
 		end
 
 		get "/:model" do
-			@resources = model.all(clean_params).page(params[:page], :per_page => PER_PAGE)
+			@resources = Bowtie.get_many(model, clean_params, params[:page])
 			@subtypes = model.subtypes
 			erb :index
 		end
@@ -68,9 +60,9 @@ module Bowtie
 		end
 
 		post "/:model" do
-			@resource = model.create(params[:resource].prepare_for_query(model))
+			@resource = Bowtie.create(model, params[:resource].prepare_for_query(model))
 			if @resource.valid? and @resource.save
-				redirect "/#{model.pluralize}?notice=created"
+				redirect "/#{model.linkable}?notice=created"
 			else
 				erb :new
 			end
@@ -83,27 +75,32 @@ module Bowtie
 
 		get "/:model/:id/:association" do
 			@title = "#{params[:association].titleize} for #{model.to_s.titleize} ##{params[:id]}"
-			res = model.get(params[:id]).send(params[:association])
-			if res.respond_to?(:page)
-				@resources = res.page(params[:page], :per_page => PER_PAGE)
+			res = Bowtie.get_associated(model, params)
+
+			redirect('/' + model.linkable + '?error=doesnt+exist') if res.nil? or (res.is_a?(Array) and res.empty?)
+
+			if res.is_a?(Array)
+				@resources = Bowtie.add_paging(res, params[:page])
 				erb :index
 			else
-				redirect('/' + model.to_s + '?error=doesnt+exist') unless res
 				@resource = res
 				erb :show
 			end
+
 		end
 
 		put "/:model/:id" do
 			if request.xhr? # dont pass through hooks or put the boolean stuff
-				if resource.update!(params[:resource].filter_inaccessible_in(model).normalize)
+				# if Bowtie.update!(resource, params[:resource].normalize)
+				puts params[:resource].inspect
+				if Bowtie.update!(resource, 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")
+				if Bowtie.update(resource, params[:resource].prepare_for_query(model))
+					redirect("/#{model.linkable}/#{params[:id]}?notice=updated")
 				else
 					@resource = resource
 					erb :show
@@ -113,11 +110,12 @@ module Bowtie
 
 		delete "/:model/:id" do
 			if resource.destroy
-				redirect "/#{model.pluralize}?notice=destroyed"
+				redirect "/#{model.linkable}?notice=destroyed"
 			else
-				redirect "/#{model.pluralize}/#{params[:id]}?error=not+destroyed"
+				redirect "/#{model.linkable}/#{params[:id]}?error=not+destroyed"
 			end
 		end
+
 	end
 
 end

data/lib/bowtie/core_extensions.rb

@@ -14,39 +14,35 @@ class String
 
 end
 
-class Class
-
-	def pluralize
-		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
+module Subclasses
+	# return a list of the subclasses of a class
+	def subclasses(direct = false)
+		classes = []
+		if direct
+			ObjectSpace.each_object(Class) do |c|
+				next unless c.superclass == self
+				classes << c
+			end
+		else
+			ObjectSpace.each_object(Class) do |c|
+				next unless c.ancestors.include?(self) and (c != self)
+				classes << c
+			end
+		end
+		classes
 	end
+end
 
-	def searchable_fields
-		self.properties.map{|a| a.name if a.class == DataMapper::Property::String}.compact
-	end
+Object.send(:include, Subclasses)
 
-	def subtypes
-		begin
-			self.validators.first.last.map{|a,b| b = {a.field_name => a.options[:set]} if a.class == DataMapper::Validate::WithinValidator}.compact
-		rescue NoMethodError
-			# puts ' -- dm-validations gem not included. Cannot check subtypes for class.'
-			[]
-		end
-	end
+class Class
 
-	def options_for_subtype(field)
-		self.validators.first.last.map{|a| a.options[:set] if a.class == DataMapper::Validate::WithinValidator && a.field_name == field}.compact.reduce
+	def linkable
+		self.to_s.downcase.pluralize
 	end
 
-	def relation_keys_include?(property)
-		self.relationships.map {|rel| true if property.to_sym == rel[1].child_key.first.name}.reduce
+	def pluralize
+		 self.to_s.pluralize
 	end
 
 end
@@ -71,7 +67,7 @@ class Hash
 
 	# this is for checkboxes which give us a param of 'on' on the params hash
 	def normalize
-		replacements = { 'on' => true, '' => nil}
+		replacements = { 'on' => true, '' => nil, 'true' => true, 'false' => false}
 		normalized = {}
 		self.each_pair do |key,val|
 			normalized[key] = replacements.has_key?(val) ? replacements[val] : val

data/lib/bowtie/helpers.rb

@@ -38,7 +38,7 @@ module Bowtie
 		end
 
 		def resource
-			@resource ||= model.get(params[:id]) or halt(404, 'Resource not found!')
+			Bowtie.get_one(model, params[:id]) or halt(404, 'Resource not found!')
 		end
 
 		def current_model
@@ -56,14 +56,34 @@ module Bowtie
 			base_path + '/' + string.to_s.pluralize.downcase
 		end
 
-		def url_for(object)
-			model_path(object.class) + '/' + object.id.to_s
+		def url_for(resource)
+			model_path(resource.class) + '/' + resource.id.to_s
+		end
+
+		def link_to(string, resource)
+			uri = resource.nil? ? "#" : url_for(resource)
+			"<a href='#{uri}'>#{string}</a>"
 		end
 
 		def truncate(str, length)
 			str.to_s.length > length ? str.to_s[0..length] + '&hellip;' : str.to_s
 		end
 
+		def render_assoc_header(rel_name, assoc)
+			"<th title='#{assoc.class.name.to_s[/.*::(.*)$/, 1]}' class='rel-col #{rel_name}-col'>#{rel_name.to_s.titleize}</th>"
+		end
+		
+		def render_assoc_row(r, rel_name, assoc)
+			html = "<td class='rel-col #{rel_name.to_s}-col'>"
+			html += "<a href='#{model_path}/#{r.id}/#{rel_name.to_s}'>"
+			if Bowtie.has_one_association?(assoc) || Bowtie.belongs_to_association?(assoc)
+				html += (r.send(rel_name).nil? ? 'nil' : "View #{rel_name.to_s}")
+			else
+				html += r.send(rel_name).count.to_s
+			end
+			html += "</a></td>"
+		end
+
 	end
 
 end

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

@@ -86,14 +86,47 @@ h2 { margin:10px 0; font-size:130%;}
 	-moz-border-top-left-radius: 6px;
 }
 
-#header ul li a:hover { background:#333;}
-#header ul li.current a { background: #528e00; font-weight:bold; color:#fff;}
+#header ul li a:hover { 
+	background:#333;
+}
+
+#header ul li.current a { 
+	background: #528e00; 
+	font-weight:bold; 
+	color:#fff;
+}
+
+.subnav { 
+	padding: 2px 50px 7px 50px; 
+	background:#528e00; 
+	font-size:90%; 
+	margin: -20px -50px 20px; 
+}
 
-.subnav { padding: 2px 50px 7px 50px; background:#528e00; font-size:90%; margin: -20px -50px 20px; }
-.subnav li { display:inline;}
-.subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#89bf41; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
-.subnav li.current a { background:#fff; font-weight:bold; color:#528e00;}
-.subnav li a:active { background:#8def08;}
+.subnav li { 
+	display:inline;
+}
+
+.subnav li a { 
+	color:#fff; 
+	text-decoration:none; 
+	margin-right:10px; 
+	display:inline-block; 
+	background:#89bf41; 
+	padding:5px; 
+	-webkit-border-radius:3px; 
+	-moz-border-radius:3px;
+}
+
+.subnav li.current a { 
+	background: #fff; 
+	font-weight:bold; 
+	color:#528e00;
+}
+
+.subnav li a:active { 
+	background:#8def08;
+}
 
 /* container
 -------------------------------------------------------------*/
@@ -183,6 +216,12 @@ table .check-column{
 	text-align: center;
 }
 
+table .view-col,
+table .delete-col{
+	text-align: center;
+	width: 100px;
+}
+
 /* good states
 ---------------------------*/
 
@@ -227,12 +266,14 @@ table tr.suspended td{
 	background-color: #FFEFEF;
 }
 
-table th.rel{
+table th.rel-col{
 	background: #999;
 	color: #fff;
+	text-align: center;
 }
-table td.rel {
+table td.rel-col {
 	background: #eee;
+	text-align: center;
 }
 
 table .icon{

data/lib/bowtie/public/js/bowtie.js

@@ -24,7 +24,7 @@ var Bowtie = {
 
 	activateEditables: function(){
 
-		var current_path = location.href.split('#')[0];
+		var current_path = location.pathname;
 
 		$('table td.editable').editable(function(value, settings){
 

data/lib/bowtie/views/errors.erb

@@ -14,6 +14,6 @@ if @resource and @resource.errors.any? %>
 
 <% end
 
-rescue NoMethodError
+rescue NoMethodError => e
 	# dm-validations not included
 end %>

data/lib/bowtie/views/field.erb

@@ -1,9 +1,9 @@
 <%=
 
 	html =''
-	name = @p.name.to_s
+	name = @p
 	begin
-		value = @resource.send(@p.name)
+		value = @resource.send(@p)
 	rescue NoMethodError
 		value = ''
 	end
@@ -20,7 +20,7 @@
 			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.to_s+'" />'
+			html += '<input class="string" type="text" name="resource['+name.to_s+']" value="'+value.to_s+'" />'
 	end
 	html
 

data/lib/bowtie/views/form.erb

@@ -1,22 +1,23 @@
-<form class="resource" method="post" action="<%= model_path(@resource.model) %><%= '/' + @resource.id.to_s if @resource.id %>">
+<form class="resource" method="post" action="<%= model_path(@resource.class) %><%= '/' + @resource.id.to_s if @resource.id %>">
 <%= '<input type="hidden" name="_method" value="put">' if @resource.id %>
 
 <%= partial(:errors) %>
 
-<table>
-	<% @resource.model.properties.each do |p| %>
-	<% unless [:created_at, :id].include?(p.name) %>
-	<% @p = p %>
+	<table>
+
+	<!-- filter id and created at fields. association ids pass -->
+	<% @resource.class.field_names.each do |@p| %>
+	<% next if %w(id _id created_at _created_at _type).include?(@p.to_s) %>
 	<tr>
-		<td class="left-col"><%= p.name.to_s.titleize %> <small>(<%= p.class.name.to_s.gsub("DataMapper::Property::",'') || 'Enum' %>)</small></td>
+		<td class="left-col"><%= @p.to_s.titleize %> <small>(<%= @p.class.name.to_s.gsub("DataMapper::Property::",'') %>)</small></td>
 		<td class="right-col"><%= partial(:field) %></td>
 	</tr>
 	<% end %>
-	<% end %>
-</table>
 
-<p class="submit">
-	<input type="submit" value="Submit" />
-</p>
+	</table>
+
+	<p class="submit">
+		<input type="submit" value="Submit" />
+	</p>
 
 </form>

data/lib/bowtie/views/index.erb

@@ -3,15 +3,15 @@
 <%= partial(:search) %>
 <a class="edit-button" href="#" title="Enables in-place editing of editable fields" onclick="Bowtie.toggleEditableMode(this); return false;">Edit Mode OFF</a>
 
-<h1><%= @resources.pager.total %> <%= @title || @model.name.pluralize %> <a href="<%= model_path %>/new">(new)</a></h1>
+<h1><%= total_entries(@resources) %> <%= @title || @model.name.pluralize %> <a href="<%= model_path %>/new">(new)</a></h1>
 
 <% if @resources.any? %>
 
-	<%= @resources.pager.to_html(@env['REQUEST_URI']) if @resources.respond_to?(:pager) %>
+	<%= show_pager(@resources, request.path_info) %>
 
 	<%= partial(:table) %>
 
-	<%= @resources.pager.to_html(@env['REQUEST_URI']) if @resources.respond_to?(:pager) %>
+	<%= show_pager(@resources, request.path_info) %>
 
 <% else %>
 

data/lib/bowtie/views/row.erb

@@ -1,25 +1,24 @@
-<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 %>
-	<td class="<%= a[0] %>-col editable"><%= truncate(a[1], 64) || 'nil' %></td>
+<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>
 	<% end %>
+
 	<% unless params[:association] %>
-	<% @model.relationships.each do |rel| %>
-		<% unless rel[1].class.name =~ /ManyTo/ %>
-		<td class="rel <%= rel[0].to_s %>-col">
-			<a href="<%= model_path %>/<%= @r.id %>/<%= rel[0].to_s %>">
-				<%= rel[1].class.name =~ /OneToOne/ ? "View" : @r.send(rel[0]).count %>
-			</a>
-		</td>
-		<% end %>
+	<% @model.model_associations.each do |rel_name, assoc| %>
+		<%= render_assoc_row(@r, rel_name, assoc) %>
 	<% end %>
 	<% end %>
-	<td><a href="<%= url_for(@r) %>">View</a></td>
-	<td>
-	<form class="destroy" method="post" action="<%= model_path(@r.model) %>/<%= @r.id %>" onsubmit="return confirm('Are you sure?');">
+
+	<td class="view-col"><a href="<%= url_for(@r) %>">View</a></td>
+
+	<td class="delete-col">
+	<form class="destroy" method="post" action="<%= model_path(@r.class) %>/<%= @r.id %>" onsubmit="return confirm('Are you sure?');">
 		<input type="hidden" name="_method" value="delete" />
 		<button type="submit">Destroy</button>
 	</form>
 	</td>
+
 </tr>

data/lib/bowtie/views/search.erb

@@ -1,8 +1,8 @@
 	<% model = params[:model] %>
 	<form id="search" action="<%= base_path %>/search" method="get">
 		<% params.each do |k, v| %>
-		<% next if ['splat', 'q', 'page'].include?(k) or v.blank? %>
+		<% next if ['splat', 'q', 'page'].include?(k) or v == '' %>
 			<input type="hidden" name="<%= k %>" value="<%= v %>" />
 		<% end %>
-		<input type="text" name="q"  value="Find <%= model %>:" onfocus="if(this.value=='Find <%= model %>:')this.value='';" onblur="if(this.value=='')this.value='Find <%= model %>:';"/>
+		<input type="text" name="q"  value="<%= params[:q] || 'Find ' + model + ':' %>" onfocus="if(this.value=='Find <%= model %>:')this.value='';" onblur="if(this.value=='')this.value='Find <%= model %>:';"/>
 	</form>

data/lib/bowtie/views/show.erb

@@ -1,6 +1,6 @@
 <h1><%= @title || @model.name + ':' + @resource.id.to_s %></h1>
 
-<form class="big destroy" method="post" action="<%= model_path(@resource.model) %>/<%= @resource.id %>" onsubmit="return confirm('Are you sure?');">
+<form class="big destroy" method="post" action="<%= model_path(@resource.class) %>/<%= @resource.id %>" onsubmit="return confirm('Are you sure?');">
 	<input type="hidden" name="_method" value="delete" />
 	<button type="submit">Destroy</button>
 </form>

data/lib/bowtie/views/table.erb

@@ -1,25 +1,28 @@
 	<table class="sortable">
 		<thead>
 			<tr>
-			<th title="<%= @model.key.first.type.to_s %>" class="<%= @model.key.first.name.to_s %>-col"><%= @model.key.first.name.to_s.upcase %></th>
-		<% @resources.first.attributes.each do |p| %>
-			<% next if p[0] == @model.key.first.name %>
-			<th title="<%= p[1].class.to_s %>" class="<%= p[0].to_s %>-col"><%= p[0].to_s.titleize %></th>
-		<% end %>
-		<% unless params[:association] %>
-		<% @resources.first.class.relationships.each do |rel| %>
-			<% unless rel[1].class.name =~ /ManyTo/ %>
-			<th title="<%= rel[1].class.name.to_s.gsub('DataMapper::Associations::','') %>" class="rel <%= rel[0].to_s %>-col"><%= rel[0].to_s.titleize %></th>
+			<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>
 			<% end %>
-		<% end %>
-		<% end %>
-			<th class="actions" colspan="3">&nbsp;</th>
+
+			<% unless params[:association] %>
+			<% @resources.first.class.model_associations.each do |rel_name, assoc| %>
+				<%= render_assoc_header(rel_name, assoc) %>
+			<% end %>
+			<% end %>
+
+			<th class="actions" colspan="2">&nbsp;</th>
 			</tr>
 		</thead>
+
 		<tbody>
-		<% @resources.each do |r| %>
-			<% @r = r %>
+		<% @resources.each do |@r| %>
 			<%= partial(:row) %>
 		<% end %>
 		</tbody>
+
 	</table>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -34,55 +33,7 @@ dependencies:
         version: 0.9.4
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-pager
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
-  version_requirements: *id004
-description: Admin scaffold for DataMapper models, on Sinatra.
+description: Simple admin scaffold for MongoMapper and DataMapper models.
 email: tomas@forkhq.com
 executables: []
 
@@ -94,9 +45,11 @@ extra_rdoc_files:
 - lib/bowtie/core_extensions.rb
 - lib/bowtie/helpers.rb
 files: 
-- README.rdoc
+- README.md
 - bowtie.gemspec
 - lib/bowtie.rb
+- lib/bowtie/adapters/datamapper.rb
+- lib/bowtie/adapters/mongomapper.rb
 - lib/bowtie/admin.rb
 - lib/bowtie/core_extensions.rb
 - lib/bowtie/helpers.rb
@@ -155,6 +108,6 @@ rubyforge_project: bowtie
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Bowtie Admin
+summary: Bowtie Admin Scaffold
 test_files: []
 

data/README.rdoc

@@ -1,48 +0,0 @@
-= Bowtie for Sinatra.
-
-Zeroconf admin generator for DataMapper models, written in Sinatra.
-
-= What it does
-
-Reads the information on your models and creates a nice panel in which you can view, edit and destroy records easily.
-
-= Installation
-
-  $ sudo gem install bowtie
-
-= Important
-
-From version 0.3, Bowtie is meant to be used from DataMapper 1.0.0 on. For previous versions please install with -v=0.2.5.
-
-= Configuration
-
-Mount Bowtie wherever you want by editing your config.ru file, optionally including the admin/pass combination for the panel.
-
-  require 'myapp'
-  require 'bowtie'
-
-  BOWTIE_AUTH = {:user => 'admin', :pass => '12345' }
-
-  app = Rack::Builder.new {
-    map "/admin" do
-      run Bowtie::Admin
-    end
-
-    map '/' do
-      run MyApp
-    end
-  }
-
-  run app
-
-Now you can go to /admin in your app's path and try out Bowtie using your user/pass combination. If not set, it defaults to admin/bowtie.
-
-= TODO
-
- * Better handling of types (Text, JSON, IPAddress) in #show
- * Better handling of relationships in #show
-
-= Copyright
-
-(c) 2010 - Tomás Pollak for Fork Ltd.
-Released under the MIT license.