flare 1.2.0 → 1.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/flare.gemspec +2 -2
- data/lib/flare/session.rb +19 -17
- data/lib/flare.rb +8 -0
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.3.0
|
data/flare.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{flare}
|
8
|
-
s.version = "1.
|
8
|
+
s.version = "1.3.0"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Michael Dwan"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-02-10}
|
13
13
|
s.description = %q{This needs to get updated}
|
14
14
|
s.email = %q{mpdwan@gmail.com}
|
15
15
|
s.extra_rdoc_files = [
|
data/lib/flare/session.rb
CHANGED
@@ -61,6 +61,8 @@ module Flare
|
|
61
61
|
def execute(*args)
|
62
62
|
options = args.extract_options!
|
63
63
|
|
64
|
+
options.assert_valid_keys(:q, :fq, :types, :page, :per_page, :limit, :fl, :sort, :facet)
|
65
|
+
|
64
66
|
options.reverse_merge!({
|
65
67
|
:page => 1,
|
66
68
|
:per_page => PER_PAGE,
|
@@ -68,29 +70,28 @@ module Flare
|
|
68
70
|
:fields => '* score',
|
69
71
|
})
|
70
72
|
|
71
|
-
options.assert_valid_keys(:filter, :types, :page, :per_page, :limit, :fields, :order, :facet)
|
72
|
-
|
73
73
|
args << '*:*' if args.reject{|x| x.blank?}.empty?
|
74
74
|
|
75
75
|
query = {
|
76
|
-
:q => args
|
77
|
-
:fq => Array(options[:
|
76
|
+
:q => args.blank?,
|
77
|
+
:fq => Array(options[:fq]).flatten,
|
78
78
|
:fl => options[:fields],
|
79
79
|
:start => start = (options[:page] -1) * options[:per_page],
|
80
|
-
:rows => options[:per_page]
|
80
|
+
:rows => options[:per_page],
|
81
|
+
:sort => options[:sort]
|
81
82
|
}
|
82
83
|
|
83
|
-
if options[:
|
84
|
-
query[
|
85
|
-
query[
|
86
|
-
query[
|
87
|
-
query[
|
88
|
-
query["facet.limit"] = options[:
|
84
|
+
if options[:facet]
|
85
|
+
query["facet"] = true
|
86
|
+
query["facet.field"] = options[:facet][:fields]
|
87
|
+
query["facet.query"] = options[:facet][:queries]
|
88
|
+
query["facet.mincount"] = options[:facet][:mincount] || 1
|
89
|
+
query["facet.limit"] = options[:facet][:limit]
|
89
90
|
|
90
|
-
query["facet.missing"] = @params[:
|
91
|
-
query["facet.mincount"] = @params[:
|
92
|
-
query["facet.prefix"] = @params[:
|
93
|
-
query["facet.offset"] = @params[:
|
91
|
+
query["facet.missing"] = @params[:facet][:missing]
|
92
|
+
query["facet.mincount"] = @params[:facet][:mincount]
|
93
|
+
query["facet.prefix"] = @params[:facet][:prefix]
|
94
|
+
query["facet.offset"] = @params[:facet][:offset]
|
94
95
|
end
|
95
96
|
|
96
97
|
|
@@ -98,11 +99,11 @@ module Flare
|
|
98
99
|
query[:fq] << Array(options[:types]).map {|type| "type:#{type}"}.join(" OR ")
|
99
100
|
end
|
100
101
|
|
101
|
-
|
102
|
+
Flare.log(<<-SOLR.squish)
|
102
103
|
\e[4;32mSolr Query:\e[0;1m
|
103
104
|
#{query[:q].join(', ')}
|
104
105
|
#{"(#{query[:fq].join(' AND ')})," if query[:fq] }
|
105
|
-
sort: #{query[:
|
106
|
+
sort: #{query[:sort]}
|
106
107
|
start: #{query[:start]},
|
107
108
|
rows: #{query[:rows]}
|
108
109
|
SOLR
|
@@ -111,6 +112,7 @@ module Flare
|
|
111
112
|
response[:request] = query
|
112
113
|
response[:request][:page] = options[:page]
|
113
114
|
response[:request][:per_page] = options[:per_page]
|
115
|
+
|
114
116
|
response.with_indifferent_access
|
115
117
|
end
|
116
118
|
|
data/lib/flare.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: flare
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Dwan
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2010-
|
12
|
+
date: 2010-02-10 00:00:00 -06:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|