bowtie 0.5.1 → 0.5.2

data/README.md

@@ -22,14 +22,14 @@ Or install it by hand:
 
 ## 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.
+### Sinatra
+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'}
-
     map "/admin" do
+      BOWTIE_AUTH = {:user => 'admin', :pass => '12345'}
       run Bowtie::Admin
     end
 
@@ -37,12 +37,33 @@ Mount Bowtie wherever you want by editing your config.ru file, after loading you
       run MyApp
     end
 
+### Rails 3
+Mount Bowtie in your `config/routes.rb` file with the new Rails 3 mount function. You can also optionally include the admin/pass combination for the panel.
+
+    Rails::Application.routes.draw.do
+        # your other routes
+        BOWTIE_AUTH = {:user => 'admin', :pass => '12345'}
+        mount Bowtie::Admin, :at => '/admin'
+    end
+
+Additionally you need to make sure that all models have been loaded because Rails only models them on demand and Bowtie only sees loaded models. Paste this into a new initializer `config/initializers/bowtie.rb`
+
+    Dir[Rails.root + 'app/models/**/*.rb'].each do |path|
+        require path
+    end
+
+### Try it out!
 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 MongoMapper models:
+ 
+ * mongo_mapper
+ * bson_ext (not required, but recommended)
+
 For DataMapper models: 
 
  * dm-core
@@ -50,13 +71,8 @@ For DataMapper models:
  * dm-aggregates
  * dm-pager
 
-For MongoMapper models:
- 
- * mongo_mapper
- * bson_ext (not required, but recommended)
-
-From version 0.3, Bowtie is meant to be used from DataMapper 1.0.0 on. For previous versions of DM please install with -v=0.2.5.
+Note: From version 0.3, Bowtie is meant to be used from DataMapper 1.0.0 on. For previous versions of DM please install with -v=0.2.5.
 
 ## Copyright
 
-(c) 2010-2011 - Tomás Pollak for Fork Ltd. Released under the MIT license.
+(c) 2010-2012 - Tomás Pollak for Fork Ltd. Released under the MIT license.

data/bowtie.gemspec

@@ -1,48 +1,48 @@
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.5.1"
+  s.version = "0.5.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{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", 
+  s.date = %q{2012-04-16}
+  s.description = %q{Simple admin scaffold for MongoMapper and DataMapper models.}
+  s.rubyforge_project = %q{bowtie}
+  s.summary = %q{MongoMapper & DataMapper admin interface}
+  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", 
+  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/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 Scaffold}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/bowtie/admin.rb

@@ -6,11 +6,9 @@ module Bowtie
 
 		use Rack::Auth::Basic do |username, password|
 			begin
-				user = ::BOWTIE_AUTH[:user]
-				pass = ::BOWTIE_AUTH[:pass]
+				user, pass = ::BOWTIE_AUTH[:user], ::BOWTIE_AUTH[:pass]
 			rescue NameError
-				user = 'admin'
-				pass = 'bowtie'
+				user, pass = 'admin', 'bowtie'
 			end
 			username == user && password == pass
 		end
@@ -18,28 +16,22 @@ module Bowtie
 		use Rack::MethodOverride
 
 		set :views, File.dirname(__FILE__) + '/views'
-		set :absolute_redirects, false # otherwise Sinatra appends the domain name to the redirect
 
 		helpers do
 			include Helpers
 		end
 
-		before do
-			@app_name = ENV['APP_NAME'] ? [self.class.name, ENV['APP_NAME']].join(' > ') : self.class.name
-			@models = Bowtie.models
-		end
-
 		get '/*.js|css|png|jpg|ico' do
 			deliver_file or status 404
 		end
 
 		get '/' do
 			# redirect '' results in an endless redirect on the current version of sinatra/rack
-			redirect '/' + @models.first.linkable
+			redirect '/' + mappings.keys.first
 		end
 
 		get '' do
-			redirect '/' + @models.first.linkable
+			redirect '/' + mappings.keys.first
 		end
 
 		get '/search*' do
@@ -79,7 +71,7 @@ module Bowtie
 			res = Bowtie.get_associated(model, params)
 
 			@model = get_model_class(params[:association])
-			redirect referer + '?error=doesnt+exist' if res.nil? or (res.is_a?(Array) and res.empty?)
+			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])

data/lib/bowtie/helpers.rb

@@ -2,6 +2,18 @@ module Bowtie
 
 	module Helpers
 
+		def app_name
+			defined?(APP_NAME) ? APP_NAME : ENV['APP_NAME'] || "Bowtie::#{adapter_name}"
+		end
+
+		def adapter_name
+			defined?(DataMapper) ? "DataMapper" : "MongoMapper"
+		end
+
+		def action_name
+			current_model.pluralize
+		end
+
 		def base_path
 			env['SCRIPT_NAME']
 		end
@@ -18,10 +30,6 @@ module Bowtie
 		def redirect(uri, *args)
 			super base_path + uri.downcase, *args
 		end
-		
-		def referer
-			URI.parse(@env['HTTP_REFERER']).path.sub("#{base_path}", '')
-		end
 
 		def clean_params
 			@env['rack.request.query_hash'].delete_if{|a,b| %w(model page notice error q).include?(a) }
@@ -29,26 +37,32 @@ module Bowtie
 
 		# models, resources
 
+		def mappings
+			@mappings ||= get_mappings
+		end
+
+		def get_mappings
+			mappings = {}
+			Bowtie.models.collect{|m| mappings[m.linkable] = m }
+			mappings
+		end
+
 		def get_model_class(mod = params[:model])
-			begin
-				Kernel.const_get(mod.singularize.capitalize)
-			rescue NameError
-				halt 404, "Model not found!"
-			end
+			mappings[mod] or halt(404, "Model not found.")
 		end
 
 		def model
 			@model ||= get_model_class
 		end
 
-		def resource
-			Bowtie.get_one(model, params[:id]) or halt(404, 'Resource not found!')
-		end
-
 		def current_model
 			model
 		end
 
+		def resource
+			Bowtie.get_one(model, params[:id]) or halt(404, 'Resource not found!')
+		end
+
 		# views, paths
 
 		def partial(name, *args)
@@ -57,7 +71,11 @@ module Bowtie
 
 		def model_path(m = current_model)
 			string = m.name ||= m
-			base_path + '/' + string.to_s.pluralize.downcase
+			linkable_path(string.to_s.pluralize.downcase)
+		end
+
+		def linkable_path(linkable)
+			base_path + '/' + linkable
 		end
 
 		def url_for(resource)

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

@@ -287,21 +287,6 @@ table tr:hover td{
 	background: #ffffed;
 }
 
-
-/* show resource
--------------------------------------------------------------*/
-
-#assocs{
-	float: right;
-	font-size: 1.2em;
-	border: 1px solid #333;
-	padding: 5px 10px;
-	margin-top: 15px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	background-color: #fafafa;
-}
-
 /* forms
 -------------------------------------------------------------*/
 

data/lib/bowtie/views/errors.erb

@@ -3,8 +3,8 @@
 <div class="errorlist">
 
 	<ul>
-	<% @resource.errors.each do |message| %>
-		<li><%= message %></li>
+	<% @resource.errors.each do |key, message| %>
+		<li><strong><%= key %></strong> <%= ":#{message}" if message %></li>
 	<% end %>
 	</ul>
 

data/lib/bowtie/views/layout.erb

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head profile="http://gmpg.org/xfn/11">
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<title><%= @app_name %></title>
+	<title><%= action_name %> - <%= app_name %></title>
 	<link rel="stylesheet" href="<%= base_path %>/css/bowtie.css" type="text/css" media="screen" charset="utf-8" />
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 	<script type="text/javascript" src="<%= base_path %>/js/jquery.jeditable.pack.js"></script>
@@ -18,12 +18,12 @@
 <div id="header">
 
 	<h1>
-		<a href="<%= base_path %>"><%= @app_name %></a>
+		<a href="<%= base_path %>"><%= app_name %></a>
 	</h1>
 
 	<ul class="nav">
-	<% @models.each do |m| %>
-	<li class="<%= 'current' if @model && @model == m %>"><a href="<%= model_path(m) %>"><%= m.pluralize %></a></li>
+	<% mappings.each do |linkable, model| %>
+	<li class="<%= 'current' if @model && @model == model %>"><a href="<%= linkable_path(linkable) %>"><%= model.pluralize %></a></li>
 	<% end %>
 	</ul>
 

data/lib/bowtie/views/show.erb

@@ -1,13 +1,3 @@
-
-<div id="assocs">
-
-<% @model.model_associations.each do |rel_name, assoc| %>
-	<%= rel_name %>: <strong><%= render_assoc_row(@resource, rel_name, assoc) %></strong>
-<% end %>
-
-</div><!-- /assocs -->
-
-
 <h1><%= @title || @model.name + ':' + @resource.id.to_s %></h1>
 
 <form class="big destroy" method="post" action="<%= model_path(@resource.class) %>/<%= @resource.id %>" onsubmit="return confirm('Are you sure?');">

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -104,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bowtie
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Bowtie Admin Scaffold
+summary: MongoMapper & DataMapper admin interface
 test_files: []