uri_service 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa061d4a76679f11f545ef93aeeda1409d086a85
-  data.tar.gz: cda87cf20d8b71717fa36086a4706421c0c46cce
+  metadata.gz: a34c4dd9a5b43b9111f59c0577fd2046bb2f00b9
+  data.tar.gz: 94d3fc905ad56a6aaabb9b0bcad622343877ebfe
 SHA512:
-  metadata.gz: 9a3f1b9a03fac329bd363a9de844c2f485d4275609358349590c3aaa14c5081333366d7cf11bfba31b83a5660f8474df95818490ca9e3a73f23ea7a7ec88b5a5
-  data.tar.gz: d5862ddf5f8c2971cc9d63d2dce2702677e7c4011849f1ae3bc7546f95886a446f45ba0d17eba2d6e167558f5d2dc711505dc7e8de99b6328427beb40ad5b85c
+  metadata.gz: 5566e17cb45ae010a502a9afbcd06325c9b56fe7acde4114861847b64b2f9dd91164ac93e8b6144081f17d21289f2442552b8553e9b342416be30c5b7669113f
+  data.tar.gz: 2b3ebc888583e86f6ee879b03416524c7cf7b10fde9dc184dd501238035b3a0ce95a40a51c2316ba09bd25007f8f9eff0d74549688fcae05c22eceff33ca8c18

data/README.md

@@ -118,6 +118,13 @@ Create a vocabulary:
 UriService.client.create_vocabulary('names', 'Names')
 ```
 
+Listing vocabularies:
+```ruby
+limit = 10
+start = 0
+UriService.client.list_vocabularies(limit, start)
+```
+
 Create a term in a vocabulary:
 ```ruby
 # Creates a term in the 'names' vocabulary, using the given value, uri and a couple of custom key-value pairs
@@ -132,7 +139,7 @@ Create a LOCAL term in a vocabulary (when you don't have a URI for your term):
 UriService.client.create_local_term('names', 'Baby, Newborn', {'is_baby' => true})
 ```
 
-Find a term in a vocabulary (after you've already added the term to the vocabulary):
+Searching by string query for a term in a vocabulary:
 ```ruby
 UriService.client.find_terms_by_query('names', 'batman')
 # =>
@@ -152,6 +159,13 @@ UriService.client.find_terms_by_query('names', 'batman')
 # ]
 ```
 
+Listing terms in a vocabulary:
+```ruby
+limit = 10
+start = 0
+UriService.client.list_terms('names', limit, start)
+```
+
 ### Running Integration Tests (for developers):
 
 Integration tests are great and we should run them.  Here's how:

data/lib/uri_service/client.rb

@@ -249,7 +249,7 @@ class UriService::Client
   end
   
   def find_term_by_uri(uri)
-    UriService.client.rsolr_pool.with do |rsolr|
+    @rsolr_pool.with do |rsolr|
       response = rsolr.get('select', params: { :q => '*:*', :fq => 'uri:' + UriService.solr_escape(uri) })
       if response['response']['numFound'] == 1
         return term_solr_doc_to_frozen_term_hash(response['response']['docs'].first)
@@ -279,11 +279,16 @@ class UriService::Client
   end
   
   def find_terms_by_query(vocabulary_string_key, value_query, limit=10, start=0)
+    
+    if value_query.blank?
+      return self.list_terms(vocabulary_string_key, limit, start)
+    end
+    
     terms_to_return = []
-    UriService.client.rsolr_pool.with do |rsolr|
+    @rsolr_pool.with do |rsolr|
       
       solr_params = {
-        :q => value_query == '' ? '*' : UriService.solr_escape(value_query),
+        :q => UriService.solr_escape(value_query),
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
         :rows => limit,
         :start => start
@@ -299,6 +304,39 @@ class UriService::Client
     return terms_to_return
   end
   
+  ################
+  # List methods #
+  ################
+  
+  # Lists vocabularies alphabetically (by string key) and supports paging through results.
+  def list_vocabularies(limit=10, start=0)
+    db_rows = @db[UriService::VOCABULARIES].order(:string_key).limit(limit, start)
+    return db_rows.map{|row| row.except(:id).stringify_keys!}
+  end
+  
+  # Lists terms alphabetically and supports paging through results.
+  # Useful for browsing through a term list without a query.
+  def list_terms(vocabulary_string_key, limit=10, start=0)
+    terms_to_return = []
+    @rsolr_pool.with do |rsolr|
+      
+      solr_params = {
+        :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
+        :sort => 'value_ssort asc',
+        :rows => limit,
+        :start => start
+      }
+      
+      response = rsolr.get('select', params: solr_params)
+      if response['response']['numFound'] > 0
+        response['response']['docs'].each do |doc|
+          terms_to_return << term_solr_doc_to_frozen_term_hash(doc)
+        end
+      end
+    end
+    return terms_to_return
+  end
+  
   ##################
   # Delete methods #
   ##################

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Eric O'Hanlon