lolita 3.4.2 → 3.4.3

data/lib/lolita/adapter/common_helper.rb

@@ -1,221 +1,221 @@
-module Lolita
-  module Adapter
-    module CommonHelper
-
-      class Record
-        def initialize(adapter, orm_record)
-          @adapter = adapter
-          @record = orm_record
-        end
-
-        def title
-          if @record.respond_to?(:title)
-            @record.title
-          elsif @record.respond_to?(:name)
-            @record.name
-          elsif content_field = @adapter.fields.detect{|f| f.type.to_s=="string"}
-            @record.send(content_field.name)
-          else
-            "#{@record.class.lolita_model_name.human} #{@record.id}"
-          end
-        end
-      end
-
-      class PaginationBuilder
-        def initialize adapter,page,per,options
-          @adapter = adapter
-          @page = page
-          @per = per
-          @options = options || {}
-        end
-
-        def params
-          request.respond_to?(:params) && request.params || {}
-        end
-
-        def request
-          @options[:request]
-        end
-
-        def nested_criteria
-          nested_hsh = params[:nested]
-          @nested_criteria ||= if params[:nested] && !params[:nested][:association]
-            nested_hsh = nested_hsh.reject{|k,v| [:parent,:path].include?(k.to_sym)}
-            @adapter.klass.where(nested_hsh)
-          else
-            nil
-          end
-        end
-
-        def ability_criteria
-          @ability_criteria ||= if @adapter.klass.respond_to?(:accessible_by)
-            @adapter.klass.accessible_by(current_ability)
-          elsif current_ability.respond_to?(:scope)
-            current_ability.scope
-          else
-            nil
-          end
-        end
-
-        def relation
-          if params[:nested] && params[:nested][:association]
-            @adapter.find(hsh[:nested][:id]).send(hsh[:nested][:association])
-          else
-            @adapter.klass.unscoped
-          end
-        end
-
-        def custom_criteria
-          @custom_criteria ||= if @options[:pagination_method]
-            pagination_scope_for_klass(@options[:pagination_method], @page, @per, @options)
-          else
-            nil
-          end
-        end
-
-        def pagination_scope_for_klass(method_name, page, per, options)
-          if @adapter.klass.respond_to?(method_name)
-            @adapter.klass.send(method_name,page,per,options)
-          end
-        end
-
-        def create_page
-          page_criteria = ability_criteria ? relation.merge(ability_criteria) : relation
-          page_criteria = if nested_criteria
-            page_criteria.merge(nested_criteria)
-          elsif custom_criteria
-            custom_criteria.merge(page_criteria)
-          else
-            page_criteria
-          end
-          unless page_criteria.respond_to?(:current_page)
-            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)
-        Record.new(self,orm_record)
-      end
-
-      # Return all association class names
-      def associations_class_names
-        self.associations.map{|name,association|
-          association.class_name
-        }
-      end
-
-      def association_by_klass(given_klass)
-        associations.select{|name,association|
-          association.klass == given_klass
-        }.values.first
-      end
-
-      def filter attributes={}
-        klass.where(attributes.reject{|k,v| v.blank? })
-      end
-
-      # Detect if class reflect on association by name
-      def reflect_on_association(name)
-        if orm_association = klass.reflect_on_association(name)
-          self.class.const_get(:Association).new(orm_association,self)
-        end
-      end
-
-      def by_id(id)
-        klass.where(klass.primary_key => id)
-      end
-
-      def find_by_id(id)
-        self.klass.unscoped.merge(by_id(id)).first
-      end
-
-      # 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.
-      # 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)
-        pagination_builder.create_page
-      end
-
-      def switch_record_state(record, state = nil)
-        set_state_for(record)
-        if state
-          record.send(:"#{state}_state!")
-        elsif !record.have_state?
-          if record.new_record?
-            record.create_state!
-          else
-            record.update_state!
-          end
-        end
-        record
-      end
-
-      def set_state_for(record)
-        unless record.respond_to?(:read_state!)
-          class << record
-
-            def set_state(new_state)
-              @state_set = true
-              @state = new_state
-            end
-
-            def have_state?
-              @state_set
-            end
-
-            def read_state!
-              set_state :read
-            end
-
-            def create_state!
-              set_state :create
-            end
-
-            def update_state!
-              set_state :update
-            end
-
-            def state
-              set_state(:read) unless @state
-              @state
-            end
-
-            def in_read_state?
-              state == :read
-            end
-
-            def in_create_state?
-              state == :create
-            end
-
-            def in_update_state?
-              state == :update
-            end
-          end
-        end
-        record
-      end
-
-    end
-  end
-end
+module Lolita
+  module Adapter
+    module CommonHelper
+
+      class Record
+        def initialize(adapter, orm_record)
+          @adapter = adapter
+          @record = orm_record
+        end
+
+        def title
+          if @record.respond_to?(:title)
+            @record.title
+          elsif @record.respond_to?(:name)
+            @record.name
+          elsif content_field = @adapter.fields.detect{|f| f.type.to_s=="string"}
+            @record.send(content_field.name)
+          else
+            "#{@record.class.lolita_model_name.human} #{@record.id}"
+          end
+        end
+      end
+
+      class PaginationBuilder
+        def initialize adapter,page,per,options
+          @adapter = adapter
+          @page = page
+          @per = per
+          @options = options || {}
+        end
+
+        def params
+          request.respond_to?(:params) && request.params || {}
+        end
+
+        def request
+          @options[:request]
+        end
+
+        def nested_criteria
+          nested_hsh = params[:nested]
+          @nested_criteria ||= if params[:nested] && !params[:nested][:association]
+            nested_hsh = nested_hsh.reject{|k,v| [:parent,:path].include?(k.to_sym)}
+            @adapter.klass.where(nested_hsh)
+          else
+            nil
+          end
+        end
+
+        def ability_criteria
+          @ability_criteria ||= if @adapter.klass.respond_to?(:accessible_by)
+            @adapter.klass.accessible_by(current_ability)
+          elsif current_ability.respond_to?(:scope)
+            current_ability.scope
+          else
+            nil
+          end
+        end
+
+        def relation
+          if params[:nested] && params[:nested][:association]
+            @adapter.find(hsh[:nested][:id]).send(hsh[:nested][:association])
+          else
+            @adapter.klass.unscoped
+          end
+        end
+
+        def custom_criteria
+          @custom_criteria ||= if @options[:pagination_method]
+            pagination_scope_for_klass(@options[:pagination_method], @page, @per, @options)
+          else
+            nil
+          end
+        end
+
+        def pagination_scope_for_klass(method_name, page, per, options)
+          if @adapter.klass.respond_to?(method_name)
+            @adapter.klass.send(method_name,page,per,options)
+          end
+        end
+
+        def create_page
+          page_criteria = ability_criteria ? relation.merge(ability_criteria) : relation
+          page_criteria = if nested_criteria
+            page_criteria.merge(nested_criteria)
+          elsif custom_criteria
+            custom_criteria.merge(page_criteria)
+          else
+            page_criteria
+          end
+          unless page_criteria.respond_to?(:current_page)
+            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)
+        Record.new(self,orm_record)
+      end
+
+      # Return all association class names
+      def associations_class_names
+        self.associations.map{|name,association|
+          association.class_name
+        }
+      end
+
+      def association_by_klass(given_klass)
+        associations.select{|name,association|
+          association.klass == given_klass
+        }.values.first
+      end
+
+      def filter attributes={}
+        klass.where(attributes.reject{|k,v| v.blank? })
+      end
+
+      # Detect if class reflect on association by name
+      def reflect_on_association(name)
+        if orm_association = klass.reflect_on_association(name)
+          self.class.const_get(:Association).new(orm_association,self)
+        end
+      end
+
+      def by_id(id)
+        klass.where(klass.primary_key => id)
+      end
+
+      def find_by_id(id)
+        self.klass.unscoped.merge(by_id(id)).first
+      end
+
+      # 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.
+      # 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)
+        pagination_builder.create_page
+      end
+
+      def switch_record_state(record, state = nil)
+        set_state_for(record)
+        if state
+          record.send(:"#{state}_state!")
+        elsif !record.have_state?
+          if record.new_record?
+            record.create_state!
+          else
+            record.update_state!
+          end
+        end
+        record
+      end
+
+      def set_state_for(record)
+        unless record.respond_to?(:read_state!)
+          class << record
+
+            def set_state(new_state)
+              @state_set = true
+              @state = new_state
+            end
+
+            def have_state?
+              @state_set
+            end
+
+            def read_state!
+              set_state :read
+            end
+
+            def create_state!
+              set_state :create
+            end
+
+            def update_state!
+              set_state :update
+            end
+
+            def state
+              set_state(:read) unless @state
+              @state
+            end
+
+            def in_read_state?
+              state == :read
+            end
+
+            def in_create_state?
+              state == :create
+            end
+
+            def in_update_state?
+              state == :update
+            end
+          end
+        end
+        record
+      end
+
+    end
+  end
+end

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