espresso 0.0.16 → 0.1.0

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.name = "espresso"
     gem.summary = %Q{Rails extender to simplify rails development}
     gem.description = %Q{Useful templates for controller and model functions}
-    gem.email = "rotuka@rotuka.com"
+    gem.email = "rotuka@tokak.ru"
     gem.homepage = "http://github.com/krasivotokak/espresso"
     gem.authors = ["Alexander Semyonov"]
     gem.add_development_dependency "thoughtbot-shoulda"

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.1.0

data/espresso.gemspec

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

data/lib/espresso/helpers.rb

@@ -3,12 +3,22 @@ module Espresso
     include WillPaginate::ViewHelpers
 
     def simple_search
-      form_tag(url_for(:action => :index), :method => :get, :class => 'b_search b_search-simple') do
-        inform = returning '' do |result|
-          result << text_field_tag(:q, params[:q])
-          result << submit_tag(t('krasivotokak.espresso.find', :default => 'Find!'), :class => 'submit')
-        end
-        concat inform
+      returning '' do |form|
+        form << form_tag(url_for(:action => :index), :method => :get)
+        form << content_tag(:table, :class => 'b_search') do
+                  content_tag(:tr) do
+                    returning '' do |result|
+                      result << content_tag(:td,
+                                            content_tag(:div, text_field_tag(:q, params[:q], :type => 'search'), :class => 'b_input'),
+                                            :class => 'input')
+                      result << content_tag(:td,
+                                            submit_tag(t('krasivotokak.espresso.find', :default => 'Find!'), :class => 'submit'),
+                                            :class => 'button')
+                    end
+                  end
+                end
+        form << yield if block_given?
+        form << '</form>'
       end
     end
 

data/lib/espresso/model.rb

@@ -17,9 +17,9 @@ module Espresso
       # @return [Array] searchlogic object and collection of results
       #
       # @todo Add an options to paginating
-      def paginate_found(page = nil, query = nil, simple_query = nil)
+      def paginate_found(page = nil, query = {}, simple_query = nil)
         query ||= {}
-        query.merge!(parse_simple_query(simple_query)) if simple_query.present?
+        query.merge!(self.parse_simple_query(simple_query)) if simple_query
         @search = search(query)
         @results = @search.paginate(:page => page)
         [@search, @results]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: espresso
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 +04:00
+date: 2009-09-16 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
         version: 2.3.11
     version: 
 description: Useful templates for controller and model functions
-email: rotuka@rotuka.com
+email: rotuka@tokak.ru
 executables: []
 
 extensions: []