krasivotokak-espresso 0.0.7 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/espresso.gemspec +1 -1
- data/lib/espresso/model.rb +2 -2
- metadata +1 -1
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.8
|
data/espresso.gemspec
CHANGED
data/lib/espresso/model.rb
CHANGED
@@ -23,7 +23,7 @@ module Espresso
|
|
23
23
|
# @todo Add an options to paginating
|
24
24
|
def paginate_found(page = nil, query = nil, simple_query = nil)
|
25
25
|
query ||= {}
|
26
|
-
query.merge(parse_simple_query(simple_query)) if simple_query.present?
|
26
|
+
query.merge!(parse_simple_query(simple_query)) if simple_query.present?
|
27
27
|
@search = search(query)
|
28
28
|
@results = @search.paginate(:page => page)
|
29
29
|
[@search, @results]
|
@@ -58,7 +58,7 @@ module Espresso
|
|
58
58
|
|
59
59
|
module InstanceMethods
|
60
60
|
def to_s
|
61
|
-
send(
|
61
|
+
send(self.class.name_field).to_s
|
62
62
|
end
|
63
63
|
|
64
64
|
protected
|