lolita 3.0.7 → 3.1.0

data/GUIDELINE

@@ -1,3 +1,7 @@
+=Lolita developer guidline
+
+This file is meant for developers only.
+
 # Creating GEM for Lolita
 
 When creating GEM, that include new module in one or more of lolita modules, use

data/README.rdoc

@@ -0,0 +1,50 @@
+=Lolita
+
+Content management system that works with rails.
+==Demo
+See the demo page at Demo[http://lolita-demo.ithouse.lv]
+
+==Installation
+
+First install Lolita gem
+  sudo gem install lolita
+
+Then go to your rails project and 
+ rails g lolita:install
+
+That will create initializer and copy all assets.
+Also it will call <em>install</em> on all added modules to lolita. 
+So if you in Gemfile have following
+  gem "lolita"
+  gem "lolita-file-upload"
+It will also call <i>lolita_file_upload:install</i>.
+==Usage
+ 
+To make your model use Lolita do like this
+  class Post < ActiveRecord::Base
+    include Lolita::Configuration
+    lolita
+  end
+Then in routes.rb file make resources accessable for lolita with  
+  lolita_for :posts
+This will make routes like
+  /lolita/posts
+  /lolita/posts/1/edit
+  /lolita/posts/new
+===Add authorization to Lolita
+
+Easiest way to add authentication is with Devise. First install Devise as gem, than add to it 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!
+This will make before each Lolita requests call before filter, that than will call <em>authenticate_user!</em>
+that is Devise method for authenticating user. Without it Lolita will be acessable for everyone.
+You can also add any other authentication method like
+  config.authentication = :authenticate_admin
+And than put this method for common use in <em>ApplicationController</em> or in some other place that is accessable
+to all controllers.
+===Using newer version of Lolita
+
+If you decide to use some newer version, you most likely should copy new assets to your project. 
+This can be done with
+  rails g lolita:assets

data/VERSION

@@ -1 +1 @@
-3.0.7
+3.1.0

data/app/controllers/lolita/rest_controller.rb

@@ -3,7 +3,7 @@ class Lolita::RestController < ApplicationController
   include Lolita::Controllers::InternalHelpers
   
   before_filter :authenticate_lolita_user!
-  layout "lolita/layouts/application"
+  layout "lolita/application"
   
   def new
     build_resource
@@ -31,12 +31,14 @@ class Lolita::RestController < ApplicationController
   def destroy
     get_resource
     if self.resource && self.resource.destroy
-      to_list
+      flash.now[:notice] = I18n.t "lolita.shared.destroy_notice"
+    else
+      flash.now[:alert] = I18n.t "lolita.shared.destroy_alert"
     end
+    redirect_to :action=>"index"
   end
 
   def index
-    page=resource_class.lolita.list.paginate(params[:page])
     respond_to do |format|
       format.html do
         build_response_for(:list,:page=>page)
@@ -50,6 +52,11 @@ class Lolita::RestController < ApplicationController
   private
 
   def show_form
+    #TODO Valdis: ja es extendoju rest_controller un gribu pārdefinēt edit actionu, man vajag lai
+    #  varu norādīt citu šablonu, piemēram, manā gadījumā ir services_controller un jamais meklē
+    #  "services/form", bet es gribu izmantot to pašu "lolita/rest/form"
+    #  tagad man viss šitais jāpārkopē uz projektu
+
     build_response_for(:tabs)
     if request.xhr?
       render :form, :layout => false
@@ -59,19 +66,28 @@ class Lolita::RestController < ApplicationController
   end
   
   def save_and_redirect
-    if self.resource.save
-      flash.now[:notice] = I18n.t "lolita.shared.save_notice"
-      show_form
-    else
-      flash.now[:alert] = I18n.t "lolita.shared.save_alert"
-      show_form #to_list
-    end
+      respond_to do |format|
+        format.html do
+          if self.resource.save
+            flash.now[:notice] = I18n.t "lolita.shared.save_notice"
+          else
+            flash.now[:alert] = I18n.t "lolita.shared.save_alert"
+          end
+          show_form
+        end
+        format.json do
+          render :status => self.resource.save ? 200 : 400, :json => self.resource
+        end
+      end
   end
   
   def to_list
-    page=resource_class.lolita.list.paginate(params[:page])
     builder=build_response_for(:list,:page=>page)
     render :index
     #render_component *builder
   end
+
+  def page
+    resource_class.lolita.list.paginate(params[:page])
+  end
 end

data/app/helpers/components/lolita/configuration/list_component.rb

@@ -0,0 +1,11 @@
+module Components
+  module Lolita
+    module Configuration
+      module ListComponent
+        def sort_options
+          params[:sort]
+        end
+      end
+    end
+  end
+end

data/app/helpers/lolita_helper.rb

@@ -4,7 +4,7 @@ module LolitaHelper
 	# This is helpful because different positionings within it exist depending on action
   def content_classes
     classes = []
-    if params[:action] == "edit"
+    if params[:action] == "edit" || params[:action] == "new"
     	classes << "with-secondary"
     end
     classes.join(" ")

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

@@ -0,0 +1,9 @@
+<div class="field" id="field_<%=field.__id__%>">
+  <%= render_component :"lolita/configuration/field", :label, :field=>field %>
+  <div class="field-value" id="field_<%=field.__id__%>_value">
+    <%= render_component *field.build %>
+  </div>
+  <% unless resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].empty? %>
+    <p class="inline-errors"><%= raw resource.errors[field.name.to_s.gsub(/_id$/,"").to_sym].join("<br>") %></p>
+  <% end %>
+</div>

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

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

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

@@ -0,0 +1,5 @@
+<% if field.association_type == :one %>
+  <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
+<% else %>
+  <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>
+<% end %>

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

@@ -0,0 +1,26 @@
+<% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
+<% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
+<% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
+<% values.each{|value|%>
+  <%
+  option_tags = options.collect{|option|
+    option_tag_attributes = {:value=>option[1]}
+    option_tag_attributes[:selected] = "selected" if option[1] == value.id
+    content_tag :option, option[0], option_tag_attributes
+  }.join("").html_safe
+  %>
+  <div style="height:30px;">
+    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
+  </div>
+<%  } %>
+<% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
+<%
+option_tags = options.collect{|option|
+  content_tag :option, option[0], {:value=>option[1]}
+}.join("").html_safe
+%>
+<% empty_fields.times{ %>
+  <div style="height:30px;">
+    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
+  </div>
+<% } %>

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

@@ -0,0 +1,5 @@
+<%= select resource_name,
+            field.name,
+            (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
+            {:include_blank => field.include_blank},
+            field.html_options || {} %>

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

@@ -0,0 +1 @@
+<%= render_component :"lolita/configuration/field/string", :display, :field=>field %>

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

@@ -0,0 +1 @@
+<%= date_select resource_name, field.name %>

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

@@ -0,0 +1 @@
+<%= render_component :"lolita/configuration/field/string", :display,:field=>field %>

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

@@ -0,0 +1,5 @@
+<% if field.options[:native_type] == "text" %>
+ <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
+<% else %>
+  <%= text_field resource_name, field.name %>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% if @textarea_component_include_tinymce_once.nil? %>
+  <% content_for :script do %>
+    <%= javascript_include_tag "tinymce/jquery.tinymce" %>
+    <script type="text/javascript">
+      function load_tinymce(){
+        $("textarea[data-simple!=true]").tinymce({
+          script_url: "/javascripts/tinymce/tiny_mce.js",
+          theme: "advanced",
+          skin: "cirkuit",
+          mode: "textareas",
+          theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code",
+          theme_advanced_buttons2 : "",
+          theme_advanced_buttons3 : "",
+          theme_advanced_toolbar_location: "top",
+          theme_advanced_toolbar_align: "left",
+          // theme_advanced_statusbar_location : "bottom",
+          theme_advanced_resizing: true
+        });
+      }
+    </script>
+  <% end %>
+<% end %>
+
+<%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
+<% if @textarea_component_include_tinymce_once.nil? %>
+  <script type="text/javascript">
+    $(document).ready(
+     $(function(){
+        load_tinymce();
+      })
+    )
+  </script>
+<% end %>
+<% @textarea_component_include_tinymce_once = "done" %>

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

@@ -0,0 +1 @@
+<%= datetime_select resource_name, field.name %>

data/app/views/components/lolita/{field_set → configuration/field_set}/_display.html.erb

@@ -1,5 +1,5 @@
 <div class="fieldset" id="<%=field_set.name%>">
   <% fields.each do |field| %>
-    <%= render_component :"lolita/field", :display, :field=>field %>
+    <%= render_component *field.builder %>
   <% end %>
 </div>

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

@@ -0,0 +1,5 @@
+<tbody>
+  <% page.each_with_index do |record,index| %>
+    <%= render_component :"lolita/configuration/list", :row, :columns=>columns,:record=>record,:index=>index %>
+  <% end %>
+</tbody>

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

@@ -0,0 +1,12 @@
+<div class="box">
+  <%= render_component :"lolita/configuration/list", :title %>
+  <%= render_component :"lolita/configuration/list", :new_resource%>
+  <%= render_component :"lolita/configuration/list", :filter, :list => list %>
+  <div class="list">
+    <table>
+      <%= render_component :"lolita/configuration/list", :header, :columns=>list.columns %>
+      <%= render_component :"lolita/configuration/list", :body, :page=>page,:columns=>list.columns %>
+    </table>
+  </div>
+  <%= render_component :"lolita/configuration/list", :paginator,:page=>page, :columns=>list.columns %>
+</div>

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

@@ -0,0 +1,8 @@
+<% if list.filter? -%>
+  <form action="" action="get" class="filter">
+    <% list.filter.fields.each do |field| %>
+      <%= render_component *field.build %>
+    <% end %>
+    <button type="submit">Apply</button>
+  </form>
+<% end -%>

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

@@ -0,0 +1,9 @@
+<thead>
+  <tr>
+    <%= render_component :"lolita/configuration/list",:checkbox_header %>
+    <% columns.each do |column| %>
+      <%= render_component :"lolita/configuration/list", :header_cell, :column=>column %>
+    <% end %>
+    <%= render_component :"lolita/configuration/list",:tool_header  %>
+  </tr>
+</thead>

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

@@ -0,0 +1,3 @@
+<div class="paginator">
+  <%= will_paginate page %>
+</div>

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

@@ -0,0 +1,7 @@
+<tr class="<%= @class_name %>">
+  <%= render_component :"lolita/configuration/list", :checkbox_cell, :record=>record %>
+  <% columns.each do |column| %>
+    <%= render_component :"lolita/configuration/list",:body_cell, :value=>column.with_format(record.send(column.name.to_sym)) %>
+  <% end %>
+  <%= render_component :"lolita/configuration/list", :tool_cell,:record=>record %>
+</tr>

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

@@ -0,0 +1,17 @@
+<div class="tab box" id="tab_<%=tab.__id__%>">
+  <div class="tab-title boxtitle black" data-closed="false">
+    <h1><%= tab.title %></h1>
+    <div class="arrow"></div> <%# FIXME more DRY solution is needed for .arrow within .boxtitle, maybe box helper %>
+  </div>
+  <% if resource.errors.any? %>
+    <p class="errorExplanation" id="errorExplanation">
+      <%= raw resource.errors.keys.collect{|k|
+        if error_tab = tab.fields.by_name(k)
+          "#{error_tab.title.humanize.capitalize}: "+
+            "#{resource.errors[k].collect{|m| m.capitalize}.join(" and ")}"
+        end
+      }.compact.join("<br>") %>
+    </p>
+  <% end %>
+  <%= render_component *tab.build %>
+</div>

data/app/views/components/lolita/configuration/tab/_fields.html.erb

@@ -0,0 +1,7 @@
+<% tab.fields_with_field_set do |fields_or_field,field_set| %>
+  <% if field_set %>
+    <%= render_component :"lolita/configuration/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>
+  <% else %>
+    <%= render_component :"lolita/configuration/field", :display,:field=>fields_or_field %>
+  <% end %>
+<% end %>

data/app/views/components/lolita/configuration/tab/content/_display.html.erb

@@ -0,0 +1 @@
+<%= render_component :"lolita/configuration/tab/default", :display, :tab=>tab  %>

data/app/views/components/lolita/configuration/tab/default/_display.html.erb

@@ -0,0 +1,9 @@
+<%  #
+# FIXME: move to /tab_types/
+#
+%>
+<%= form_tag "#", :id=>"tab-form-#{tab.__id__}" do |form| %>
+  <div class="tab-content">
+    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
+  </div>
+<% end %>

data/app/views/components/lolita/{tabs → configuration/tabs}/_display.html.erb

@@ -1,11 +1,12 @@
-<%= render_component :"lolita/shared", :flash, :flash => flash %> <%# FIXME does it really need passed flash as local var? %>
+<%= render_component :"lolita/shared", :flash, :flash=>flash %>
 <%= render_component :"lolita/shared", :right_sidebar %>
 
-<%#= resource.errors.full_messages if resource.errors.any? %>
+<% #error messages here not necessary, printing full messages moved to :"lolita/tab" component %>
+<% # = raw resource.errors.full_messages.join("<br>") if resource.errors.any? %>
 
 <% #mode container div with all data-* method to helper and change to block method %>
 <div id="tabs-<%= resource_name %>" class="tabs" data-method="<%=resource.new_record? ? "POST" : "PUT" %>" data-tabs-url="<%=resource.new_record? ? lolita_resources_path : lolita_resource_path(:id=>resource.id)%>">
   <% tabs.each do |tab| %>
-    <%= render_component :"lolita/tab", :display, :tab=>tab  %>
+    <%= render_component :"lolita/configuration/tab", :display, :tab=>tab  %>
   <% end %>
 </div>

data/author

@@ -1 +1 @@
-This software is developed by IT House (Latvia) and Artūrs Meisters
+This software is developed by IT House (Latvia) and Artūrs Meisters

data/lib/lolita.rb

@@ -19,6 +19,7 @@ module Lolita
   autoload(:ObservedArray,'lolita/observed_array')
   autoload(:Builder,'lolita/builder')
   autoload(:BaseConfiguration,'lolita/base_configuration')
+
   module Adapter
     autoload :AbstractAdapter, 'lolita/adapter/abstract_adapter'
     autoload :ActiveRecord, 'lolita/adapter/active_record'
@@ -29,32 +30,45 @@ module Lolita
     autoload :Base, 'lolita/dbi/base'
   end
   
+  autoload :Hooks, "lolita/hooks"
   module Hooks
-    require 'lolita/hooks/hooks'
-    include Lolita::Hooks::Hooks
-    autoload :Base, 'lolita/hooks/base'
-    autoload :Component, 'lolita/hooks/component'
+    autoload :NamedHook, "lolita/hooks/named_hook"
   end
+ 
 
   module Configuration
     autoload :Factory, 'lolita/configuration/factory'
     autoload :Base, 'lolita/configuration/base'
     autoload :Column, 'lolita/configuration/column'
     autoload :Columns, 'lolita/configuration/columns'
-    autoload :Field, 'lolita/configuration/field'
+    autoload :Fields, 'lolita/configuration/fields'
     autoload :FieldSet, 'lolita/configuration/field_set'
     autoload :List, 'lolita/configuration/list'
     autoload :Page, 'lolita/configuration/page'
-    autoload :Tab, 'lolita/configuration/tab'
     autoload :Tabs, 'lolita/configuration/tabs'
-
-    ["tab","field"].each do |type|
-      Dir["#{File.dirname(__FILE__)}/lolita/configuration/#{type}/**/*.*"].each do |path|
-        base_name=File.basename(path,".rb")
-        autoload :"#{base_name.capitalize}#{type.humanize}", "lolita/configuration/#{type}/#{base_name}"
+    autoload :Filter, 'lolita/configuration/filter'
+
+    module Field
+      extend Lolita::Configuration::Factory
+      autoload :Base, 'lolita/configuration/field'
+       ["field"].each do |type|
+        Dir["#{File.dirname(__FILE__)}/lolita/configuration/#{type}/**/*.*"].each do |path|
+          base_name=File.basename(path,".rb")
+          autoload :"#{base_name.camelize}", "lolita/configuration/#{type}/#{base_name}"
+        end
+      end
+    end
+    
+    module Tab
+      extend Lolita::Configuration::Factory
+      autoload :Base, 'lolita/configuration/tab'
+      ["tab"].each do |type|
+        Dir["#{File.dirname(__FILE__)}/lolita/configuration/#{type}/**/*.*"].each do |path|
+          base_name=File.basename(path,".rb")
+          autoload :"#{base_name.camelize}", "lolita/configuration/#{type}/#{base_name}"
+        end
       end
     end
-
     
     def self.included(base)
       base.class_eval do
@@ -91,6 +105,11 @@ module Lolita
     autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
   end
 
+  autoload(:Navigation,"lolita/navigation")
+  module Navigation
+    autoload :Tree, "lolita/navigation"
+    autoload :Branch, "lolita/navigation"
+  end
 
   @@scopes={}