bowtie 0.5.2 → 0.5.4

data/bowtie.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.5.2"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomás Pollak"]
   s.email = %q{tomas@forkhq.com}
-  s.date = %q{2012-04-16}
+  s.date = %q{2012-04-18}
   s.description = %q{Simple admin scaffold for MongoMapper and DataMapper models.}
   s.rubyforge_project = %q{bowtie}
   s.summary = %q{MongoMapper & DataMapper admin interface}

data/lib/bowtie/adapters/datamapper.rb

@@ -22,6 +22,8 @@ module Bowtie
 
 	def self.create(model, params)
 		model.create(params)
+	rescue DataObjects::IntegrityError
+		model.new(params)
 	end
 
 	def self.get_associated(model, params)
@@ -71,69 +73,74 @@ module Bowtie
 		end
 
 		def show_pager(resources, path)
-			resources.pager.to_html(base_path + path) if resources.respond_to?(:pager)
+			q = request.path["/search"] ? "?model=#{params[:model]}&q=#{params[:q]}" : ""
+			s = resources.pager.to_html(base_path + path + q) if resources.respond_to?(:pager)
 		end
 
 	end
 
-end
+	module ClassMethods
 
-class Object
+		def primary_key
+			key.first.name
+		end
 
-	def primary_key
-		send(self.class.primary_key)
-	end
+		def model_associations
+			return [] if relationships.nil? or relationships.empty?
+			if relationships.first.is_a?(Array)
+				return relationships
+			else
+				h = {}
+				relationships.map {|r| h[r.name] = r }
+				return h
+			end
+		end
 
-	def to_json
-		attributes.to_json
-	end
+		def field_names
+			self.properties.collect{|p| p.name }
+		end
 
-end
+		def boolean_fields
+			self.properties.map{|a| a.name if a.class == DataMapper::Property::Boolean}.compact
+		end
 
-class Class
+		def searchable_fields
+			self.properties.map{|a| a.name if a.class == DataMapper::Property::String}.compact
+		end
 
-	def primary_key
-		key.first.name
-	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 model_associations
-		return [] if relationships.nil? or relationships.empty?
-		if relationships.first.is_a?(Array)
-			return relationships
-		else
-			h = {}
-			relationships.map {|r| h[r.name] = r }
-			return h
+		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
-	end
 
-	def field_names
-		self.properties.collect{|p| p.name }
-	end
+		def relation_keys_include?(property)
+			self.relationships.map {|rel| true if property.to_sym == rel[1].child_key.first.name}.reduce
+		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
+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
+module DataMapper::Resource
 
-	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 primary_key
+		send(self.class.primary_key)
 	end
 
-	def relation_keys_include?(property)
-		self.relationships.map {|rel| true if property.to_sym == rel[1].child_key.first.name}.reduce
+	def to_json
+		attributes.to_json
 	end
 
 end
+
+Bowtie.models.each do |mod|
+	mod.extend Bowtie::ClassMethods
+end

data/lib/bowtie/adapters/mongomapper.rb

@@ -9,7 +9,7 @@ module Bowtie
 	def self.search(model, q, page)
 		res = []
 		model.searchable_fields.each do |field|
-			res = res + model.all(field.to_sym => /#{q}/i)
+			res = res + add_paging(model.where(field.to_sym => /#{q}/i), page).all
 		end
 		res.uniq
 	end
@@ -62,8 +62,9 @@ module Bowtie
 		end
 
 		def get_page(counter)
+			str = request.path["/search"] ? "&model=#{params[:model]}&q=#{params[:q]}" : ""
 			i = (params[:page].to_i || 0) + counter
-			i == 0 ? '' : "?page=#{i}"
+			i == 0 ? str : "?page=#{i}#{str}"
 		end
 
 		def show_pager(resources, path)
@@ -76,54 +77,58 @@ module Bowtie
 
 	end
 
-end
+	module ClassMethods
 
-class Object
+		def primary_key
+			'id'
+		end
 
-	def primary_key
-		send(self.class.primary_key)
-	end
+		def model_associations
+			associations
+		end
 
-end
+		def field_names
+			self.keys.keys.collect { |f| f.to_sym }
+		end
 
-class Class
+		def boolean_fields
+			s = []
+			self.keys.each {|k,v| s << k if v.type == Boolean}
+			s.compact
+		end
 
-	def primary_key
-		'id'
-	end
+		def searchable_fields
+			s = []
+			self.keys.each {|k,v| s << k if v.type == String && k != "_type"}
+			s.compact
+		end
 
-	def model_associations
-		associations
-	end
+		def subtypes
+			s = []
+			self.keys.each {|k,v| s << k if v.type.class == Array}
+			s.compact
+		end
 
-	def field_names
-		self.keys.keys.collect { |f| f.to_sym }
-	end
+		def options_for_subtype(field)
+			self.keys[field].type
+		end
 
-	def boolean_fields
-		s = []
-		self.keys.each {|k,v| s << k if v.type == Boolean}
-		s.compact
-	end
+		def relation_keys_include?(key)
+			self.associations.map {|rel| true if key.to_sym == rel[0]}.reduce
+		end
 
-	def searchable_fields
-		s = []
-		self.keys.each {|k,v| s << k if v.type == String && k != "_type"}
-		s.compact
 	end
 
-	def subtypes
-		s = []
-		self.keys.each {|k,v| s << k if v.type.class == Array}
-		s.compact
-	end
+end
 
-	def options_for_subtype(field)
-		self.keys[field].type
-	end
+module MongoMapper::Document
 
-	def relation_keys_include?(key)
-		self.associations.map {|rel| true if key.to_sym == rel[0]}.reduce
+	def primary_key
+		send(self.class.primary_key)
 	end
 
 end
+
+Bowtie.models.each do |mod|
+	mod.extend Bowtie::ClassMethods
+end

data/lib/bowtie/admin.rb

@@ -71,7 +71,7 @@ module Bowtie
 			res = Bowtie.get_associated(model, params)
 
 			@model = get_model_class(params[:association])
-			redirect('/' + model.linkable + '?error=doesnt+exist') if res.nil? or (res.is_a?(Array) and res.empty?)
+			redirect referer + '?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/core_extensions.rb

@@ -1,7 +1,15 @@
 # if we have active support, lets use it
 # otherwise add the few needed methods to avoid loading it
 
-unless defined?(ActiveSupport::Inflector)
+begin
+
+	require 'active_support/inflections'
+
+	class String
+		include ActiveSupport::Inflections
+	end
+
+rescue
 
 	class String
 
@@ -9,10 +17,6 @@ unless defined?(ActiveSupport::Inflector)
 			self.capitalize.gsub('_',' ')
 		end
 
-		def singularize
-			self.gsub(/ies/,'y').gsub(/s$/, '')
-		end
-
 		def pluralize
 			self.gsub(/y$/,'ie') + "s"
 		end
@@ -49,7 +53,7 @@ class Class
 	end
 
 	def pluralize
-		 self.to_s.pluralize
+		self.to_s.pluralize
 	end
 
 end

data/lib/bowtie/helpers.rb

@@ -30,6 +30,10 @@ 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) }

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

@@ -287,6 +287,21 @@ 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/index.erb

@@ -3,7 +3,7 @@
 <%= 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><%= total_entries(@resources) %> <%= @title || @model.name.pluralize %> <a href="<%= model_path %>/new">(new)</a></h1>
+<h1><%= total_entries(@resources) %> <%= @title || @model.name.pluralize %> <%= "containing '#{params[:q]}'" if params[:q] %> <a href="<%= model_path %>/new">(new)</a></h1>
 
 <% if @resources.any? %>
 

data/lib/bowtie/views/show.erb

@@ -1,3 +1,13 @@
+
+<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: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-04-18 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -69,6 +70,7 @@ 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: []
 
@@ -104,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bowtie
-rubygems_version: 1.8.21
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: MongoMapper & DataMapper admin interface