bowtie 0.5.7 → 0.5.8

data/bowtie.gemspec

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

data/lib/bowtie/adapters/datamapper.rb

@@ -135,22 +135,12 @@ module DataMapper::Resource
 		send(self.class.primary_key)
 	end
 
-	def to_json
-		attributes.to_json
-	end
-
-end
-
-if Bowtie.models.empty? # models not loaded yet
+	unless defined?(:to_json)
 
-	class Class # need to figure out how to extend *only* DM models
-		include Bowtie::ClassMethods
-	end
-
-else
+		def to_json
+			attributes.to_json
+		end
 
-	Bowtie.models.each do |mod|
-		mod.extend Bowtie::ClassMethods
 	end
 
 end

data/lib/bowtie/adapters/mongomapper.rb

@@ -128,21 +128,3 @@ module MongoMapper::Document
 	end
 
 end
-
-if Bowtie.models.empty? # models not loaded yet
-
-	module MongoMapper::Document
-
-		included do
-			extend Bowtie::ClassMethods
-		end
-
-	end
-
-else
-
-	Bowtie.models.each do |mod|
-		mod.extend Bowtie::ClassMethods
-	end
-
-end

data/lib/bowtie/admin.rb

@@ -74,10 +74,12 @@ module Bowtie
 
 			if res.is_a?(Array)
 				@model = res.first.class
+				@model.extend(ClassMethods) unless @model.respond_to?(:model_associations)
 				@resources = Bowtie.add_paging(res, params[:page])
 				erb :index
 			else
 				@model = res.class
+				@model.extend(ClassMethods) unless @model.respond_to?(:model_associations)
 				@resource = res
 				erb :show
 			end

data/lib/bowtie/helpers.rb

@@ -11,7 +11,7 @@ module Bowtie
 		end
 
 		def action_name
-			current_model.pluralize
+			model.pluralize
 		end
 
 		def base_path
@@ -30,7 +30,7 @@ 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
@@ -52,17 +52,15 @@ module Bowtie
 		end
 
 		def get_model_class(mod = params[:model])
-			mappings[mod] or halt(404, "Model not found.")
+			m = mappings[mod] or halt(404, "Model not found.")
+			m.extend(ClassMethods) unless m.respond_to?(:model_associations)
+			m
 		end
 
 		def model
 			@model ||= get_model_class
 		end
 
-		def current_model
-			model
-		end
-
 		def resource
 			Bowtie.get_one(model, params[:id]) or halt(404, 'Resource not found!')
 		end
@@ -73,7 +71,7 @@ module Bowtie
 			erb(name, {:layout => false}, *args)
 		end
 
-		def model_path(m = current_model)
+		def model_path(m = model)
 			string = m.name ||= m
 			linkable_path(string.to_s.pluralize.downcase)
 		end

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

@@ -11,6 +11,11 @@ var Bowtie = {
 			$('table td.editable').data('disabled.editable', true);
 			html = 'Edit Mode OFF';
 
+			$('table td.editable').each(function(i, e){
+				if($(e).html() == '<em>(edit)</em>')
+					$(e).html('');
+			})
+
 		} else {
 
 			if ($('table td.editable').data('disabled.editable'))

data/lib/bowtie/views/errors.erb

@@ -4,7 +4,7 @@
 
 	<ul>
 	<% @resource.errors.each do |key, message| %>
-		<li><strong><%= key %></strong> <%= ":#{message}" if message %></li>
+		<li><strong><%= key %></strong><%= ": #{message}" if message %></li>
 	<% end %>
 	</ul>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 -04:00
-default_executable: 
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -70,7 +69,6 @@ files:
 - lib/bowtie/public/js/bowtie.js
 - lib/bowtie/public/js/jquery.tablesorter.pack.js
 - lib/bowtie/public/js/jquery.jeditable.pack.js
-has_rdoc: true
 homepage: http://github.com/tomas/bowtie
 licenses: []
 
@@ -106,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bowtie
-rubygems_version: 1.5.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: MongoMapper & DataMapper admin interface