bel-search-sqlite 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b97ce97961cc6a873bc6db973b093255507919f1
-  data.tar.gz: 43003bf98911f2a7122ac69597c386109495f943
+  metadata.gz: e4cf76a801e86cba6b4a8ee3fdb71f70b80c1dec
+  data.tar.gz: 157bb2131975e16e137236497ecbdc3ea893ba73
 SHA512:
-  metadata.gz: c8d8b18198dae5fe1e616c6641d8f5d7572ad86c91a4838b13cbbee19b7207953ddd9325eeabe52f2412c235e4afded10e359f272947b89e785411c3f38645fa
-  data.tar.gz: 6688166324a396dd06afcbad147d0e2ed6248396f134fdebd4d23db700063b3450c73963f6c97a293ee807f779ae242dfa515393b9bd826a67d360d5506c6b16
+  metadata.gz: 18ea7620b9c44fa4d3aff5645f06239d4ad256ac3fc7243011a6e7c1c314fe1f05fe5bb4d4a77cde55a858d956cda1b50bbd7b8c591dd22ed3534e4f1ada5832
+  data.tar.gz: f7636bd3ac135284dd5a12184bdb9d3b38b617233b583b0fc5dd83e64787e02cc0105fc6057f7e43210e055e5da0165e63456ee53a3eeb98c736562d078ef0d7

data/.gemspec

@@ -1,18 +1,20 @@
 Gem::Specification.new do |spec|
   spec.name                     = 'bel-search-sqlite'
-  spec.version                  = '1.0.0'
+  spec.version                  = File.read(File.join(
+                                    File.expand_path(File.dirname(__FILE__)),
+                                    'VERSION'))
   spec.summary                  = '''
                                     Resource search plugin for bel.rb using Sqlite FTS.
                                   '''.gsub(%r{^\s+}, ' ').gsub(%r{\n}, '')
   spec.description              = '''
                                     A resource search plugin for bel.rb that uses FTS tables in
-                                    Sqlite to search annotation and namespace values. Built to
-                                    run on MRI to take advantage of C extensions.
+                                    Sqlite to search annotation and namespace values.
                                   '''.gsub(%r{^\s+}, ' ').gsub(%r{\n}, '')
   spec.license                  = 'Apache-2.0'
   spec.authors                  = [
                                     'Anthony Bargnesi',
                                   ]
+  spec.date                     = %q{2017-01-13}
   spec.email                    = [
                                     'abargnesi@selventa.com',
                                   ]
@@ -36,21 +38,28 @@ Gem::Specification.new do |spec|
                                     'README.md',
                                   ]
 
-  spec.platform                 = 'ruby'
-  spec.required_ruby_version    = '>= 2.0.0'
-  spec.add_runtime_dependency     'bel',     '~> 1.0.0'
-  spec.add_runtime_dependency     'sequel',  '4.28.0'
-  spec.add_runtime_dependency     'sqlite3', '1.3.11'
+  if RUBY_ENGINE =~ /jruby/
+		# dependencies when building for JRuby (Java based)
+		spec.platform               = 'java'
+		spec.required_ruby_version  = '>= 2.0.0'
+		spec.add_runtime_dependency   'bel',          '~> 1.1.0'
+		spec.add_runtime_dependency   'sequel',       '4.28.0'
+		spec.add_runtime_dependency   'jdbc-sqlite3', '3.8.11.2'
+  else
+		# dependencies when building for all other platforms (C based)
+		spec.platform               = 'ruby'
+		spec.required_ruby_version  = '>= 2.0.0'
+		spec.add_runtime_dependency   'bel',          '~> 1.1.0'
+		spec.add_runtime_dependency   'sequel',       '4.28.0'
+		spec.add_runtime_dependency   'sqlite3',      '1.3.11'
+  end
+
   spec.post_install_message     = %Q{
 ******************************
 *  bel-search-sqlite plugin  *
 ******************************
 Thank you for installing the bel-search-sqlite plugin to bel.rb.
 
-This plugin is built to run on Ruby and uses sqlite3 + C
-extensions to access a SQLite database for full-text search of
-annotation and namespace values.
-
 To verify the bel-search-sqlite plugin can be used by bel.rb
 execute the bel.rb command:
 
@@ -64,7 +73,7 @@ To access this within bel.rb execute the following ruby code:
       :database => 'resources.db'
     )
 
-}
+  }
 end
 # vim: ft=ruby ts=2 sw=2:
 # encoding: utf-8

data/README.md

@@ -25,7 +25,7 @@ How can I use this?
 bel.rb provides an [approach to plugins](https://github.com/OpenBEL/bel.rb/wiki/Plugins-in-bel.rb) that is meant to be uncomplicated. The following steps will get you started:
 
 - Build gem with `gem build .gemspec` and install with `gem install bel-search-sqlite-1.0.0.gem`.
-- on JRuby, build gem with `gem build .gemspec-java` and install with `gem install bel-search-sqlite-1.0.0-java.gem`.
+- On JRuby, build gem with `gem build .gemspec-java` and install with `gem install bel-search-sqlite-1.0.0-java.gem`.
 - Now you have this plugin installed and ready for use in bel.rb!
 - With bel.rb installed run the command `bel plugins` to list available plugins.
 
@@ -47,3 +47,42 @@ search_plugin.create_search(:database_file => 'resources.db')
 ```
 
 - Enjoy FTS goodness with Sqlite!
+
+## Development
+
+### branches
+
+- master branch
+  - Contains stable code. Releases are created from this branch using a tag (e.g. `MAJOR.MINOR.PATCH`).
+
+- next branch
+  - Contains unstable code. Commits should be merged into master after it stabilizes.
+
+### releases
+
+Releases of *bel-search-sqlite* should follow these steps:
+
+1. Update the version in the `VERSION` file.
+
+2. Add changes for this version to the `CHANGELOG` file. This file is modelled after http://keepachangelog.com/.
+
+3. Push the changes for `VERSION` and `CHANGELOG` on the master branch.
+
+4. Ensure the *master* branch has all of the required changes.
+
+5. Create a git tag, named after the version, on the *master* branch. Push this tag to GitHub.
+
+6. Create the Ruby and Java RubyGem for *bel-search-sqlite*.
+
+  `gem build .gemspec`
+
+  `gem build .gemspec-java`
+
+7. Create a release on GitHub for this version and attach the gem files.
+
+8. Push gems to RubyGems.
+
+  `gem push bel-search-sqlite-VERSION.gem`
+
+  `gem push bel-search-sqlite-VERSION-java.gem`
+

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

@@ -37,7 +37,8 @@ module BEL::Resource::Search::Plugins
           :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)
+          :exclude_identifier_schemes => options.delete(:exclude_identifier_schemes),
+          :exact_match                => options.delete(:exact_match)
         }
 
         query   = QUERY_TEMPLATE.result(binding)

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

@@ -16,6 +16,11 @@ WHERE
 <% if params[:exclude_identifier_schemes] %>
   AND identifier != pref_label
 <% end %>
+
+<% if params[:exact_match] %>
+  AND pref_label = :match COLLATE NOCASE
+<% end %>
+
 ORDER BY
   length(pref_label) ASC
 LIMIT  :size

metadata

@@ -1,60 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: bel-search-sqlite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Anthony Bargnesi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  name: bel
-  prerelease: false
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.28.0
-  name: sequel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.28.0
 - !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.11
-  name: sqlite3
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.11
-description: " A resource search plugin for bel.rb that uses FTS tables in Sqlite\
-  \ to search annotation and namespace values. Built to run on MRI to take advantage\
-  \ of C extensions. "
+description: " A resource search plugin for bel.rb that uses FTS tables in Sqlite
+  to search annotation and namespace values. "
 email:
 - abargnesi@selventa.com
 executables: []
@@ -73,30 +72,12 @@ homepage: https://github.com/OpenBEL/bel.rb-search-plugin
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: |2+
-
-  ******************************
-  *  bel-search-sqlite plugin  *
-  ******************************
-  Thank you for installing the bel-search-sqlite plugin to bel.rb.
-
-  This plugin is built to run on Ruby and uses sqlite3 + C
-  extensions to access a SQLite database for full-text search of
-  annotation and namespace values.
-
-  To verify the bel-search-sqlite plugin can be used by bel.rb
-  execute the bel.rb command:
-
-      bel plugins --list
-
-  To access this within bel.rb execute the following ruby code:
-
-      require 'bel'
-      search_plugin = BEL::Resource::Search.plugins[:sqlite]
-      search_plugin.create_search(
-        :database => 'resources.db'
-      )
-
+post_install_message: "\n******************************\n*  bel-search-sqlite plugin
+  \ *\n******************************\nThank you for installing the bel-search-sqlite
+  plugin to bel.rb.\n\nTo verify the bel-search-sqlite plugin can be used by bel.rb\nexecute
+  the bel.rb command:\n\n    bel plugins --list\n\nTo access this within bel.rb execute
+  the following ruby code:\n\n    require 'bel'\n    search_plugin = BEL::Resource::Search.plugins[:sqlite]\n
+  \   search_plugin.create_search(\n      :database => 'resources.db'\n    )\n\n  "
 rdoc_options:
 - "--title"
 - BEL Resource Search - Sqlite
@@ -120,9 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.8
+signing_key: 
 specification_version: 4
 summary: Resource search plugin for bel.rb using Sqlite FTS.
 test_files: []