publish_my_data 0.0.11 → 0.0.12

data/app/controllers/publish_my_data/datasets_controller.rb

@@ -19,9 +19,13 @@ module PublishMyData
 
       if request.format && request.format.html?
         @type_resource_counts = {}
+        @resources_count = 0
         @types.each do |t|
-          @type_resource_counts[t.uri.to_s] = Resource.where("?uri a <#{t.uri.to_s}>").graph(@dataset.data_graph_uri).count
+          count_query = "SELECT ?uri WHERE { GRAPH <#{@dataset.data_graph_uri.to_s}> { ?uri a <#{t.uri.to_s}> } }"
+          @type_resource_counts[t.uri.to_s] = SparqlQuery.new(count_query).count
+          @resources_count += @type_resource_counts[t.uri.to_s]
         end
+
       end
 
       respond_with(@dataset)
@@ -29,7 +33,6 @@ module PublishMyData
 
     # /data?page=2&per_page=10
     def index
-
       dataset_criteria = Dataset.ordered_datasets_criteria
       @pagination_params = ResourcePaginationParams.from_request(request)
       @datasets = Paginator.new(dataset_criteria, @pagination_params).paginate

data/app/models/publish_my_data/dataset.rb

@@ -55,10 +55,6 @@ module PublishMyData
       Resource.all.graph(self.data_graph_uri)
     end
 
-    def resources_count
-      resources_in_dataset_criteria.count
-    end
-
     def theme_obj
       Theme.find(self.theme) rescue nil
     end

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publish_my_data
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70352143891580 !ruby/object:Gem::Requirement
+  requirement: &70141229890120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +25,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70352143891580
+  version_requirements: *70141229890120
 - !ruby/object:Gem::Dependency
   name: tripod
-  requirement: &70352143891040 !ruby/object:Gem::Requirement
+  requirement: &70141229889620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -36,10 +36,10 @@ dependencies:
         version: 0.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70352143891040
+  version_requirements: *70141229889620
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70352143890500 !ruby/object:Gem::Requirement
+  requirement: &70141229889140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352143890500
+  version_requirements: *70141229889140
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70352143890040 !ruby/object:Gem::Requirement
+  requirement: &70141229905040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +58,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352143890040
+  version_requirements: *70141229905040
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70352143889420 !ruby/object:Gem::Requirement
+  requirement: &70141229904560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +69,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352143889420
+  version_requirements: *70141229904560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70352143888560 !ruby/object:Gem::Requirement
+  requirement: &70141229904100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,7 +80,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352143888560
+  version_requirements: *70141229904100
 description: The PublishMyData Rails Engine. Create rails apps with Linked Data functionality.
 email:
 - ric@swirrl.com
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3216928745176636936
+      hash: -2295247187855291283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: