bel-search-sqlite 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5293683a9d227710257ccc18b90d4b0b0facfe79
-  data.tar.gz: 0ea715f709440efba97d0c0ab3c09e5dc06fef70
+  metadata.gz: 5d0b288c14099de5c0981922e429fcac0245b4d6
+  data.tar.gz: 205040f5df8000eccd882a5538501651fcd60017
 SHA512:
-  metadata.gz: 8b75d1a25c878846f5bd52fffccccee56ab82188dc36031511841a686e9b1ef4d38cd23991e5cc2cfab55e08cf985cff0e337d01de391b01b5a7b93a008f3c81
-  data.tar.gz: 59b6e75a6683e22cee8ca386eff2194fab4ae9bc339c75af9c349a95842b7ba8622d98f84c174a3f3b6f3f1d4154f4d8f5811854efecd73586bbb165b5e378f3
+  metadata.gz: 6af5cb895fccad063cf65cd6d26c05d0d63dc18a098a07ad938079f1b82a7e7ebc1bcac29c2f5c1b1a5157a0c959c6b0dfd4f41b61d409145443da2a28f1c62f
+  data.tar.gz: d5c795cd27fd76f41237ef9d879ab3f2360c20b73ec449dceba3e5efc6fa87cd3963b0851e22ac217dd7dc3f8293360ef9a682215eea7027c1977b9c87c99ea3

data/.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                     = 'bel-search-sqlite'
-  spec.version                  = '0.4.0'
+  spec.version                  = '0.4.2'
   spec.summary                  = '''
                                     Resource search plugin for bel.rb using Sqlite FTS.
                                   '''.gsub(%r{^\s+}, ' ').gsub(%r{\n}, '')
@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.platform                 = 'ruby'
   spec.required_ruby_version    = '>= 2.0.0'
+  spec.add_runtime_dependency     'bel',     '~> 0.4'
   spec.add_runtime_dependency     'sequel',  '4.28.0'
   spec.add_runtime_dependency     'sqlite3', '1.3.11'
   spec.post_install_message     = %Q{

data/CHANGELOG.md

@@ -3,6 +3,17 @@ All notable changes to bel-search-sqlite will be documented in this file. The cu
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.4.0][0.4.0] - 2015-12-14
+## [0.4.2][0.4.2] - 2015-12-17
+### Added
+- Added the :exclude_identifier_schemes option to search for concepts where their preferred label is not an identifier. This was added to allows more human-friendly biological identifiers to be returned.
+- Allow [bel.rb][bel.rb] gem dependency within version range 0.4.x < 0.5 (pessimistic version qualifier).
+
+## [0.4.1][0.4.1] - 2015-12-17
+### Note
+- Yanked this version. Dependency on bel.rb was incorrect.
+
+## 0.4.0 - 2015-12-14
 ### Added
 - Added full-text-search of annotations and namespaces using SQLite. This implementation provides a solution for CRuby and JRuby using the wonderful "sequel" gem.
+
+[0.4.2]:    https://github.com/OpenBEL/bel.rb-search-sqlite/compare/0.4.0...0.4.2

data/lib/bel/resource/search/plugins/sqlite/sqlite3.rb

@@ -31,12 +31,13 @@ module BEL::Resource::Search::Plugins
 
         # optional SQL parameters
         params = {
-          :match        => query_expression.encode('UTF-8'),
-          :start        => (options.delete(:start) || 0).to_i,
-          :size         => size,
-          :concept_type => (concept_type ? concept_type.to_s.encode('UTF-8') : nil),
-          :scheme_uri   => (scheme_uri ? scheme_uri.to_s.encode('UTF-8') : nil),
-          :species      => (species ? species.to_s.encode('UTF-8') : nil),
+          :match                      => query_expression.encode('UTF-8'),
+          :start                      => (options.delete(:start) || 0).to_i,
+          :size                       => size,
+          :concept_type               => (concept_type ? concept_type.to_s.encode('UTF-8') : nil),
+          :scheme_uri                 => (scheme_uri ? scheme_uri.to_s.encode('UTF-8') : nil),
+          :species                    => (species ? species.to_s.encode('UTF-8') : nil),
+          :exclude_identifier_schemes => options.delete(:exclude_identifier_schemes)
         }
 
         query   = QUERY_TEMPLATE.result(binding)

data/lib/bel/resource/search/plugins/sqlite/sqlite3_template.erb

@@ -12,6 +12,10 @@ WHERE
 
   <% end %>
 <% end %>
+
+<% if params[:exclude_identifier_schemes] %>
+  AND identifier != pref_label
+<% end %>
 ORDER BY
   length(pref_label) ASC
 LIMIT  :size

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bel-search-sqlite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Anthony Bargnesi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  name: bel
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -112,3 +126,4 @@ signing_key:
 specification_version: 4
 summary: Resource search plugin for bel.rb using Sqlite FTS.
 test_files: []
+has_rdoc: