merb-words 0.4.2 → 0.4.3

data/Rakefile

@@ -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.4.2'
+  s.version = '0.4.3'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/controllers/pages.rb

@@ -3,13 +3,13 @@ require 'cgi'
 class MerbWords::Pages < MerbWords::Application
 
   before(:mui_window_referer, :only => [:create, :update, :delete])
-  before(:merb_words_password_redirect, :exclude => [:index, :feed, :read], :unless => :merb_words_password?)
+  before(:merb_words_password_redirect, :exclude => [:index, :feed, :read], :unless => :mui_password?)
   before(:merb_words_orders, :only => [:index])
 
   def index
     if Page
       filters = {}
-      filters[:publish] = true unless merb_words_password?
+      filters[:publish] = true unless mui_password?
       @order_property = params[:order_property] || MerbWords[:order] || 'created_at'
       if @order_property == 'title'
         filters[:order] = [@order_property.intern.asc]
@@ -35,7 +35,7 @@ class MerbWords::Pages < MerbWords::Application
       @orders = Order.all
       display @pages
     else
-      session[:mui_message] = url(:merb_ui_message, :title => 'Create the first page') if merb_words_password?
+      session[:mui_message] = url(:merb_ui_message, :title => 'Create the first page') if mui_password?
       session[:mui_window] = slice_url(:create)
       render
     end

data/app/controllers/passwords.rb

@@ -1,7 +1,7 @@
 class MerbWords::Passwords < MerbWords::Application
 
   before(:mui_window_referer, :only => [:exit, :create, :read, :update, :delete])
-  before(:merb_words_password_redirect, :exclude => [:exit, :create, :read], :unless => :merb_words_password?)
+  before(:merb_words_password_redirect, :exclude => [:exit, :create, :read], :unless => :mui_password?)
 
   def exit
     session.delete(:mui_password_id)

data/app/helpers/application_helper.rb

@@ -20,26 +20,14 @@ module Merb::MerbWords::ApplicationHelper
     end
   end
 
-  def merb_words_password?
-    session[:mui_password_id] ? true : false
-  end
-
   def merb_words_password_redirect
-    if Password.first
+    if Password
       redirect slice_url(:password_read)
     else
       redirect slice_url(:password_create)
     end
   end
 
-  def merb_words_password_status
-    if merb_words_password?
-      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
-
   def merb_words_paragraph(body)
     body.gsub(/\r\n|\r|\n/, '<br/>')
   end

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

@@ -8,7 +8,7 @@
     <%= mui_cell(:width => '100%') do %>
       <div class="mui_title" style="font-size:1em">Categories</div>
     <% end =%>
-    <% if merb_words_password? %>
+    <% if mui_password? %>
       <%= mui_cell(:align => 'right', :valign => 'bottom') do %>
         <%= mui_button(:title => 'Create', :title_size => '0.75em', :url => slice_url(:category_create), :window => 'open') %>
       <% end =%>
@@ -30,7 +30,7 @@
             <%= mui_link(:title => category.title, :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
           <% end %>
         <% end =%>
-        <% if merb_words_password? %>
+        <% if mui_password? %>
           <%= mui_cell(:align => 'right', :wrap => false) do %>
             &nbsp;
             <%= mui_button(:title => 'Update', :title_size => '0.75em', :url => slice_url(:category_update, :category_id => category.id), :window => 'open') %>

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

@@ -9,7 +9,7 @@
       <%= mui_date_span(:created => page.created_at, :updated => page.updated_at) %>
     <% end =%>
   <% end =%>
-  <% if merb_words_password? %>
+  <% if mui_password? %>
     <%= mui_cell(:wrap => false) do %>
       <%= mui_block do %>
         <% if page.publish == false %>

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

@@ -1,11 +1,10 @@
-<%= merb_words_password_status %>
 <%= 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 %>
         <%= mui_block(:title => merb_words_title, :title_size => '3em')%>
       <% end =%>
-      <% if merb_words_password? %>
+      <% if mui_password? %>
         <%= mui_cell(:wrap => false) do %>
           <%= mui_block do %>
             <%= mui_button(:title => 'Create', :url => slice_url(:create), :window => 'open') %>

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

@@ -1,14 +1,13 @@
 <% throw_content :feeds do %>
   <link href="<%= slice_url :feed %>" rel="alternate" title="RSS" type="application/rss+xml"/>
 <% end %>
-<%= merb_words_password_status %>
 <%= mui_grid(:cell_valign => 'bottom', :columns => 2) do %>
   <%= mui_cell(:width => '100%') do %>
     <%= mui_block(:title => @page.title, :title_size => '3em') %>
   <% end =%>
   <%= mui_cell(:wrap => false) do %>
     <%= mui_button(:title => '&larr; Back', :url => slice_url(:index)) %>
-    <% if merb_words_password? %>
+    <% if mui_password? %>
       <%= 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') %>
     <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-words
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2008-12-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency