lolita 3.1.18 → 3.2.0.rc1

data/Gemfile

@@ -1,11 +1,14 @@
 source "http://rubygems.org"
 
 # Thing how to seperate gems for Rails Engine from those that are only for lolita
-gem "rails", "~>3.0.10"
+gem "rails", "~>3.1.0"
 gem "kaminari", "~>0.12.4"
 gem "abstract"
-gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1
+
+gem "builder", "~> 3.0" 
+
 gem "haml", "~> 3.1.2"
+gem 'jquery-rails'
 
 group :mongoid do
 	gem "mongo", "~> 1.3.0"

data/History.rdoc

@@ -1,3 +1,27 @@
+=== Version 3.2.0
+* Enhancements
+  * Created adapter Field and Association classes. Field and association access methods convert data to thoes class objects
+  * Factory module created where factory classes are located
+  * Removed specific pagination methods from adapters 
+  * Removed Lolita::Configuration::Factory and Lolita::Configuration::Page
+  * Range, Float, Symbol, Hash fields are added to support Mongoid ORM
+
+* Changes
+  * #value, #value=, #record_value removed from Lolita::Configuration::Field
+  * Created pagination in list and in adapters; its possible to customize it for model.
+  * All fields must have name as well as tabs must have type
+  
+* Bug fixes
+  * All classes fixed to work with both mongoid and AR
+   
+
+=== Version 3.1.18 / 
+* Enhancements
+  * 
+* Bug fixes
+  * Polymorphic bug fixed
+  * habtm field fixed
+
 === Version 3.1.17 / 2011-09-01
 * Bug fixes
   * Error explanation updated with nested errors

data/README.md

@@ -0,0 +1,113 @@
+#Lolita
+
+Great Rails CMS, that turns your business logic into good-looking, fully functional workspace.
+##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 *install* on all added modules to lolita. 
+So if you in Gemfile have following
+  
+    gem "lolita"
+    gem "lolita-file-upload"
+It will also call *lolita_file_upload:install*.
+##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`
+or open `/lolita` and it will redirect to first available resource list view.
+
+For more detailed usage read [Usage](https://github.com/ithouse/lolita/wiki/Usage) at wiki.
+
+###Add authorization to Lolita
+
+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 */config/initializers/lolita.rb*
+
+    config.user_classes << User
+    config.authentication = :authenticate_user!
+This will make before each Lolita requests call before filter, that than will call *authenticate_user!*
+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 *ApplicationController* 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
+###Using hooks
+
+Lolita define hooks for RestController and for components.
+####RestController hooks
+
+There are two kind of hooks for all actions - *before_[action name]* and *after_[action name]*.
+Define callbacks for those hooks outside of controller. This will call User#log_action each time when #destroy 
+action is requested.
+
+    Lolita::RestController.before_destroy do
+      User.log_action("Going to delete #{params[:id]}") 
+    end
+Also you can define callbacks in your controllers that extend Lolita::RestController. This will call #set\_default\_params
+each time #new action is requested.
+
+    class PostController < Lolita::RestController
+      before_new :set_default_params
+
+      private
+
+      def set_default_params
+        params[:post][:title]="-Your title goes here-"
+      end
+    end
+####Component hooks
+
+Components have three hooks - *before*, *after* and *around*.
+Component hooks are different from controller hooks with names. Each component has it's own name, that is used to
+call component, like
+
+    render_component :"lolita/configuration/list/display"
+    #same as
+    render_component :"lolita/configuration/list", :display
+and this name is used to add callback for component. As components is not related to specific class, then there
+are only one way to define callback for them.
+
+    Lolita::Hooks.component(:"/lolita/configuration/list/display").before do
+      "<div>My Custom text</div>"
+    end
+That what are inside of blocks depends on place where you define callback if it is in _.rb_ file, than you
+should put HTML in quotes, if in _.erb_ and similar files then there is no need for that. Also blocks with 
+Ruby code only return last line, so you should probably define HTML as shown in previous example.
+For _around_ callback if you pass block, then original content will be replaced with that, but if you want
+to let original content inside of your block content than it is done like this with #let_content method.
+
+    Lolita::Hooks.component(:"/lolita/configuration/list/display").around do
+      "<div style='color:red'>#{let_content}</div>"
+    end
+##License
+
+Lolita is under MIT license. See [LICENSE.txt](https://github.com/ithouse/lolita/blob/master/LICENSE.txt)

data/VERSION

@@ -1 +1 @@
-3.1.18
+3.2.0.rc1

data/{public → app/assets}/javascripts/lolita/main.js

@@ -1,3 +1,4 @@
+//= require jquery_ujs
 $(function(){
   $.ajaxSetup({
     headers:{

data/{public → app/assets}/stylesheets/lolita/style.css

@@ -315,27 +315,6 @@ a.create {
 
 .list table td a:active {position: relative; top: 1px;}
 
-/* search in list view */
-
-#main .boxtitle .black .search {
-  position: absolute;
-  right: 15px;
-  top: 25px;
-  background: none;
-  padding: 0;
-}
-#main .boxtitle .black .search input {
-  font-size: 13px;
-  background: #fff url(<%= asset_data_uri "lolita/search_icon.png" %>) no-repeat 5px center;
-  padding: 0 10px 0 18px;
-  border: 1px solid #ccc;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-  height: 20px;
-  line-height: 20px\9;
-}
-
 /* filter */
 #main form.filter {
   background: #F3F3F3;

data/app/controllers/lolita/info_controller.rb

@@ -1,16 +1,9 @@
 class Lolita::InfoController < ApplicationController
   @@properties = []
-  include Lolita::Controllers::UserHelpers
-  include Lolita::Controllers::AuthorizationHelpers
-  before_filter :authenticate_lolita_user!, :only => [:index]
 
   def index
     if Lolita.mappings.any?
-      available_mapping = Lolita.mappings.detect{|name,mapping|
-        can?(:read,mapping.to)
-      }
-      available_mapping &&= available_mapping.last
-      return redirect_to(lolita_resources_path(available_mapping)) if available_mapping
+      return redirect_to(lolita_resources_path(Lolita.mappings.values.first))
     end
     render :layout => false
   end
@@ -23,10 +16,6 @@ class Lolita::InfoController < ApplicationController
     end
   end
 
-  def is_lolita_resource?
-    true
-  end
-
   private
 
   def self.property(name, value = nil)

data/app/controllers/lolita/rest_controller.rb

@@ -1,5 +1,6 @@
 class Lolita::RestController < ApplicationController
-  include Lolita::ControllerAdditions
+  include Lolita::Controllers::UserHelpers
+  include Lolita::Controllers::InternalHelpers
 
   include Lolita::Hooks
   add_hook :before_new, :after_new, :before_create,:after_create,:before_edit,:after_edit
@@ -11,14 +12,12 @@ class Lolita::RestController < ApplicationController
   
   def new
     self.run(:before_new)
-    authorize!(:create,self.resource_class)
     build_resource
     show_form
   end
 
   def create
     self.run(:before_create)
-    authorize!(:create,self.resource_class)
     build_resource
     save_and_redirect
   end
@@ -26,14 +25,12 @@ class Lolita::RestController < ApplicationController
   def edit
     self.run(:before_edit)
     get_resource
-    authorize!(:update,self.resource)
     show_form
   end
   
   def update
     self.run(:before_update)
     get_resource
-    authorize!(:update,self.resource)
     if self.resource
       self.resource=resource_with_attributes(self.resource,resource_attributes)
       save_and_redirect
@@ -44,7 +41,6 @@ class Lolita::RestController < ApplicationController
   def destroy
     self.run(:before_destroy)
     get_resource
-    authorize!(:destroy, self.resource)
     if self.resource && self.resource.destroy
       flash[:notice] = ::I18n.t "lolita.shared.destroy_notice"
     else
@@ -56,7 +52,6 @@ class Lolita::RestController < ApplicationController
 
   def index
     self.run(:before_index)
-    authorize!(:read,self.resource_class)
     respond_to do |format|
       format.html do
         build_response_for(:list,:page=>page)

data/app/helpers/lolita_helper.rb

@@ -1,4 +1,5 @@
 module LolitaHelper
+	
 	# Classes for div block that is located to the right of menu
 	# This is helpful because different positionings within it exist depending on action
   def content_classes
@@ -8,16 +9,4 @@ module LolitaHelper
     end
     classes.join(" ")
   end
-
-  def include_application_assets
-    result = ""
-    Lolita.application.assets.each do |asset_name|
-      if attr_name.match(/\.js(\.|$)/)
-        result << javascript_include_tag(asset_name)
-      elsif attr_name.match(/\.css(\.|$)/)
-        result << stylesheet_link_tag(asset_name)
-      end
-    end
-    raw(result)
-  end
 end

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

@@ -1,4 +1,4 @@
-<th>
+<th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
   <% if column.sortable? %>
     <%= render_component column, :sort %>
   <% else %>

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

@@ -1,7 +1,4 @@
-<% 
-  sort_mapping = {"desc" => '&dArr;', "asc" => '&uArr;'}
-  new_params = params.reject{|k,v| ["controller","action"].include?(k.to_s)}
-  direction_indicator = raw(sort_mapping[column.current_sort_state(new_params)[1]])
-  new_params[:s] = column.sort_params(new_params)
-%>
-<%= link_to raw("#{column.title.to_s.capitalize} #{direction_indicator}"), lolita_resources_path(new_params) %>
+ <% 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.to_s.capitalize } #{direction_indicator}"), lolita_resources_path(options) %>

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

@@ -3,5 +3,5 @@
   - editors = resource.send(:"#{field.name.to_s.singularize}_ids")
   .habtm-container
     = label_tag "#{resource_name}_#{field.name}_#{value.last}",value.first, :class => "habtm-label"
-    = check_box_tag "#{resource_name}[#{field.name.to_s.singularize}_ids][]", value.last, resource.send(field.name).include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
+    = check_box_tag "#{resource_name}[#{field.name.to_s.singularize}_ids][]", value.last, resource.send("#{field.name.to_s.singularize}_ids").include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
 .clear

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

@@ -1,4 +1,4 @@
 <%= tab_form.select field.name,
             (field.view_values(self)),
-            (field.options || {}).merge({:include_blank => field.include_blank}),
+            {:include_blank => field.include_blank},
             field.html_options || {} %>

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

@@ -1 +1 @@
-<div class="disabled-field"><%= raw(tab_form.object.send(field.name)) %></div>
+<div class="disabled-field"><%= raw(resource.send(field.name)) %></div>

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

@@ -5,7 +5,7 @@
   <% end %>
 <% end %>
 
-<%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
+<%= tab_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
 <% if @textarea_component_include_tinymce_once.nil? %>
   <script type="text/javascript">
     $(document).ready(

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

@@ -1 +1 @@
-<%= paginate page, :theme => "lolita", :params => params %>
+<%= paginate page, :theme => "lolita" %>

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

@@ -1,10 +1,5 @@
 <div class="boxtitle">
-  <h1 class="black">
-    <%= resource_class.model_name.human(:count=>2) %>
-    <% if list.search %>
-      <%= render_component list.search, :display %>
-    <% end %>
-  </h1>
+  <h1 class="black"><%= resource_class.model_name.human(:count=>2) %></h1>
   <div class="arrow">
   </div>
 </div>

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

@@ -1,14 +1,12 @@
-<div class="nested_form <%=nested_form.field_style%>" id=<%= "nested_form_#{nested_form.__id__}" %>>
+<div class="nested_form" id=<%= "nested_form_#{nested_form.__id__}" %>>
   <% unless nested_form.field_style == :normal %>
     <%= render_component *nested_form.as_field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
   <% end %>
-  <div class="nested-form-fields-container">
-  	<%= tab_form.fields_for nested_form.name, resource.send(nested_form.build_method) do |form| %>
-  		<% tab_form(form) do %>
-  				<%= render_component nested_form, :fields %>
-  		<% end %>
-  	<% end %>
-  </div>
+	<%= tab_form.fields_for nested_form.name, resource.send(nested_form.build_method) do |form| %>
+		<% tab_form(form) do %>
+				<%= render_component nested_form, :fields %>
+		<% end %>
+	<% end %>
   <% if nested_form.expandable? && !nested_form.update_only? %>
 	 <p><%= link_to_add_fields ::I18n.t("lolita.nested_form.add", :resource_name => nested_form.klass.model_name.human.downcase), tab_form, nested_form %> </p>
   <% end %>

data/app/views/components/lolita/navigation/_tree.html.erb

@@ -11,22 +11,29 @@
     end
   end
 end %>
-
-<% visible ||= (tree.root? || nil) %>
-
-<% if tree.visible?(self) %>
-  <ul <%= !tree.root? ? "class='subtree'" : ""%> style="display:<%=visible ? "block" : "none"%>" >
-    <% last_branch=tree.branches.last %>
-    <%tree.branches.each do |branch|
-      if branch.visible?(self)
-        active = branch.active?(self)  %> 
-        <li class="<%=active ? "active" : ""%> <%=branch.subtree? ? "with-subtree" : ""%> <%=!tree.root? && branch==last_branch ? "last-in-subtree" : ""%>">
-          <%= link_to branch.title, branch.options[:url] || "#", :onclick => branch.subtree? ? "$(this).next().toggle();return false;" : "" %>
-          <% if branch.subtree? %>
-            <%= render_component(:"lolita/navigation",:tree,:tree=>branch.children, :visible => active) %>
-          <% end %>
-        </li>
+<ul <%=!tree.root? ? "class='subtree'" : ""%> >
+  <% last_branch=tree.branches.last %>
+  <%tree.branches.each do |branch| 
+     if branch.object.is_a?(Lolita::Mapping) 
+       active=if self.respond_to?(:resource_class)
+          branch.object ? branch.object.to==resource_class : false
+        end
+     end 
+     unless active
+       active=branch.self_with_children.detect{|b| 
+         if b.options[:active].respond_to?(:call)
+          b.options[:active].call(self,branch,b)
+         else
+          b.options[:url]==request.path
+         end
+       }
+     end
+    %>
+    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=!tree.root? && branch==last_branch ? "last-in-subtree" : ""%>">
+      <%= link_to branch.title, branch.options[:url] || "#" %>
+      <% if branch.children.branches.any? %>
+        <%= render_component(:"lolita/navigation",:tree,:tree=>branch.children) %>
       <% end %>
-    <% end %>
-  </ul>
-<% end %>
+    </li>
+  <% end %>
+</ul>