lolita 3.1.17 → 3.1.18

data/VERSION

@@ -1 +1 @@
-3.1.17
+3.1.18

data/app/controllers/lolita/field_data_controller.rb

@@ -0,0 +1,36 @@
+class Lolita::FieldDataController < ApplicationController
+  include Lolita::Controllers::UserHelpers
+
+  before_filter :authenticate_lolita_user!
+  before_filter :find_field, :except => [:autocomplete_field]
+
+  def array_polymorphic
+    klass = params[:class].camelize.constantize
+    data_collection = @field.polymorphic_association_values(:klass => klass)
+    @id = params[:id].to_s.to_i
+    @collection = [[]]+data_collection
+    render_component(*@field.build(:state => :options_for_select, :collection => @collection, :id => @id))
+  end
+
+  def find_field
+    @field = params[:field_class].camelize.constantize.lolita.tabs.fields.detect{|field|
+      field.name.to_s == params[:name].to_s
+    }
+  end
+
+	def autocomplete_field
+    klass = params[:field_class].camelize.constantize
+    field = klass.lolita.tabs.fields.detect{|field| field.name.to_s == params[:field_name]}
+    data = if field
+      (field.search || field.create_search(true)).run(params[:term],request).map do |record|
+        {
+          :id => record.id,
+          :value => record.send(field.current_text_method(field.association.klass)),
+          :name => "#{params[:field_class].downcase}[#{params[:field_name].singularize}_ids][]",
+          :delete_link => I18n.t("lolita.shared.delete")
+        }
+      end
+    end
+    render :json => data || {}
+	end
+end

data/app/controllers/lolita/info_controller.rb

@@ -1,9 +1,16 @@
 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?
-      return redirect_to(lolita_resources_path(Lolita.mappings.values.first))
+      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
     end
     render :layout => false
   end
@@ -16,6 +23,10 @@ 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,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)
@@ -125,6 +130,6 @@ class Lolita::RestController < ApplicationController
   end
 
   def page
-    resource_class.lolita.list.paginate(params[:page], :params => params)
+    resource_class.lolita.list.paginate(params[:page],request)
   end
 end

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
@@ -9,4 +8,16 @@ 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/_display.html.erb

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

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

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

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

@@ -1,4 +1,7 @@
- <% 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) %>
+<% 
+  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) %>

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

@@ -1,4 +1,4 @@
-<% if field.association_type == :one %>
+<% if field.association && field.association.macro == :one %>
   <%= render_component :"lolita/configuration/field/array/select", :display, :field=>field %>
 <% else %>
   <%= render_component :"lolita/configuration/field/array/habtm", :display, :field=>field %>

data/app/views/components/lolita/configuration/field/array/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, :field_name => 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/array/checkbox/_display.html.haml

@@ -0,0 +1,8 @@
+- ids_method = field.name.to_s.match(/_ids$/) ? field.name : "#{field.name.to_s.singularize}_ids"
+= hidden_field_tag "#{resource_name}[#{ids_method}][]",""
+- field.view_values(self).each do |value|
+  - editors = resource.send(:"#{ids_method}")
+  .habtm-container
+    = label_tag "#{resource_name}_#{field.name}_#{value.last}",value.first, :class => "habtm-label"
+    = check_box_tag "#{resource_name}[#{ids_method}][]", value.last, resource.send("#{ids_method}").include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
+.clear

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

@@ -0,0 +1,6 @@
+- record = tab_form.object
+- type_name = field.association.name.to_s + "_type"
+- id_name = field.association.name.to_s + "_id"
+
+= tab_form.select(type_name,field.polymorphic_classes, {:include_blank => true},{:"data-polymorphic-url" => array_field_data_collector_path(:name => field.name, :field_class => record.class.to_s, :class => "klass", :id =>record.send(id_name) || 0) })
+= tab_form.select(id_name, field.polymorphic_association_values(:record => record))

data/app/views/components/lolita/configuration/field/array/polymorphic/_options_for_select.html.haml

@@ -0,0 +1 @@
+= options_for_select(collection,id)

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)),
-            {:include_blank => field.include_blank},
+            (field.options || {}).merge({:include_blank => field.include_blank}),
             field.html_options || {} %>

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

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

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

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

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

@@ -5,7 +5,7 @@
   <% end %>
 <% end %>
 
-<%= tab_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
+<%= 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(

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/nested_form/_display.html.erb

@@ -1,12 +1,14 @@
-<div class="nested_form" id=<%= "nested_form_#{nested_form.__id__}" %>>
+<div class="nested_form <%=nested_form.field_style%>" 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 %>
-	<%= 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 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>
   <% 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/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,22 @@
     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/components/lolita/shared/_right_sidebar.html.erb

@@ -4,11 +4,6 @@
       <h1><%= t "lolita.tabs.save" %></h1>
       <div class="arrow"></div>
     </div>
-    <div class="save black">
-      <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>
-    </div>
+    <%= render_component "lolita/shared", :save_button%>
   </div>
 </div>

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

@@ -0,0 +1,6 @@
+ <div class="save black">
+  <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>
+</div>

data/config/locales/en.yml

@@ -22,4 +22,12 @@ en:
       confirm: Are you sure you want to delete record?
     filter:
       apply_button: Apply
-      include_blank_by_title: " -- Filter by %{title} -- "
+      include_blank_by_title: " -- Filter by %{title} -- "
+    search: "Search"
+  views:
+    pagination:
+      previous: "« Previous"
+      next: "Next »"
+      last: "Last"
+      first: "First"
+      truncate: "..."

data/config/locales/lv.yml

@@ -7,7 +7,7 @@ lv:
       edit: Labot
       delete: Dzēst
       and: un
-      powered: Darbojas ar Lolita (2010-%{year})
+      powered: Tiek darbināta ar Lolita (2010-%{year})
     nested_form:
       add: "Pievienot %{resource_name}"
     tabs:
@@ -23,10 +23,11 @@ lv:
     filter:
       apply_button: Pielietot
       include_blank_by_title: " -- Filtrēt pēc %{title} -- "
+    search: "Meklēt"
   views:
     pagination:
-      previous: "« Atpakaļ"
-      next: "Uz priekšu »"
-      last: "Beigas"
-      first: "Sākums"
+      previous: "« Iepriekšējā"
+      next: "Nākošā »"
+      last: "Pēdējā"
+      first: "Pirmā"
       truncate: "..."

data/config/routes.rb

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

data/lib/lolita.rb

@@ -1,29 +1,23 @@
 
 $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 LOLITA_VERSION=File.read(File.expand_path("../../VERSION",__FILE__)).gsub(/[^.\w]/,"")
-puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""}"
-
-# TODO should allow run lolita seperated
-# unless (["-d","--debug"] & ARGV).empty?
-#   require "ruby-debug"
-#   Debugger.settings[:autoeval]=true
-# else
-#   unless self.respond_to?(:debugger)
-#     def debugger
-#       warn "Debugger called at #{caller.first} was ignored, run lolita with -d to attatch debugger."
-#     end
-#   end
-# end
+FRAMEWORK = if defined?(Rails)
+  " with Rails #{::Rails::VERSION::STRING}"
+end
+puts "=> Lolita #{LOLITA_VERSION} starting#{FRAMEWORK}"
 
+require "rubygems"
 require 'abstract'
-require "base64"
-unless defined?(ActiveSupport)
-  require 'active_support/core_ext/numeric/time'
-  require 'active_support/core_ext/date_time/conversions'
-  require 'active_support/concern'
-  require 'active_support/callbacks'
-  require 'active_support/dependencies'
-end
+
+require 'active_support'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/concern'
+require 'active_support/callbacks'
+require 'active_support/dependencies'
+require 'active_support/inflector'
+
+
 require 'lolita/errors'
 require "lolita/hooks"
 # Require all ruby extensions
@@ -39,6 +33,7 @@ module Lolita
   autoload(:VERSION,'lolita/version')
   autoload(:ObservedArray,'lolita/observed_array')
   autoload(:Builder,'lolita/builder')
+  autoload(:ControllerAdditions,'lolita/controller_additions')
   module Builder
     autoload(:Custom, 'lolita/builder')
   end
@@ -49,6 +44,7 @@ module Lolita
   end
 
   module Adapter
+    autoload :FieldHelper, 'lolita/adapter/field_helper'
     autoload :AbstractAdapter, 'lolita/adapter/abstract_adapter'
     autoload :ActiveRecord, 'lolita/adapter/active_record'
     autoload :Mongoid, 'lolita/adapter/mongoid'
@@ -62,34 +58,36 @@ module Lolita
     autoload :NamedHook, "lolita/hooks/named_hook"
   end
  
-
+  # Keep all configuration classes and modules, that is used to configure classes with lolita.
   module Configuration
-    autoload :Helper, 'lolita/configuration/helper'
-    autoload :Factory, 'lolita/configuration/factory'
+
     autoload :Base, 'lolita/configuration/base'
     autoload :Column, 'lolita/configuration/column'
     autoload :Columns, 'lolita/configuration/columns'
     autoload :Fields, 'lolita/configuration/fields'
     autoload :FieldSet, 'lolita/configuration/field_set'
     autoload :List, 'lolita/configuration/list'
-    autoload :Page, 'lolita/configuration/page'
     autoload :Tabs, 'lolita/configuration/tabs'
     autoload :Filter, 'lolita/configuration/filter'
     autoload :NestedForm, 'lolita/configuration/nested_form'
+    autoload :Search, 'lolita/configuration/search'
 
+    # Module contains classes that is used to create specific type class based on given arguments.
+    module Factory
+      autoload :Field, "lolita/configuration/factory/field"
+      autoload :Tab, "lolita/configuration/factory/tab"
+    end
+
+    # Contains all supported field types. Class name is Lolita::Configuration::Field::[FieldType]
     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
+      autoload :Base,'lolita/configuration/field'
+      Dir["#{File.dirname(__FILE__)}/lolita/configuration/field/**/*.*"].each do |path|
+        base_name=File.basename(path,".rb")
+        autoload :"#{base_name.camelize}", "lolita/configuration/field/#{base_name}"
       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|
@@ -101,6 +99,9 @@ module Lolita
     
     def self.included(base)
       base.class_eval do
+        include Lolita::Hooks
+        add_hook :after_lolita_loaded
+
         extend ClassMethods
         def lolita
           self.class.lolita
@@ -112,6 +113,7 @@ module Lolita
       def lolita(&block)
         Lolita::LazyLoader.lazy_load(self,:@lolita,Lolita::Configuration::Base,self,&block)
       end
+      
       def lolita=(value)
         if value.is_a?(Lolita::Configuration::Base)
           @lolita=value
@@ -131,7 +133,7 @@ module Lolita
     autoload :UserHelpers, 'lolita/controllers/user_helpers'
     autoload :UrlHelpers, 'lolita/controllers/url_helpers'
     autoload :ComponentHelpers, 'lolita/controllers/component_helpers'
-    autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
+    autoload :AuthorizationHelpers, 'lolita/controllers/authorization_helpers'
   end
 
   module Navigation
@@ -146,6 +148,10 @@ module Lolita
     end
   end
 
+  module Search
+    autoload :Simple, 'lolita/search/simple'
+  end
+
   @@scopes={}
 
   def self.scope name=nil
@@ -173,6 +179,13 @@ module Lolita
   end
   
   def self.method_missing method_name, *args, &block
+    self.class_eval <<-LOLITA_SETUP,__FILE__,__LINE__+1
+      class << self
+        def #{method_name}(*args,&block)
+          scope.send(:#{method_name},*args,&block)
+        end
+      end
+    LOLITA_SETUP
     scope.send(method_name,*args,&block)
   end
 
@@ -187,5 +200,9 @@ module Lolita
 end
 
 if Lolita.rails3?
+  require "base64"
+  require 'kaminari'
+  # require 'tinymce-rails'
+  # require 'jquery-rails'
   require 'lolita/rails/all'
 end