tripod 0.7.16 → 0.7.17

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.
Files changed (5) hide show
  1. data/lib/tripod/sparql_query.rb +3 -1
  2. data/lib/tripod/version.rb +1 -1
  3. data/spec/tripod/criteria_execution_spec.rb +3 -1
  4. data/spec/tripod/sparql_query_spec.rb +6 -2
  5. metadata +21 -21
data/lib/tripod/sparql_query.rb CHANGED
@@ -49,7 +49,9 @@ module Tripod
49
49
  def as_count_query_str
50
50
  check_subqueryable!
51
51
 
52
- count_query = "SELECT (COUNT(*) as ?tripod_count_var) { #{self.body} }"
52
+ count_query = "SELECT (COUNT(*) as ?tripod_count_var) {
53
+ #{self.body}
54
+ }"
53
55
  count_query = "#{self.prefixes} #{count_query}" if self.prefixes
54
56
 
55
57
  # just returns the string representing the count query for this query.
data/lib/tripod/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tripod
2
- VERSION = "0.7.16"
2
+ VERSION = "0.7.17"
3
3
  end
data/spec/tripod/criteria_execution_spec.rb CHANGED
@@ -190,7 +190,9 @@ describe Tripod::Criteria do
190
190
  end
191
191
 
192
192
  it "should execute the right Sparql" do
193
- sparql = "SELECT (COUNT(*) as ?tripod_count_var) { SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } } LIMIT 10 OFFSET 20 }"
193
+ sparql = "SELECT (COUNT(*) as ?tripod_count_var) {
194
+ SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } } LIMIT 10 OFFSET 20
195
+ }"
194
196
  Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
195
197
  Person.all.limit(10).offset(20).count
196
198
  end
data/spec/tripod/sparql_query_spec.rb CHANGED
@@ -110,14 +110,18 @@ WHERE abc # bar
110
110
  context 'without prefixes' do
111
111
  it "should return a new SparqlQuery with the original query wrapped in a count" do
112
112
  q = Tripod::SparqlQuery.new('SELECT ?s WHERE { ?s ?p ?o }')
113
- q.as_count_query_str.should == 'SELECT (COUNT(*) as ?tripod_count_var) { SELECT ?s WHERE { ?s ?p ?o } }'
113
+ q.as_count_query_str.should == 'SELECT (COUNT(*) as ?tripod_count_var) {
114
+ SELECT ?s WHERE { ?s ?p ?o }
115
+ }'
114
116
  end
115
117
  end
116
118
 
117
119
  context 'with prefixes' do
118
120
  it "should move the prefixes to the start" do
119
121
  q = Tripod::SparqlQuery.new('PREFIX e: <http://example.com> SELECT ?s WHERE { ?s ?p ?o }')
120
- q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT (COUNT(*) as ?tripod_count_var) { SELECT ?s WHERE { ?s ?p ?o } }'
122
+ q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT (COUNT(*) as ?tripod_count_var) {
123
+ SELECT ?s WHERE { ?s ?p ?o }
124
+ }'
121
125
  end
122
126
  end
123
127
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tripod
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.16
4
+ version: 0.7.17
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -15,7 +15,7 @@ date: 2013-07-03 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rest-client
18
- requirement: &70324956191020 !ruby/object:Gem::Requirement
18
+ requirement: &70302463392660 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
23
23
  version: '0'
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *70324956191020
26
+ version_requirements: *70302463392660
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
- requirement: &70324956188660 !ruby/object:Gem::Requirement
29
+ requirement: &70302463391820 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ~>
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: '3.2'
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *70324956188660
37
+ version_requirements: *70302463391820
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: equivalent-xml
40
- requirement: &70324956186680 !ruby/object:Gem::Requirement
40
+ requirement: &70302463391400 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '0'
46
46
  type: :runtime
47
47
  prerelease: false
48
- version_requirements: *70324956186680
48
+ version_requirements: *70302463391400
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: rdf
51
- requirement: &70324956185880 !ruby/object:Gem::Requirement
51
+ requirement: &70302463390860 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ~>
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: '1.0'
57
57
  type: :runtime
58
58
  prerelease: false
59
- version_requirements: *70324956185880
59
+ version_requirements: *70302463390860
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: rdf-rdfxml
62
- requirement: &70324956185300 !ruby/object:Gem::Requirement
62
+ requirement: &70302463390440 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: '0'
68
68
  type: :runtime
69
69
  prerelease: false
70
- version_requirements: *70324956185300
70
+ version_requirements: *70302463390440
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rdf-turtle
73
- requirement: &70324956183820 !ruby/object:Gem::Requirement
73
+ requirement: &70302463389960 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
78
78
  version: '0'
79
79
  type: :runtime
80
80
  prerelease: false
81
- version_requirements: *70324956183820
81
+ version_requirements: *70302463389960
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: rdf-json
84
- requirement: &70324956198600 !ruby/object:Gem::Requirement
84
+ requirement: &70302463389520 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
87
  - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
- version_requirements: *70324956198600
92
+ version_requirements: *70302463389520
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: json-ld
95
- requirement: &70324956194020 !ruby/object:Gem::Requirement
95
+ requirement: &70302463388980 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ~>
@@ -100,10 +100,10 @@ dependencies:
100
100
  version: 0.9.1
101
101
  type: :runtime
102
102
  prerelease: false
103
- version_requirements: *70324956194020
103
+ version_requirements: *70302463388980
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: guid
106
- requirement: &70324956207800 !ruby/object:Gem::Requirement
106
+ requirement: &70302463388460 !ruby/object:Gem::Requirement
107
107
  none: false
108
108
  requirements:
109
109
  - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
111
111
  version: '0'
112
112
  type: :runtime
113
113
  prerelease: false
114
- version_requirements: *70324956207800
114
+ version_requirements: *70302463388460
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: dalli
117
- requirement: &70324956206020 !ruby/object:Gem::Requirement
117
+ requirement: &70302463387760 !ruby/object:Gem::Requirement
118
118
  none: false
119
119
  requirements:
120
120
  - - ~>
@@ -122,7 +122,7 @@ dependencies:
122
122
  version: '2.6'
123
123
  type: :runtime
124
124
  prerelease: false
125
- version_requirements: *70324956206020
125
+ version_requirements: *70302463387760
126
126
  description: RDF ruby ORM
127
127
  email:
128
128
  - ric@swirrl.com