bowtie 0.4.6 → 0.4.7

data/bowtie.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   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

@@ -4,27 +4,22 @@ module Bowtie
 		DataMapper::Model.descendants.to_a
 	end
 
-	def self.search(params, page)
-		query1, query2 = [], []
-		params.each do |key, val|
-			query1 << "#{model}.all(:#{key} => '#{val}')"
-		end
+	def self.search(model, q, page)
+		query = {}
 		model.searchable_fields.each do |field|
-			query2 << "#{model}.all(:#{field}.like => '%#{params[:q]}%')"
+			query[field.like] = "%#{q}%"
 		end
-		query = query1.any? ? [query1.join(' & '), query2.join(' + ')].join(' & ') : query2.join(' + ')
-		@resources = eval(query).page(page, :per_page => PER_PAGE)
-		@subtypes = model.subtypes
+		model.all(query).page(page, :per_page => PER_PAGE)
 	end
 
 	def self.get_many(model, params, page)
 		add_paging(model.all(params), page)
 	end
-	
+
 	def self.get_one(model, id)
-		model.get(id) 
+		model.get(id)
 	end
-	
+
 	def self.create(model, params)
 		model.create(params)
 	end
@@ -35,7 +30,7 @@ module Bowtie
 		# 	add_paging(res, params)
 		# end
 	end
-	
+
 	# doesnt trigger validations or callbacks
 	def self.update!(resource, params)
 		resource.update!(params)
@@ -48,7 +43,7 @@ module Bowtie
 	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
@@ -57,13 +52,13 @@ module Bowtie
 		assoc.class == DataMapper::Associations::OneToOne::Relationship
 	end
 
-	# i have to say this: datamapper sucks. when calling record.association.count 
+	# i have to say this: datamapper sucks. when calling record.association.count
 	# it actually fetches all the records, builds an array and then calls count on
 	# that array.
 	def self.get_count(record, association)
 		association_key = "#{record.class.name.downcase}_#{record.class.primary_key}"
 		begin
-			repository.adapter.select("select count(*) from #{association} where #{association_key} = ?", record.primary_key) 
+			repository.adapter.select("select count(*) from #{association} where #{association_key} = ?", record.primary_key)
 		rescue DataObjects::SQLError => e # probably has_many :through => association
 			''
 		end
@@ -74,11 +69,11 @@ module Bowtie
 		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

data/lib/bowtie/adapters/mongomapper.rb

@@ -6,9 +6,12 @@ module Bowtie
 #		models
 	end
 
-	def self.search(params, page)
-		puts "Search not implemented yet in MongoMapper!"
-		return []
+	def self.search(model, q, page)
+		res = []
+		model.searchable_fields.each do |field|
+			res = res + model.all(field.to_sym => /#{q}/i)
+		end
+		res.uniq
 	end
 
 	def self.get_many(model, params, page)
@@ -16,7 +19,7 @@ module Bowtie
 	end
 
 	def self.get_one(model, id)
-		model.find(id) 
+		model.find(id)
 	end
 
 	def self.create(model, params)
@@ -43,7 +46,7 @@ module Bowtie
 	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
@@ -105,7 +108,7 @@ class Class
 
 	def searchable_fields
 		s = []
-		self.keys.each {|k,v| s << k if v.type == String}
+		self.keys.each {|k,v| s << k if v.type == String && k != "_type"}
 		s.compact
 	end
 

data/lib/bowtie/admin.rb

@@ -28,7 +28,7 @@ module Bowtie
 			@models = Bowtie.models
 		end
 
-		get '/*.js|css|png|jpg' do
+		get '/*.js|css|png|jpg|ico' do
 			deliver_file or status 404
 		end
 
@@ -42,8 +42,8 @@ module Bowtie
 		end
 
 		get '/search*' do
-			redirect('/' + params[:model] ||= '') if params[:q].blank?
-			@resources = Bowtie.search(clean_params, params[:page])
+			redirect('/' + params[:model] ||= '') if params[:q].nil? or params[:q].empty?
+			@resources = Bowtie.search(model, params[:q], params[:page])
 			@subtypes = model.subtypes
 			erb :index
 		end
@@ -77,6 +77,7 @@ module Bowtie
 			@title = "#{params[:association].titleize} for #{model.to_s.titleize} ##{params[:id]}"
 			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?)
 
 			if res.is_a?(Array)

data/lib/bowtie/helpers.rb

@@ -9,10 +9,10 @@ module Bowtie
 		# requests, redirects
 
 		def deliver_file
-			file = File.expand_path(File.dirname(__FILE__)) + "/public/#{@env['PATH_INFO']}"
-			return false unless File.exist?(file)
-			content_type(Rack::Mime::MIME_TYPES[File.extname(file)], :charset => 'utf-8')
-			File.read(file)
+			path = File.expand_path(File.dirname(__FILE__)) + "/public#{@env['PATH_INFO']}"
+			return false unless File.exist?(path)
+			content_type(Rack::Mime::MIME_TYPES[File.extname(path)], :charset => 'utf-8')
+			File.read(path)
 		end
 
 		def redirect(uri, *args)
@@ -20,14 +20,14 @@ module Bowtie
 		end
 
 		def clean_params
-				@env['rack.request.query_hash'].delete_if{|a,b| %w(model page notice error q).include?(a) }
+			@env['rack.request.query_hash'].delete_if{|a,b| %w(model page notice error q).include?(a) }
 		end
 
 		# models, resources
 
-		def get_model_class
+		def get_model_class(mod = params[:model])
 			begin
-				Kernel.const_get(params[:model].singularize.capitalize)
+				Kernel.const_get(mod.singularize.capitalize)
 			rescue NameError
 				halt 404, "Model not found!"
 			end
@@ -72,7 +72,7 @@ module Bowtie
 		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}'>"

data/lib/bowtie/views/errors.erb

@@ -1,6 +1,4 @@
-<% begin
-
-if @resource and @resource.errors.any? %>
+<% if @resource and @resource.errors.any? %>
 
 <div class="errorlist">
 
@@ -12,8 +10,4 @@ if @resource and @resource.errors.any? %>
 
 </div>
 
-<% end
-
-rescue NoMethodError => e
-	# dm-validations not included
-end %>
+<% end %>

data/lib/bowtie/views/layout.erb

@@ -8,7 +8,6 @@
 	<script type="text/javascript" src="<%= base_path %>/js/jquery.jeditable.pack.js"></script>
 	<script type="text/javascript" src="<%= base_path %>/js/jquery.tablesorter.pack.js"></script>
 	<script type="text/javascript" src="<%= base_path %>/js/bowtie.js">
-
 	</script>
 </head>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"