espresso 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/espresso.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{espresso}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2009-09-16}
+  s.date = %q{2009-10-05}
   s.description = %q{Useful templates for controller and model functions}
   s.email = %q{rotuka@tokak.ru}
   s.extra_rdoc_files = [

data/lib/espresso/model.rb

@@ -3,9 +3,13 @@ require 'searchlogic'
 module Espresso
   # @author Alexander Semyonov
   module Model
+    unloadable
+
     def self.included(model)
-      model.extend ClassMethods
-      model.send :include, InstanceMethods
+      model.class_eval do
+        extend ClassMethods
+        include InstanceMethods
+      end
     end
 
     module ClassMethods
@@ -24,6 +28,7 @@ module Espresso
         @results = @search.paginate(:page => page)
         [@search, @results]
       end
+      alias_method :search_results, :paginate_found
 
       # Make searchlogic query from simple query option
       # Needed to be reimplemented in subclasses

data/lib/espresso/objects_controller.rb

@@ -28,7 +28,7 @@ module Espresso
     # @return [WillPaginate::Collection] collection of objects
     def collection
       unless (result = get_collection_ivar).present?
-        @search, result = end_of_association_chain.paginate_found(params[:page], params[:query], params[:q])
+        @search, result = end_of_association_chain.search_results(params[:page], params[:query], params[:q])
         set_collection_ivar(result)
       end
       result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: espresso
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +04:00
+date: 2009-10-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency