tripod 0.5.1 → 0.5.2

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 (6) hide show
  1. data/lib/tripod/criteria/execution.rb +1 -1
  2. data/lib/tripod/sparql_query.rb +1 -1
  3. data/lib/tripod/version.rb +1 -1
  4. data/spec/tripod/criteria_execution_spec.rb +1 -1
  5. data/spec/tripod/sparql_query_spec.rb +2 -2
  6. metadata +21 -21
data/lib/tripod/criteria/execution.rb CHANGED
@@ -27,7 +27,7 @@ module Tripod
27
27
  sq = Tripod::SparqlQuery.new(build_select_query)
28
28
  count_sparql = sq.as_count_query_str
29
29
  result = Tripod::SparqlClient::Query.select(count_sparql)
30
- result[0][".1"]["value"].to_i
30
+ result[0]["c"]["value"].to_i
31
31
  end
32
32
 
33
33
  # PRIVATE:
data/lib/tripod/sparql_query.rb CHANGED
@@ -49,7 +49,7 @@ module Tripod
49
49
  def as_count_query_str
50
50
  check_subqueryable!
51
51
 
52
- count_query = "SELECT COUNT(*) { #{self.body} }"
52
+ count_query = "SELECT (COUNT(*) as ?c) { #{self.body} }"
53
53
  count_query = "#{self.prefixes} #{count_query}" if self.prefixes
54
54
 
55
55
  # 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.5.1"
2
+ VERSION = "0.5.2"
3
3
  end
data/spec/tripod/criteria_execution_spec.rb CHANGED
@@ -128,7 +128,7 @@ describe Tripod::Criteria do
128
128
  end
129
129
 
130
130
  it "should execute the right Sparql" do
131
- sparql = "SELECT COUNT(*) { 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 }"
131
+ sparql = "SELECT (COUNT(*) as ?c) { 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 }"
132
132
  Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
133
133
  Person.all.limit(10).offset(20).count
134
134
  end
data/spec/tripod/sparql_query_spec.rb CHANGED
@@ -88,14 +88,14 @@ describe Tripod::SparqlQuery do
88
88
  context 'without prefixes' do
89
89
  it "should return a new SparqlQuery with the original query wrapped in a count" do
90
90
  q = Tripod::SparqlQuery.new('SELECT ?s WHERE { ?s ?p ?o }')
91
- q.as_count_query_str.should == 'SELECT COUNT(*) { SELECT ?s WHERE { ?s ?p ?o } }'
91
+ q.as_count_query_str.should == 'SELECT (COUNT(*) as ?c) { SELECT ?s WHERE { ?s ?p ?o } }'
92
92
  end
93
93
  end
94
94
 
95
95
  context 'with prefixes' do
96
96
  it "should move the prefixes to the start" do
97
97
  q = Tripod::SparqlQuery.new('PREFIX e: <http://example.com> SELECT ?s WHERE { ?s ?p ?o }')
98
- q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT COUNT(*) { SELECT ?s WHERE { ?s ?p ?o } }'
98
+ q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT (COUNT(*) as ?c) { SELECT ?s WHERE { ?s ?p ?o } }'
99
99
  end
100
100
  end
101
101
  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.5.1
4
+ version: 0.5.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -15,7 +15,7 @@ date: 2013-03-26 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rest-client
18
- requirement: &70266811885900 !ruby/object:Gem::Requirement
18
+ requirement: &70274754940040 !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: *70266811885900
26
+ version_requirements: *70274754940040
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
- requirement: &70266811901040 !ruby/object:Gem::Requirement
29
+ requirement: &70274754955340 !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: *70266811901040
37
+ version_requirements: *70274754955340
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: equivalent-xml
40
- requirement: &70266811900040 !ruby/object:Gem::Requirement
40
+ requirement: &70274754953840 !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: *70266811900040
48
+ version_requirements: *70274754953840
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: rdf
51
- requirement: &70266811898540 !ruby/object:Gem::Requirement
51
+ requirement: &70274754952740 !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: *70266811898540
59
+ version_requirements: *70274754952740
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: rdf-rdfxml
62
- requirement: &70266811898000 !ruby/object:Gem::Requirement
62
+ requirement: &70274754951700 !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: *70266811898000
70
+ version_requirements: *70274754951700
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rdf-n3
73
- requirement: &70266811897200 !ruby/object:Gem::Requirement
73
+ requirement: &70274754950180 !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: *70266811897200
81
+ version_requirements: *70274754950180
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: rdf-json
84
- requirement: &70266811895920 !ruby/object:Gem::Requirement
84
+ requirement: &70274754949060 !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: *70266811895920
92
+ version_requirements: *70274754949060
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: json-ld
95
- requirement: &70266811894100 !ruby/object:Gem::Requirement
95
+ requirement: &70274754947900 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
100
100
  version: '0'
101
101
  type: :runtime
102
102
  prerelease: false
103
- version_requirements: *70266811894100
103
+ version_requirements: *70274754947900
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: guid
106
- requirement: &70266811908240 !ruby/object:Gem::Requirement
106
+ requirement: &70274754963140 !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: *70266811908240
114
+ version_requirements: *70274754963140
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: dalli
117
- requirement: &70266811906460 !ruby/object:Gem::Requirement
117
+ requirement: &70274754961160 !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: *70266811906460
125
+ version_requirements: *70274754961160
126
126
  description: RDF ruby ORM
127
127
  email:
128
128
  - ric@swirrl.com