lolita 3.2.0.rc.5 → 3.2.0.rc.6

data/Gemfile

@@ -24,8 +24,12 @@ group :assets do
   gem 'uglifier'
 end
 
-gem "jeweler", "~> 1.5.2", :group=>:development
+gem "jeweler", "~> 1.6.4", :group=>:development
 group :test,:development do
+	gem "metric_fu"
+	gem "fattr"
+	gem "arrayfields"
+	gem "map"
 	gem "rspec", "~>2.6.0"
 	gem "rspec-rails","~>2.6.1"
 	gem "factory_girl"
@@ -35,4 +39,4 @@ group :test,:development do
 	# gem "capybara"
 	gem "database_cleaner"
 	# gem "akephalos"
-end
+end

data/History.rdoc

@@ -1,5 +1,10 @@
 === Version 3.2.0
 * Enhancements
+  * _only_ options added for <b>lolita_for</b>
+  * New options _visible_ added to Lolita::Mapping, now is possible to exclude resource from navigation tree
+  * Search functionality added, included in List
+  * All modules that need to be included by Lolita controllers is added in one Lolita::ControllerAddition
+  * Basic authorization added, now with CanCan.
   * 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 
@@ -10,17 +15,20 @@
   * Polymorphic association field
 
 * Changes
-  * using rails 3.1.x
+  * noew using rails 3.1.x
   * #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
+
+* Removed
+  * Lolita::FileHelper from generators removed
   
 * Bug fixes
   * Each hook call runs as new instance of Hooks::Runner 
   * All classes fixed to work with both mongoid and AR
-   
-
-=== Version 3.1.18 / 
+  * String disabled builder fixed to use form object
+  
+=== Version 3.1.18 
 * Enhancements
   * 
 * Bug fixes

data/Rakefile

@@ -38,3 +38,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'metric_fu'
+MetricFu::Configuration.run do |config|
+  config.rcov[:test_files] = ['spec/**/*_spec.rb']  
+  config.rcov[:rcov_opts] << "-Ispec" # Needed to find spec_helper
+  config.metrics -= [:flog]
+end

data/VERSION

@@ -1 +1 @@
-3.2.0.rc.5
+3.2.0.rc.6

data/app/assets/javascripts/lolita/application.js

@@ -1,4 +1,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require application_vendor_lolita
-//= require_tree .
+//= require_tree .

data/app/assets/javascripts/lolita/tab.js

@@ -1,3 +1,5 @@
+//= require jquery
+//= require jquery-ui-1.8.13.min
 $(function(){
   // Send ajax request with all forms data for given tabs block.
   function save_tab(tabs){
@@ -42,9 +44,9 @@ $(function(){
     }
     else {
       // Ensure that it is a number and stop the keypress
-      if (event.keyCode < 48 || event.keyCode > 57 ) {
+      if (!((event.keyCode >= 48 && event.keyCode <= 57) || (event.keyCode >= 96 && event.keyCode <= 105))) {
         event.preventDefault(); 
-      }   
+      }
     }
   })
 
@@ -75,4 +77,31 @@ $(function(){
     })
   })
 
+	$("input[data-autocomplete-url]").live("keyup.autocomplete", function(){
+		$(this).autocomplete({
+			source: function(request, response){
+								$.getJSON(this.element.data("autocomplete-url"), {
+									term: request.term
+								}, response)
+							},
+			focus: function(){
+							return false;
+						 },
+			select: function(event, ui){
+								console.log(ui.item.value);
+								var li = $("<li></li>").appendTo($(this).closest(".autocomplete-container").find("ul"));
+								li.text(ui.item.value);
+								$("<a href=''></a>").text(ui.item.delete_link).appendTo(li);
+								$("<input type='hidden'>").attr("name", ui.item.name).val(ui.item.id).appendTo(li);
+								this.value = "";
+								return false;
+							}
+		});
+	});
+
+	$(".autocomplete-container ul li a").live("click", function(){
+		$(this).closest("li").remove();
+		return false;
+	})
+
 })

data/app/assets/stylesheets/lolita/application.css

@@ -1,5 +1,6 @@
 /* 
 *= require_self
+*= require jquery-ui-1.8.16.custom
 *= require lolita/default
 *= require lolita/style
 */

data/app/assets/stylesheets/lolita/style.css.erb

@@ -4,8 +4,12 @@ html,body{
 body {background: #f3f3f3; font-size: 13px;}
 
 a, a:visited, a:active {color: #7ac1ed; text-decoration: none;}
-input[type="button"] {vertical-align: top; padding: 3px 9px;}
 h1 {font-size: 28px; font-weight: normal; letter-spacing: -1px; line-height: 85px;}
+input[type="button"] {vertical-align: top; padding: 3px 9px;}
+.placeholder {color: #aaa;}
+::placeholder {color: #aaa;}
+:-moz-placeholder {color: #aaa;}
+::-webkit-input-placeholder {color: #aaa;}
 
 #container {
   width: 90%;
@@ -109,6 +113,23 @@ header nav .username {margin-right: 15px;}
 
 /* -------------------------------- */
 
+/* autocomplete field*/
+
+.autocomplete-container ul {
+	margin-left: 30px;
+}
+.autocomplete-container ul li {
+	list-style-type: none;
+	margin: 5px 0;
+	padding-bottom: 5px;
+	border-bottom: 1px dashed #DDD;
+}
+.ui-menu .ui-menu-item a {
+	font-size: 10px;
+}
+
+/* -------------------------------- */
+
 /* error fields and notifications */
 
 #main .box form .field_with_errors input,
@@ -315,7 +336,31 @@ a.create {
 
 .list table td a:active {position: relative; top: 1px;}
 
-/* filter */
+/* 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 in list view */
+
 #main form.filter {
   background: #F3F3F3;
   padding: 10px;
@@ -331,6 +376,7 @@ a.create {
 #main form.filter label {
   color: #666;
 }
+
 /* --------------------------------------------- */
 
 /* Pagination */
@@ -440,4 +486,4 @@ a.create {
 {position: relative;}
 .ie8 .black {-pie-background: linear-gradient(top, #686868, #2f2f2f);}
 .ie8 #flash {-pie-background: rgba(255,255,255,0.9);}
-/* ----------------------------------------------*/
+/* ----------------------------------------------*/

data/app/controllers/lolita/field_data_controller.rb

@@ -2,7 +2,7 @@ class Lolita::FieldDataController < ApplicationController
   include Lolita::Controllers::UserHelpers
 
   before_filter :authenticate_lolita_user!
-  before_filter :find_field
+  before_filter :find_field, :except => [:autocomplete_field]
 
   def array_polymorphic
     klass = params[:class].camelize.constantize
@@ -17,4 +17,16 @@ class Lolita::FieldDataController < ApplicationController
       field.name.to_s == params[:name].to_s
     }
   end
-end
+
+	def autocomplete_field
+		model = params[:class].singularize.camelize.constantize
+		column = model.lolita.tabs.first.fields.first.name.to_sym
+		data = model.where(model.arel_table[column].matches("%#{params[:term]}%")).map do |record| 
+			{:id => record.id, 
+			 :value => record.send(column), 
+			 :name => "#{params[:field_class].downcase}[#{params[:class].singularize}_ids][]",
+			 :delete_link => I18n.t("lolita.shared.delete")}
+		end
+		render :json => data
+	end
+end

data/app/controllers/lolita/rest_controller.rb

@@ -1,6 +1,5 @@
 class Lolita::RestController < ApplicationController
-  include Lolita::Controllers::UserHelpers
-  include Lolita::Controllers::InternalHelpers
+  include Lolita::ControllerAdditions
 
   include Lolita::Hooks
   add_hook :before_new, :after_new, :before_create,:after_create,:before_edit,:after_edit
@@ -12,12 +11,14 @@ 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
@@ -25,12 +26,14 @@ 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
@@ -41,6 +44,7 @@ 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
@@ -52,6 +56,7 @@ 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,5 +1,4 @@
 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

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

@@ -0,0 +1,11 @@
+- ids_method = field.name.to_s.match(/_ids$/) ? field.name : "#{field.name.to_s.singularize}_ids"
+
+.autocomplete-container
+  = hidden_field_tag "#{resource_name}[#{ids_method}][]",""
+  = text_field_tag :"autocomplete-#{resource_name}", nil, :"data-autocomplete-url" => autocomplete_field_path(:field_class => tab_form.object.class.to_s, :class => field.name)
+  %ul
+    - resource.persisted? && resource.send(field.name).each do |element|
+      %li
+        = element.send(element.class.lolita.tabs.first.fields.first.name.to_sym)
+        = link_to I18n.t("lolita.shared.delete").downcase, nil
+        = hidden_field_tag "#{resource_name}[#{ids_method}][]", element.id

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

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

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

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

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

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

data/app/views/components/lolita/configuration/search/_display.html.haml

@@ -0,0 +1,2 @@
+= form_tag lolita_resources_path(), :method => :get, :class => "search" do 
+  %input{:type => "text", :name => "q", :value => params[:q], :placeholder => t("lolita.search")}

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

@@ -11,29 +11,20 @@
     end
   end
 end %>
-<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) %>
+<% 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>
       <% end %>
-    </li>
-  <% end %>
-</ul>
+    <% end %>
+  </ul>
+<% end %>

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>
+	    <%= link_to ::I18n.t("lolita.shared.log_out"), send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path"), :class => "button grey", :method => Devise.sign_out_via %>
 	  </nav>
   <% end %>
 </header>

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

@@ -9,9 +9,8 @@
   <head>
     <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-    <title>Lolita</title><meta name="description" content=""><meta name="author" content="">
-    <link rel="shortcut icon" href="/lolita/favicon.ico">
-
+    <title><%=Lolita.application.name%></title><meta name="description" content=""><meta name="author" content="">
+    <%= favicon_link_tag "lolita/favicon.ico"%>
     <%= stylesheet_link_tag "lolita/application.css" %>
     <%= yield :style %>
     <%= javascript_include_tag "lolita/application.js" %>

data/config/locales/en.yml

@@ -23,30 +23,7 @@ en:
     filter:
       apply_button: Apply
       include_blank_by_title: " -- Filter by %{title} -- "
-  lolita:
-    shared:
-      save_notice: Successfully saved.
-      save_alert: Save did not succeed.
-      log_out: Sign out
-      edit: Edit
-      delete: Delete
-      and: and
-      powered: Powered Lolita (2010-%{year})
-    nested_form:
-      add: "Add %{resource_name}"
-    tabs:
-      last_save: Last save
-      save: Save
-      save_all: Save all
-      titles:
-        default: "Default"
-        content: "Content"
-    list:
-      add_new: Add new %{name}
-      confirm: "Are you sure you want to delete record?"
-    filter:
-      apply_button: Apply
-      include_blank_by_title: " -- Filter by %{title} -- "
+    search: "Search"
   views:
     pagination:
       previous: "« Previous"

data/config/locales/lv.yml

@@ -23,6 +23,7 @@ lv:
     filter:
       apply_button: Pielietot
       include_blank_by_title: " -- Filtrēt pēc %{title} -- "
+    search: "Meklēt"
   views:
     pagination:
       previous: "« Iepriekšējā"

data/config/routes.rb

@@ -2,4 +2,5 @@ Rails.application.routes.draw do
    match '/lolita' => "lolita/info#index"
    match '/lolita/info/properties' => "lolita/info#properties"
    match "/lolita/array_field/:name/:field_class/:class/:id" => "lolita/field_data#array_polymorphic", :as => "array_field_data_collector"
-end
+	 match "/lolita/autocomplete_field/:field_class/:class" => "lolita/field_data#autocomplete_field", :as => "autocomplete_field"
+end

data/lib/generators/lolita/install_generator.rb

@@ -1,21 +1,18 @@
-require 'generators/helpers/file_helper'
-
 module Lolita
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      include Lolita::Generators::FileHelper
       source_root File.expand_path("../../templates", __FILE__)
       desc "Create lolita initializer."
 
       
       def copy_initializer
-        template "lolita.rb", "config/initializers/lolita.rb" unless file_exists?("config/initializers/lolita.rb")
+        template "lolita.rb", "config/initializers/lolita.rb" unless File.exist?(Rails.root + "config/initializers/lolita.rb")
       end
 
       def install_modules
         Lolita.modules.each do |module_name|
           
-          invoke "#{module_name.to_s.underscore.gsub("/","_")}:install"  rescue nil
+          invoke "lolita:#{module_name.to_s.underscore.gsub("/","_").gsub(/^lolita_/,"")}:install"  rescue nil
         end
       end
      

data/lib/generators/templates/lolita.rb

@@ -8,10 +8,6 @@ Lolita.setup do |config|
   # Define authentication for Lolita controllers.
   # Call some of your own methods
   # config.authentication=:is_admin?
-  # Or use some customized logic
-  # config.authentication={
-  #  current_user.is_a?(Admin) || current_user.has_role?(:admin)
-  # }
 
   <% if defined?(Devise) %>
     <% default_user_class = Devise.mappings.keys.first %>

data/lib/lolita/adapter/abstract_adapter.rb

@@ -8,6 +8,7 @@ module Lolita
       abstract_method 'method_name,page,per,options', :pagination_scope_from_klass
       abstract_method 'name',:reflect_on_association,:field_by_name,:field_by_association
       abstract_method 'id',:find_by_id
+      abstract_method 'query', :search
     end
   end
 end

data/lib/lolita/adapter/active_record.rb

@@ -200,6 +200,25 @@ module Lolita
         end
       end
 
+      def search(query, options = {})
+        #TODO raise error or warn when there are lot of records and no index on field
+        resources = self.klass.arel_table
+        content_fields = @dbi.fields.map{|field| field.type!="string" ? nil : field.name.to_sym}.compact
+        if options[:fields] && options[:fields].any?
+          content_fields = content_fields & options[:fields]
+        end
+        scope = nil
+        content_fields.each_with_index do |field,index|
+          new_scope = resources[field].matches("%#{query}%")
+          unless index == 0
+            scope = scope.or(new_scope)
+          else
+            scope = new_scope
+          end
+        end
+        self.klass.where(scope)
+      end
+
       def db
         self.klass.connection
       end

data/lib/lolita/adapter/mongoid.rb

@@ -184,6 +184,66 @@ module Lolita
         end
       end
 
+      def search(query, options = {})
+        content_fields = @dbi.fields.map{|field| 
+          if field.type!="string" || field.name.match(/^_/)
+            nil
+          else
+            field.name.to_sym
+          end
+        }.compact
+        if options[:fields] && options[:fields].any?
+          content_fields = content_fields & options[:fields]
+        end
+        content_fields = content_fields.slice(0..3)
+        #result = self.map_reduce_search(content_fields,query)
+        #debugger
+        #result
+        where_hash = {}
+        content_fields.each do |field|
+          where_hash[field] = /#{Regexp.escape(query.to_s)}/
+        end
+        klass.where(where_hash)
+      end
+
+      #FIXME
+      def map_reduce_search(content_fields,query)
+        keys = "[" + @dbi.fields.map{|f| 
+          f.primary? || f.name.to_s.match(/^_/)  ? nil : "'#{f.name}'"
+        }.compact.join(",").to_s + "]"
+        content_keys = "[" + content_fields.map{|f| "'#{f.name}'"}.join(",").to_s + "]"
+        result_obj = @dbi.fields.map{|f|
+          f.name.to_s.match(/^_/) ? nil : "'#{f.name}': false"
+        }.compact.join(",")
+        result_obj = "{#{result_obj}}"
+        map = %^
+          function(){
+            var doc = #{result_obj};
+            var do_emit = false;
+            for(var k in #{content_keys}){
+              var c_val = this[k];
+              if(c_val && c_val.match(/#{Regexp.escape(query)}/i)){
+                do_emit = true;
+                break;
+              };
+            };
+            if(true){
+              #{keys}.forEach(function(k){
+                doc[k] = this.name;
+              })
+              emit(this.id,doc);
+            };
+          };
+        ^
+        reduce = %^
+          function(key,values){
+
+            return values[values.length-1];
+          };
+        ^
+        self.collection.map_reduce(map,reduce, {:out => "custom_mr", :query => {}})
+      end
+
       def db
         self.klass.db
       end

data/lib/lolita/configuration/list.rb

@@ -18,6 +18,20 @@ module Lolita
         set_default_attributes
       end
 
+      # For details see Lolita::Configuration::Search
+      def search *args, &block
+        if (args && args.any?) || block_given?
+          @search = Lolita::Configuration::Search.new(self.dbi,*args,&block)
+        end
+        @search
+      end
+
+      # Define or return pagination method. This method is used by DBI adapters to delegate domain specific
+      # pagination back to model.
+      # ====Example
+      #   list do 
+      #     pagination_method :paginate_with_profiles
+      #   end
       def pagination_method(value = nil)
         if value
           self.pagination_method = value
@@ -29,8 +43,15 @@ module Lolita
         @pagination_method = value
       end
 
-      def paginate(current_page, request)
-        dbi.paginate(current_page,@per,:request => request, :pagination_method => @pagination_method)
+      # Return page for list display. Method requires two arguments:
+      # * <tt>current_page</tt> - number of current page
+      # * <tt>request (optional) </tt> - request that is passed to adapter that passes this to model when #pagination_method is defined
+      def paginate(current_page, request = nil)
+        page_criteria = dbi.paginate(current_page,@per,:request => request, :pagination_method => @pagination_method)
+        if self.search
+          page_criteria = page_criteria.merge(self.search.run(request.params[:q],request))
+        end
+        page_criteria
       end
 
       # Set columns. Allowed classes are Lolita::Configuration::Columns or