lolita 3.1.6 → 3.1.7

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 # Thing how to seperate gems for Rails Engine from those that are only for lolita
 gem "rails", "~>3.0"
-gem "kaminari", "~>0.11.0"
+gem "kaminari", "~>0.12.4"
 gem "abstract"
 gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1
 

data/History.rdoc

@@ -1,5 +1,12 @@
-=== Version 3.1.7 / 2011-
+=== Version 3.1.8 / 2011
+
+=== Version 3.1.7 / 2011-06-10
 * Enhancements
+  * Builder refactored. Now support conditions. (Arturs Meisters)
+
+* Bug fixes
+  * Updated Kaminari to 0.12.4 - previous version has serious BUG (Arturs Meisters, Gatis Tomsons)
+  * Lolita messaging not used in RestController (Arturs Meisters)
 
 === Version 3.1.6 / 2011-05-19
 * Enhancements

data/README.rdoc

@@ -36,7 +36,7 @@ For more detailed usage read Usage[https://github.com/ithouse/lolita/wiki/Usage]
 
 ===Add authorization to Lolita
 
-Easiest way to add authentication is with Devise. First install Devise as gem, than add to it your project.
+Easiest way to add authentication is with Devise. First install Devise as gem, than add it to your project.
 Make Devise model, lets say, User. After that add these lines in <i>/config/initializers/lolita.rb</i>
   config.user_classes << User
   config.authentication = :authenticate_user!

data/VERSION

@@ -1 +1 @@
-3.1.6
+3.1.7

data/app/controllers/lolita/info_controller.rb

@@ -0,0 +1,38 @@
+class Lolita::InfoController < ApplicationController
+  @@properties = []
+  def index
+  end
+  def properties
+    if request.local?
+      render :inline => to_html
+    else
+      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
+    end
+  end
+
+  private
+
+  def self.property(name, value = nil)
+    value ||= yield
+    @@properties << [name, value] if value
+    rescue Exception
+  end
+
+  def to_html
+    (table = '<table>').tap do
+      @@properties.each do |(name, value)|
+        table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
+        formatted_value = if value.kind_of?(Array)
+              "<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>"
+            else
+              CGI.escapeHTML(value.to_s)
+            end
+        table << %(<td class="value">#{formatted_value}</td></tr>)
+      end
+      table << '</table>'
+    end
+  end
+    
+  property 'Lolita version', "#{LOLITA_VERSION}"
+
+end

data/app/controllers/lolita/rest_controller.rb

@@ -42,9 +42,9 @@ class Lolita::RestController < ApplicationController
     self.run(:before_destroy)
     get_resource
     if self.resource && self.resource.destroy
-      flash[:notice] = I18n.t "lolita.shared.destroy_notice"
+      flash[:notice] = ::I18n.t "lolita.shared.destroy_notice"
     else
-      flash[:alert] = I18n.t "lolita.shared.destroy_alert"
+      flash[:alert] = ::I18n.t "lolita.shared.destroy_alert"
     end
     self.run(:after_destroy)
     redirect_to lolita_resources_path
@@ -95,13 +95,13 @@ class Lolita::RestController < ApplicationController
   
   def respond_html_200
     response.headers["Validation"] = 'true'
-    flash.now[:notice] = I18n.t "lolita.shared.save_notice"
+    response.headers["Lolita-Notice"] = ::I18n.t "lolita.shared.save_notice"
     show_form
   end
 
   def respond_html_400
     response.headers["Validation"] = 'false'
-    flash.now[:alert] = I18n.t "lolita.shared.save_alert"
+    response.headers["Lolita-Alert"] = ::I18n.t "lolita.shared.save_alert"
     show_form
   end
 

data/app/views/components/lolita/configuration/column/_display.html.erb

@@ -1,4 +1,4 @@
 <td>
-  <% value=column.formatter.with(record.send(column.name.to_sym),record) %>
+  <% value=column.formatter.with(record.send(column.name.to_sym),record,self) %>
   <%= value.to_s %>
 </td>

data/app/views/components/lolita/configuration/column/_header.html.erb

@@ -2,6 +2,6 @@
   <% if column.sortable? %>
     <%= render_component column, :sort %>
   <% else %>
-    <%= column.title %>
+    <%= column.title.to_s.capitalize %>
   <% end %>
 </th>

data/app/views/components/lolita/configuration/column/_sort.html.erb

@@ -1,4 +1,4 @@
  <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
  <% options=param_options.merge(column.sort_options(params)) %>
  <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
- <%= link_to raw("#{column.title } #{direction_indicator}"), lolita_resources_path(options) %>
+ <%= link_to raw("#{column.title.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>

data/app/views/components/lolita/configuration/columns/_last.html.erb

@@ -1,4 +1,4 @@
 <td class="tool-cell">
-  <%= link_to I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
-  <%= link_to I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
+  <%= link_to ::I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
+  <%= link_to ::I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
 </td>

data/app/views/components/lolita/configuration/field/_display.html.erb

@@ -1,5 +1,5 @@
 <div class="field" id="field_<%=field.__id__%>">
-  <%= render_component :"lolita/configuration/field", :label, :field=>field %>
+  <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
   <div class="field-value" id="field_<%=field.__id__%>_value">
     <%= render_component *field.build %>
   </div>

data/app/views/components/lolita/configuration/field/_label.html.erb

@@ -1 +1 @@
-<%= label resource_name, field.name, raw(field.title), :id=>"field_#{field.__id__}_label" %>
+<%= label resource_name, field.name, raw(field.title.to_s.capitalize), :id=>"field_#{field.__id__}_label" %>

data/app/views/components/lolita/configuration/list/_filter.html.erb

@@ -3,6 +3,6 @@
     <% list.filter.fields.each do |field| %>
       <%= render_component *field.build(:filter, :filter=>list.filter) %>
     <% end %>
-    <button type="submit"><%= I18n.t "lolita.filter.apply_button" %></button>
+    <button type="submit"><%= ::I18n.t "lolita.filter.apply_button" %></button>
   </form>
 <% end -%>

data/app/views/components/lolita/configuration/list/_new_resource.html.erb

@@ -1,4 +1,4 @@
 <a href="<%= new_lolita_resource_path%>" class="create">
-  <%= I18n.t("lolita.list.add_new",:name=>resource_class.human_name.downcase) %>
+  <%= ::I18n.t("lolita.list.add_new",:name=>resource_class.model_name.human.downcase) %>
   <%= image_tag "lolita/plus.png", :alt=>"+" %>
 </a>

data/app/views/components/lolita/configuration/list/_title.html.erb

@@ -1,5 +1,5 @@
 <div class="boxtitle">
-  <h1 class="black"><%= resource_class.human_name(:count=>2) %></h1>
+  <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
   <div class="arrow">
   </div>
 </div>

data/app/views/components/lolita/shared/_header.html.erb

@@ -3,7 +3,7 @@
   <% if lolita_current_user %>
 	  <nav>
 	    <a href="<%=send(:"edit_#{lolita_current_user.class.to_s.downcase}_password_path")%>" class="username"><%=lolita_current_user.email%></a>
-	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=I18n.t("lolita.shared.log_out")%></a>
+	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=::I18n.t("lolita.shared.log_out")%></a>
 	  </nav>
   <% end %>
 </header>

data/app/views/components/lolita/shared/_right_sidebar.html.erb

@@ -8,7 +8,7 @@
       <div class="last-save">
         <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.respond_to?(:updated_at) && resource.updated_at %>
       </div>
-      <button class="save-all"><%=I18n.t("lolita.tabs.save")%></button>
+      <button class="save-all"><%=::I18n.t("lolita.tabs.save")%></button>
     </div>
   </div>
 </div>

data/app/views/layouts/lolita/application.html.erb

@@ -20,11 +20,11 @@
     <script>
       if(!window.jQuery){
         document.write('<script src="/javascripts/jquery-1.6.min.js">\x3C/script>');
-        document.write('<script src="/javascripts/jquery-ui.1.8.13.min.js">\x3C/script>');
+        document.write('<script src="/javascripts/jquery-ui-1.8.13.min.js">\x3C/script>');
       }
     </script>
     <%= javascript_include_tag "modernizr-1.7.min" %>
-    <%= javascript_include_tag "rails","lolita/tab","lolita/main" %>
+    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application" %>
     <%= yield :script %>
     <%= raw csrf_meta_tag %>
   </head>

data/app/views/lolita/info/index.html.erb

@@ -0,0 +1,232 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Lolita: Welcome aboard</title>
+    <style type="text/css" media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+
+
+      #page {
+        background-color: #f0f0f0;
+        width: 750px;
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        border-top: none;
+        padding: 25px;
+        width: 500px;
+      }
+
+      #sidebar {
+        float: right;
+        width: 175px;
+      }
+
+      #footer {
+        clear: both;
+      }
+
+
+      #header, #about, #getting-started {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+
+
+      #header {
+        background-image: url("images/lolita/plus.png");
+        background-repeat: no-repeat;
+        background-position: top left;
+        height: 64px;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+
+
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+
+
+      #getting-started {
+        border-top: 1px solid #ccc;
+        margin-top: 25px;
+        padding-top: 15px;
+      }
+      #getting-started h1 {
+        margin: 0;
+        font-size: 20px;
+      }
+      #getting-started h2 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+        margin-bottom: 25px;
+      }
+      #getting-started ol {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #getting-started li {
+        font-size: 18px;
+        color: #888;
+        margin-bottom: 25px;
+      }
+      #getting-started li h2 {
+        margin: 0;
+        font-weight: normal;
+        font-size: 18px;
+        color: #333;
+      }
+      #getting-started li p {
+        color: #555;
+        font-size: 13px;
+      }
+
+
+      #sidebar ul {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #sidebar ul h3 {
+        margin-top: 25px;
+        font-size: 16px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ccc;
+      }
+      #sidebar li {
+        list-style-type: none;
+      }
+      #sidebar ul.links li {
+        margin-bottom: 5px;
+      }
+
+    </style>
+    <script type="text/javascript">
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","lolita/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="sidebar">
+        <ul id="sidebar-items">
+          <li>
+            <h3>Browse the documentation</h3>
+            <ul class="links">
+              <li><a href="http://rdoc.info/github/ithouse/lolita/master/frames">Lolita API</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
+      <div id="content">
+        <div id="header">
+          <h1>Welcome aboard</h1>
+          <h2>You&rsquo;re riding Lolita!</h2>
+        </div>
+
+        <div id="about">
+          <h3><a href="lolita/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+
+        <div id="getting-started">
+          <h1>Getting started</h1>
+          <h2>Here&rsquo;s how to get rolling:</h2>
+
+          <ol>
+            <li>
+              <h2>Use <code>lolita_for</code> in config/routes.rb</h2>
+              <p>run it.</p>
+            </li>
+
+            <li>
+            <h2>Use <code>lolita</code> in your models</h2>
+              <p></p>
+            </li>
+
+          </ol>
+        </div>
+      </div>
+
+      <div id="footer">&nbsp;</div>
+    </div>
+  </body>
+</html>

data/lib/lolita.rb

@@ -36,6 +36,9 @@ module Lolita
   autoload(:VERSION,'lolita/version')
   autoload(:ObservedArray,'lolita/observed_array')
   autoload(:Builder,'lolita/builder')
+  module Builder
+    autoload(:Custom, 'lolita/builder')
+  end
   autoload(:BaseConfiguration,'lolita/base_configuration')
 
   module Adapter