merb-words 0.3.3 → 0.4

data/Rakefile

@@ -6,7 +6,7 @@ require 'merb-core/tasks/merb'
 spec = Gem::Specification.new do |s|
   s.add_dependency('merb-slices', '~> 1.0.0')
   s.add_dependency('merb_datamapper', '~> 1.0.0')
-  s.add_dependency('merb-ui', '>= 0.3')
+  s.add_dependency('merb-ui', '>= 0.4')
   s.author = 'UiPoet'
   s.email = 'dont.tase@me.com'
   s.files = FileList['app/**/*', 'lib/**/*', '[A-Z]*'].to_a
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
   s.name = 'merb-words'
   s.rubyforge_project = 'uipoet'
   s.summary = 'Word Management for Merb'
-  s.version = '0.3.3'
+  s.version = '0.4'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/controllers/pages.rb

@@ -16,15 +16,15 @@ class MerbWords::Pages < MerbWords::Application
       else
         filters[:order] = [@order_property.intern.desc]
       end
-      if search = params[:search] and !search.blank?
-        search = CGI.escape(search).to_a
-        if searches = session[:mui_searches]
-          session[:mui_searches] = searches | search
+      if params[:q]
+        query = CGI.escape(params[:q])
+        if queries = session[:merb_words_queries]
+          session[:merb_words_queries] = queries | query.to_a
         else
-          session[:mui_searches] = search
+          session[:merb_words_queries] = query.to_a
         end
-        pages_title = Page.all(:title.like => "%#{search}%")
-        pages_body = Page.all(:body.like => "%#{search}%")
+        pages_title = Page.all(:title.like => "%#{query}%")
+        pages_body = Page.all(:body.like => "%#{query}%")
         @pages = pages_title | pages_body
       elsif @category_id = params[:category_id]
         @pages = Category.get!(@category_id).pages(filters)
@@ -103,9 +103,13 @@ class MerbWords::Pages < MerbWords::Application
     redirect(slice_url(:index))
   end
 
-  def search_delete
-    session[:mui_searches] = session[:mui_searches] - params[:search].to_a
-    redirect(slice_url(:index))
+  def query_delete
+    if(session[:merb_words_queries] and params[:query])
+      queries = session[:merb_words_queries]
+      query = params[:query].to_a
+      session[:merb_words_queries] = queries - query
+      redirect(slice_url(:index))
+    end
   end
 
 end

data/app/helpers/application_helper.rb

@@ -34,9 +34,9 @@ module Merb::MerbWords::ApplicationHelper
 
   def merb_words_password_status
     if merb_words_password?
-      update = mui_button(:title => 'Update', :url => slice_url(:password_update), :window => 'open')
-      exit = mui_button(:title => 'Exit', :url => slice_url(:password_exit))
-      mui_block(:type => 'status'){%{Password: #{update} #{exit}}}
+      update_button = mui_button(:title => 'Update Password', :title_size => '0.75em', :url => slice_url(:password_update), :window => 'open')
+      exit_button = mui_button(:title => 'Exit', :title_size => '0.75em', :tone => 'positive', :url => slice_url(:password_exit))
+      mui_status{"#{update_button} #{exit_button}"}
     end
   end
 

data/app/views/pages/_category.html.erb

@@ -9,7 +9,7 @@
   <% end =%>
   <% if merb_words_password? %>
     <%= mui_cell(:align => 'right', :valign => 'bottom') do %>
-      <%= mui_button(:title => 'Create', :url => slice_url(:category_create), :window => 'open') %>
+      <%= mui_button(:title => 'Create', :title_size => '0.75em', :url => slice_url(:category_create), :window => 'open') %>
     <% end =%>
   <% end %>
 <% end =%>
@@ -32,8 +32,8 @@
       <% if merb_words_password? %>
         <%= mui_cell(:align => 'right', :wrap => false) do %>
           &nbsp;
-          <%= mui_button(:title => 'Update', :url => slice_url(:category_update, :category_id => category.id), :window => 'open') %>
-          <%= mui_button(:title => '&#215;', :tone => 'negative', :url => slice_url(:category_delete, :category_id => category.id), :window => 'open') %>
+          <%= mui_button(:title => 'Update', :title_size => '0.75em', :url => slice_url(:category_update, :category_id => category.id), :window => 'open') %>
+          <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:category_delete, :category_id => category.id), :window => 'open') %>
         <% end =%>
       <% end %>
     <% end =%>

data/app/views/pages/_order.html.erb

@@ -1,4 +1,3 @@
-<%= mui_divider %>
 <%= mui_block(:title => 'Sort by', :title_size => '1em') %>
 <% orders.each do |order| %>
   <div>

data/app/views/pages/_page.html.erb

@@ -15,8 +15,8 @@
         <% if page.publish == false %>
           <i>unpublished</i>&nbsp;
         <% end %>
-        <%= mui_button(:title => 'Update', :url => slice_url(:update, :page_id => page.id), :window => 'open') %>
-        <%= mui_button(:title => '&#215;', :tone => 'negative', :url => slice_url(:delete, :page_id => page.id), :window => 'open') %>
+        <%= mui_button(:title => 'Update', :title_size => '0.75em', :url => slice_url(:update, :page_id => page.id), :window => 'open') %>
+        <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:delete, :page_id => page.id), :window => 'open') %>
       <% end =%>
     <% end =%>
   <% end %>

data/app/views/pages/_search.html.erb

@@ -1,21 +1,17 @@
-<%
-  attributes = {}
-  attributes[:order_property] = params[:order_property]
-%>
-<%= mui_block do %>
-  <%= mui_search(:action => slice_url(:index, attributes), :width => '10em') %>
-<% end =%>
-<% if searches = session[:mui_searches] %>
-  <% searches.each do |search| %>
-    <% attributes[:search] = CGI.unescape(search) %>
+<% if queries = session[:merb_words_queries] and !queries.blank? %>
+  <%= mui_block(:title => 'Searches', :title_size => '1em') %>
+  <% attributes = {} %>
+  <% queries.each do |q| %>
+    <% attributes[:q] = CGI.unescape(q) %>
     <%= mui_grid(:columns => 2, :width => '100%') do %>
       <%= mui_cell do %>
-        <%= mui_link(:title => CGI.unescape(search), :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+        <%= mui_link(:title => CGI.unescape(q), :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
       <% end =%>
       <%= mui_cell(:align => 'right', :wrap => false) do %>
         &nbsp;
-        <%= mui_button(:title => '&#215;', :tone => 'negative', :url => slice_url(:search_delete, :search => search)) %>
+        <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:query_delete, :query => q)) %>
       <% end =%>
     <% end =%>
   <% end %>
+  <%= mui_divider %>
 <% end %>

data/app/views/pages/index.html.erb

@@ -1,5 +1,5 @@
 <%= merb_words_password_status %>
-<%= mui_grid(:columns => 2, :width => '100%') do %>
+<%= mui_grid(:cell_valign => 'top', :columns => 2, :width => '100%') do %>
   <%= mui_cell(:width => '75%') do %>
     <%= mui_grid(:cell_valign => 'bottom', :columns => 2) do %>
       <%= mui_cell(:width => '100%') do %>
@@ -25,7 +25,7 @@
     <% end %>
   <% end =%>
   <%= mui_cell(:width => '25%') do %>
-    <%= mui_block(:type => 'tray') do %>
+    <%= mui_tray do %>
       <%= partial(:search, :searches => @searches) if @pages %>
       <%= partial(:order, :orders => @orders, :order_property => @order_property) if @orders %>
       <%= partial(:category, :categories => @categories, :category_id => @category_id) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-words
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: "0.4"
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-13 00:00:00 -08:00
+date: 2008-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: "0.4"
     version: 
 description: 
 email: dont.tase@me.com