lolita 3.2.0.rc.17 → 3.2.1

data/app/views/lolita/rest/index.html.haml

@@ -1 +1 @@
-= render_component *@component_builder 
+= render_component *@component_builder

data/config/routes.rb

@@ -1,6 +1,6 @@
-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"
-	 match "/lolita/autocomplete_field/:field_class/:field_name" => "lolita/field_data#autocomplete_field", :as => "autocomplete_field"
-end
+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"
+	 match "/lolita/autocomplete_field/:field_class/:field_name" => "lolita/field_data#autocomplete_field", :as => "autocomplete_field"
+end

data/lib/generators/lolita/install_generator.rb

@@ -4,18 +4,16 @@ module Lolita
       source_root File.expand_path("../../templates", __FILE__)
       desc "Create lolita initializer."
 
-      
       def copy_initializer
         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 "lolita:#{module_name.to_s.underscore.gsub("/","_").gsub(/^lolita_/,"")}:install"  rescue nil
+          invoke "lolita:#{module_name.to_s.underscore.gsub("/","_").gsub(/^lolita_/,"")}:install" rescue nil
         end
       end
-     
+
     end
   end
 end

data/lib/generators/lolita/uninstall_generator.rb

@@ -7,19 +7,14 @@ module Lolita
 
       desc "Uninstall Lolita and remove all dependencies"
 
-      def ask_to_continue
-        #ask("Do you want to remove initializer, clear routes and remove Lolita from models? [y]es/[n]o")
-      end
       # Remove lolita initializer file
       def remove_initializer
-        if File.exist?(Rails.root + "config/initializers/lolita.rb")
-          remove_file "config/initializers/lolita.rb"
-        end
+        remove_file "config/initializers/lolita.rb"
       end
 
       # Remove all not-commented lines that begins with lolita_for
       def clear_routes
-        gsub_file File.join(Rails.root,"config","routes.rb"), /^\s*#{ROUTE_NAME}.*/ do |match|
+        gsub_file Rails.root.join("config","routes.rb"), /^\s*#{ROUTE_NAME}.*/ do |match|
           match.clear
           match
         end
@@ -28,7 +23,7 @@ module Lolita
       # Remove configuration include line and lolita block or single lolita method call.
       # Block will be removed correctly if it starts with _do_ and ends with _end_. 
       def clear_models
-        Dir[File.join(Rails.root,"app","models","*.rb")].each do |file_name|
+        Dir[Rails.root.join("app","models","*.rb")].each do |file_name|
           matched = false
           gsub_file file_name, /^\s*include\s+#{INCLUDE_MODULE}.*/ do |match|
             matched = true

data/lib/generators/templates/lolita.rb

@@ -1,17 +1,14 @@
-
 Lolita.setup do |config|
-  # ==> User and authentication configuration
-  # Add one or more of your user classes to Lolita
-  # config.user_classes << MyUser
-  # config.authentication = :authenticate_user!
-  
-  # Define authentication for Lolita controllers.
-  # Call some of your own methods
-  # config.authentication=:is_admin?
-
-  <% if defined?(Devise) %>
-    <% default_user_class = Devise.mappings.keys.first %>
-    config.user_classes << <%= default_user_class.to_s.camelize %>
-    config.authentication=:authenticate_<%= default_user_class %>!
-  <% end %>
-end
+  #= More info about setup - https://github.com/ithouse/lolita/wiki/Lolita-setup
+  #= More info about authentication - https://github.com/ithouse/lolita/wiki/Authorization-and-authentication
+<% if defined?(Devise) && Devise.respond_to?(:mappings) && default_user_class = Devise.mappings.keys.first %>
+  config.user_classes << <%= default_user_class.to_s.camelize %>
+  config.authentication=:authenticate_<%= default_user_class %>!
+<% else %>
+  #= Sample config for Admin user managing Lolita
+  # config.user_classes << Admin
+  # config.authentication = :authenticate_admin!
+<% end %>
+  ## add this if you manage your authorization with CanCan
+  # config.authorization = "CanCan"
+end

data/lib/lolita.rb

@@ -16,7 +16,7 @@ module Lolita
     yield configuration
     self.run(:after_setup)
   end
-  
+
   def self.root
     @@root||=File.expand_path("#{__FILE__}/../..")
   end
@@ -24,7 +24,7 @@ module Lolita
   def self.app_root
     @@app_root||=File.join(File.expand_path("#{__FILE__}/../.."),"app")
   end
-  
+
   def self.method_missing method_name, *args, &block
     self.class_eval <<-LOLITA_SETUP,__FILE__,__LINE__+1
       class << self
@@ -44,7 +44,7 @@ module Lolita
     self.send(:include, Lolita::Hooks)
     self.send(:add_hook, :before_setup, :after_setup, :after_routes_loaded,:before_routes_loaded)
 
-  
+
     if rails?
       load_rails!
     end
@@ -54,7 +54,7 @@ module Lolita
   def self.load_frameworks!
     frameworks.each do |framework|
       begin
-        require framework 
+        require framework
         puts "=> Loading Lolita #{version} with #{framework}"
       rescue Execption => e
         raise "Can't load #{framework}. Check you Gemfile."
@@ -138,5 +138,4 @@ module Lolita
   end
 end
 
-
 Lolita.load!

data/lib/lolita/adapter/active_record.rb

@@ -3,7 +3,7 @@ module Lolita
     class ActiveRecord
 
       include Lolita::Adapter::AbstractAdapter
-      
+
       attr_reader :dbi, :klass
       def initialize(dbi)
         @dbi=dbi
@@ -28,7 +28,7 @@ module Lolita
             association_key
           else
             @association.foreign_key
-          end 
+          end
         end
 
         def association_key
@@ -57,7 +57,7 @@ module Lolita
 
         def macro
           convertator = {
-            :has_many => :many, :has_one => :one, :belongs_to => :one, 
+            :has_many => :many, :has_one => :one, :belongs_to => :one,
             :has_and_belongs_to_many => :many_to_many
           }
           convertator[@association.macro]
@@ -95,7 +95,7 @@ module Lolita
               [association.key.to_s].include?(@name.to_s)
             }
             @association = if possible_association
-              possible_association.last 
+              possible_association.last
             else
               false
             end

data/lib/lolita/adapter/common_helper.rb

@@ -3,7 +3,7 @@ module Lolita
     module CommonHelper
 
       class Record
-        def initialize(adapter,orm_record)
+        def initialize(adapter, orm_record)
           @adapter = adapter
           @record = orm_record
         end
@@ -37,23 +37,33 @@ module Lolita
           @options[:request]
         end
 
-        def set_nested_criteria
+        def nested_criteria
           nested_hsh = params[:nested]
           if params[:nested] && !params[:nested][:association]
             nested_hsh = nested_hsh.reject{|k,v| [:parent,:path].include?(k.to_sym)}
-            @nested_criteria = @adapter.klass.where(nested_hsh)
+            @adapter.klass.where(nested_hsh)
+          else
+            @adapter.klass.unscoped
+          end
+        end
+
+        def ability_criteria
+          if @adapter.klass.respond_to?(:accessible_by)
+            @adapter.klass.accessible_by(current_ability)
+          else
+            @adapter.klass.unscoped
           end
         end
 
-        def set_relation
-          @relation = if params[:nested] && params[:nested][:association]
-            @adapter.find_by_id(hsh[:nested][:id]).send(hsh[:nested][:association])
+        def relation
+          if params[:nested] && params[:nested][:association]
+            @adapter.find(hsh[:nested][:id]).send(hsh[:nested][:association])
           else
             @adapter.klass.unscoped
           end
         end
 
-        def set_custom_criteria
+        def custom_criteria
           if @options[:pagination_method]
             if @options[:pagination_method].respond_to?(:each)
               @options[:pagination_method].each do |method_name|
@@ -65,7 +75,13 @@ module Lolita
             else
               @custom_criteria = pagination_scope_for_klass(@options[:pagination_method],@page,@per,@options)
             end
-            raise ArgumentError, "Didn't generate any scope from #{@options} page:{page} per:#{@per}" unless @custom_criteria
+            unless @custom_criteria
+              raise ArgumentError, "Didn't generate any scope from #{@options} page:{page} per:#{@per}"
+            else
+              @custom_criteria
+            end
+          else
+            @adapter.klass.unscoped
           end
         end
 
@@ -76,23 +92,24 @@ module Lolita
         end
 
         def create_page
-          set_nested_criteria
-          set_relation
-          set_custom_criteria
-
-          page_criteria = if @nested_criteria
-            @relation.merge(@nested_criteria)
-          else
-            @relation
-          end
-          if @custom_criteria
-            page_criteria = @custom_criteria.merge(page_criteria)
-          end
+          page_criteria = relation.merge(nested_criteria).merge(ability_criteria).merge(custom_criteria)
           unless page_criteria.respond_to?(:current_page)
-            page_criteria = page_criteria.page(@page).per(@per)
+            page_criteria = page_criteria.order(sorting).page(@page).per(@per)
           end
           page_criteria
         end
+
+        def current_ability
+          controller = request.headers["action_controller.instance"]
+          if controller && controller.respond_to?(:current_ability)
+            controller.current_ability
+          end
+        end
+
+        def sorting
+          params[:s] ? params[:s].gsub(',',' ').gsub('|',',') : nil
+        end
+
       end
 
       def record(orm_record)
@@ -131,76 +148,33 @@ module Lolita
         self.klass.unscoped.merge(by_id(id)).first
       end
 
-      # def nested_scope_from_hash(hsh)
-      #   nested_hsh ||= (hsh[:nested] || {})
-      #   unless nested_hsh[:association]
-      #     nested_hsh = nested_hsh.reject{|k,v| [:parent,:path].include?(k.to_sym)}
-      #     criteria = klass.where(nested_hsh)
-      #     criteria
-      #   end
-      # end
-
-      # def scope_from_hash(hsh)
-      #   if hsh[:nested] && hsh[:nested][:association]
-      #     klass.find_by_id(hsh[:nested][:id]).send(hsh[:nested][:association])
-      #   end
-      # end
-
-      # This method is used to paginate, main reason is for list and for index action. 
+      # This method is used to paginate, main reason is for list and for index action.
       # Method accepts three arguments
       # <tt>page</tt> - page that should be shown (integer)
       # <tt>per</tt> - how many records there should be in page
-      # <tt>options</tt> - Hash with optional information. 
+      # <tt>options</tt> - Hash with optional information.
       # By default, Lolita::Configuration::List passes request, with current request information.
       # Also it passes <i>:pagination_method</i> that is used to detect if there is special method(-s) in model
       # that should be used for creating page.
-      def paginate(page,per,options ={})
-
-        pagination_builder = PaginationBuilder.new(self,page,per,options)
+      def paginate(page, per, options = {})
+        pagination_builder = PaginationBuilder.new(self, page, per, options)
         pagination_builder.create_page
-        
-        # criteria = options[:request].respond_to?(:params) && nested_scope_from_hash(options[:request].params) || {}
-        # scope = options[:request].respond_to?(:params) && scope_from_hash(options[:request].params) || klass.unscoped
-       
-        # if options[:pagination_method]
-        #   if options[:pagination_method].respond_to?(:each)
-        #     options[:pagination_method].each do |method_name|
-        #       options[:previous_scope] = scope
-        #       if new_criteria = pagination_criteria_for_klass(method_name,page,per,options)
-        #         criteria = criteria ? criteria.merge(new_criteria) : new_criteria
-        #       end
-        #     end
-        #   else
-        #     new_criteria = pagination_scope_for_klass(options[:pagination_method],page,per,options)
-        #     criteria = if new_criteria.respond_to?(:current_page) #already have per and page
-        #       new_criteria
-        #     else
-        #       criteria && criteria.merge(new_criteria) || new_criteria
-        #     end
-        #   end
-        #   raise ArgumentError, "Didn't generate any scope from #{options} page:{page} per:#{per}" unless criteria
-        #   criteria
-        # else
-        #   scope.merge(criteria).page(page).per(per)
-        # end
       end
 
-     
-
       def switch_record_state(record, state = nil)
         set_state_for(record)
         if state
-          record.send(:"#{state}_state!") 
+          record.send(:"#{state}_state!")
         elsif !record.have_state?
           if record.new_record?
             record.create_state!
-          else 
+          else
             record.update_state!
           end
         end
         record
       end
-      
+
       def set_state_for(record)
         unless record.respond_to?(:read_state!)
           class << record

data/lib/lolita/adapter/field_helper.rb

@@ -1,19 +1,19 @@
-module Lolita
-  module Adapter
-    module FieldHelper
-      def technical?
-        if self.name.to_s.match(/^created_at|updated_at|type$/)
-          true
-        elsif self.primary?
-          true
-        elsif adapter.klass.respond_to?(:uploaders)
-          adapter.klass.uploaders.keys.include?(name.to_sym)
-        end
-      end
-
-      def content?
-        !technical?
-      end
-    end
-  end
+module Lolita
+  module Adapter
+    module FieldHelper
+      def technical?
+        if self.name.to_s.match(/^created_at|updated_at|type$/)
+          true
+        elsif self.primary?
+          true
+        elsif adapter.klass.respond_to?(:uploaders)
+          adapter.klass.uploaders.keys.include?(name.to_sym)
+        end
+      end
+
+      def content?
+        !technical?
+      end
+    end
+  end
 end

data/lib/lolita/adapter/mongoid.rb

@@ -3,7 +3,7 @@ module Lolita
     class Mongoid
 
       include Lolita::Adapter::AbstractAdapter
-      
+
       attr_reader :dbi, :klass
       def initialize(dbi)
         @dbi=dbi
@@ -41,7 +41,7 @@ module Lolita
 
         def macro
           convertator = {
-            :references_many => :many, :references_one => :one, :referenced_in => :one, 
+            :references_many => :many, :references_one => :one, :referenced_in => :one,
             :references_and_referenced_in_many => :many_to_many, :embeds_one => :one, :embeds_many => :many
           }
           convertator[@association.macro]
@@ -79,7 +79,7 @@ module Lolita
               [association.key.to_s].include?(@name.to_s)
             }
             @association = if possible_association
-              possible_association.last 
+              possible_association.last
             else
               false
             end
@@ -99,8 +99,8 @@ module Lolita
 
         def type_cast(type)
           if type.to_s=="Object" || type.to_s.split("::").last == "Object"
-            "string" 
-          elsif type.to_s.match(/::/) 
+            "string"
+          elsif type.to_s.match(/::/)
             type.to_s.split("::").last
           else
             type.to_s.underscore
@@ -144,7 +144,7 @@ module Lolita
 
       def search(query, options = {})
         unless query.blank?
-          content_fields = @dbi.fields.map{|field| 
+          content_fields = @dbi.fields.map{|field|
             if field.type!="string" || field.name.match(/^_/)
               nil
             else
@@ -155,7 +155,7 @@ module Lolita
             content_fields = content_fields & options[:fields]
           end
           content_fields = content_fields.slice(0..3)
-       
+
           where_hash = {}
           content_fields.each do |field|
             where_hash[field] = /#{Regexp.escape(query.to_s)}/
@@ -168,7 +168,7 @@ module Lolita
 
       #FIXME
       def map_reduce_search(content_fields,query)
-        keys = "[" + @dbi.fields.map{|f| 
+        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 + "]"