bel-search-sqlite 1.0.0-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb551a0b2a1ab8b082820e06c5f838e58c49c8c
-  data.tar.gz: 0c7b801bebe545734d65a7085dfbb939e318204b
+  metadata.gz: 23b855e444ebbc11c7ff06aad7e858d0c09a3bfd
+  data.tar.gz: f189214394a8e0c361179c5ea2b317093aceea02
 SHA512:
-  metadata.gz: 15e8fb14a5c79667815931b23ca3f98030df748555dff62fc8f802d65ca18522ac0824b6e4bca0b53147006ffbc0658fe897570cf7d9427f87da938007d71e5b
-  data.tar.gz: 762a734d8db5edb0f07b64da9346470d329e132a8f4cfe1ec2dc522e8cbb3871a7c35abff5b45bd26bbf5b2fc576aefa00d4e5e28b2a515b4ce78f121aa2412b
+  metadata.gz: b4ff4ca7d8ae9603c4a6683f9809216fec399660ed3729f20e0da6e942da72daca69e2e2851ede9f5a691bf7a6521e95a6cc442a193fb0a5ecc62c929305b73b
+  data.tar.gz: 49fa6505342a6a3698c3cf093fc48c987b16264cd7f2e2dc6444373e5d51f9b52f5c1a0fbdb0d76d31d69153018b0a9d2a42bc57c9de4f5e724e0a1205812059

data/{.gemspec-java → .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 JRuby to take advantage of JDBC.
+                                    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                 = 'java'
-  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     'jdbc-sqlite3', '3.8.11.2'
+  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 JRuby and uses JDBC 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,8 +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,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: bel-search-sqlite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors:
 - Anthony Bargnesi
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   name: bel
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -53,15 +53,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.8.11.2
 description: " A resource search plugin for bel.rb that uses FTS tables in Sqlite\
-  \ to search annotation and namespace values. Built to run on JRuby to take advantage\
-  \ of JDBC. "
+  \ to search annotation and namespace values. "
 email:
 - abargnesi@selventa.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemspec-java"
+- ".gemspec"
 - CHANGELOG.md
 - INSTALL.md
 - LICENSE
@@ -73,30 +72,13 @@ 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 JRuby and uses JDBC 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\n\
+  execute 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
@@ -121,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Resource search plugin for bel.rb using Sqlite FTS.