bel-search-sqlite 0.4.0.beta1 → 0.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 845c3dc297bd36958a2ee6032d780e67c50c5f52
-  data.tar.gz: f2537f99a8af03dd19a2450b1462afff08540963
+  metadata.gz: 690b801e9a3e10c23a958aaa15e8f5fac222281c
+  data.tar.gz: 63736018617e7b7cac47dcbeb395677f8bd47ad2
 SHA512:
-  metadata.gz: ca6ac55e19a601e015f5dbcca3da5407482cf77918d6a2afd49ff6aedff0e067c3ff5d87dcc52f16992c60300dff3e7da98ed3303dc5abe03799dcaf7c547ceb
-  data.tar.gz: 674a67780673e8eb46d8ac360a3906de7742ec5155aef597383fc5cd417cbb7421f4ae57671e32f662ba94f6f296d267f2e692a7dd4b24a0550e772b6799d74e
+  metadata.gz: 9dd18bc6dcb53cad44fbc7acdb371e7064c2c548e26dd489ae7ab9d8abbdf8574aaf8362727c0fb0abc27ffdbe3921449ba40ad25e3689317517549aa8356b65
+  data.tar.gz: 0d68b9f8981d36a63375f3a499eb42c4a5f25aeca5925525ed51c065bf0f84c23e28c0e7af6f76239a74b5d87f4bfddc60aaa9cf74a8131a93d635d13fb6b9c3

data/.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                     = 'bel-search-sqlite'
-  spec.version                  = '0.4.0.beta1'
+  spec.version                  = '0.4.0.beta2'
   spec.summary                  = '''
                                     Resource search plugin for bel.rb using Sqlite FTS.
                                   '''.gsub(%r{^\s+}, ' ').gsub(%r{\n}, '')

data/CHANGELOG.md

@@ -3,7 +3,7 @@ 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.1.0][0.1.0] - 2015-11-19
+## [0.4.0][0.4.0] - 2015-12-09
 ### Fixed
 ### Changed
 ### Added

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

@@ -24,23 +24,23 @@ module BEL::Resource::Search::Plugins
       # @see BEL::Resource::Search::API#search
       def search(query_expression, concept_type = nil, scheme_uri = nil, species = nil, options = {})
         # required SQL parameters
-        match = query_expression.encode('UTF-8')
-        start = (options.delete(:start) ||  0).to_i
-        size  = options.delete(:size)   || -1
+        size  = options.delete(:size) || -1
         if size.to_i.zero?
           fail ArgumentError.new(":size is zero")
         end
 
         # optional SQL parameters
-        options = {
+        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),
         }
-        options.keep_if { |key, value| value != nil }
 
         query   = QUERY_TEMPLATE.result(binding)
-        enum    = @db.fetch(query, :match => match, :start => start, :size => size)
+        enum    = @db.fetch(query, params)
 
         if enum.respond_to? :lazy
           enum = enum.lazy

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

@@ -6,7 +6,7 @@ FROM
 WHERE
   concepts_fts MATCH :match
 <% [:concept_type, :scheme_type, :scheme_uri, :species].each do |column| %>
-  <% if options[column] %>
+  <% if params[column] %>
 
   AND <%= column %> = <%= ":#{column}" %>
 

metadata

@@ -1,46 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: bel-search-sqlite
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Anthony Bargnesi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.28.0
-  type: :runtime
+  name: sequel
   prerelease: false
+  type: :runtime
   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
-  type: :runtime
+  name: sqlite3
   prerelease: false
+  type: :runtime
   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. Built to run on MRI to take advantage\
+  \ of C extensions. "
 email:
 - abargnesi@selventa.com
 executables: []
@@ -106,10 +106,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Resource search plugin for bel.rb using Sqlite FTS.
 test_files: []
-has_rdoc: 
+has_rdoc: