sqlite_ext 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99ee0f6c66c7e55e973b02d7a9622f79b58da81
-  data.tar.gz: faede6051495e25fa791dcd9f8b9d121d52289d3
+  metadata.gz: bd7b308ce26c7f7a13835a8571ff9a85e109c2f2
+  data.tar.gz: 0acafadc5726755b082b72499cfde2158bcbac1b
 SHA512:
-  metadata.gz: 61b01e63fa525cc1dde7f9734299fb7bd7b358620a3a2e32dadebf779a7cdb2ba66c255b0a7da2ed173a4547035ecc80fb5727ccb485046820fb5922fc858e73
-  data.tar.gz: f31a9220f5f51d89d6888c142d37ba37ebbed08c118f76ef5081fbd30eedc0a4f253b3864086d3db8cd22414445cdb77b2d3c0678c92682f621c34c3d5364df2
+  metadata.gz: cb2f0156cd58b075f3c514cc65add907dc005bcafa321e9e4dcf65fe089142b473e37606d8b6fa9fbf56806bee1f45b2089099f747faa7ad1e73aa751bd58e80
+  data.tar.gz: 0fa8d6a00d9f7d9cd93d2321f13002b2ac34bd6ebd36276b41a6e8212d75cb3613800295b93beed834d09d7d66f3a1ee61b8307488062c20b26ecece9ea7429c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.5.0 - 2016-05-26
+* Enhancements
+  * Now works with Ruby versions prior to 2.x.
+
 ### 1.4.0 - 2016-05-26
 * Enhancements
   * `SqliteExt.register_ruby_math` now also registers `pi`, `e`, `mod`,

data/lib/sqlite_ext.rb

@@ -2,14 +2,21 @@ gem "sqlite3"
 require "sqlite3"
 
 module SqliteExt
-
   require "sqlite_ext/version"
-  require "sqlite_ext/db_method_prepends"
-
+  require "sqlite_ext/db_tracks_created_functions"
+  require "sqlite_ext/db_auto_creates_registered_functions"
 end
 
 class SQLite3::Database
-  prepend SqliteExt::DbMethodPrepends
+  if RUBY_VERSION.split('.').first.to_i >= 2
+    puts 'Ruby >= 2'
+    prepend SqliteExt::DbTracksCreatedFunctions
+    prepend SqliteExt::DbAutoCreatesRegisteredFunctions
+  else
+    puts 'Ruby < 2'
+    include SqliteExt::DbTracksCreatedFunctions
+    include SqliteExt::DbAutoCreatesRegisteredFunctions
+  end
 end
 
 module SqliteExt

data/lib/sqlite_ext/db_auto_creates_registered_functions.rb

@@ -0,0 +1,46 @@
+require 'set'
+
+module SqliteExt
+
+  module DbAutoCreatesRegisteredFunctions
+
+    # Adds functions registered with SqliteExt to each new
+    # instance before it is returned from `.new` or `.open` or is
+    # passed to the given block.
+    if RUBY_VERSION.split('.').first.to_i >= 2
+
+      def initialize(file, *other_init_args)
+        if block_given?
+          super file, *other_init_args do
+            SqliteExt.enhance_db_session self
+            yield self
+          end
+        else
+          super
+          SqliteExt.enhance_db_session self
+        end
+      end
+
+    else
+
+      def self.included(other)
+        orig_initialize = other.instance_method(:initialize)
+
+        other.send :define_method, :initialize, proc{ |file, *other_init_args, &block|
+          if block
+            orig_initialize.bind(self).call file, *other_init_args do
+              SqliteExt.enhance_db_session self
+              block.call self
+            end
+          else
+            orig_initialize.bind(self).call file, *other_init_args
+            SqliteExt.enhance_db_session self
+          end
+        }
+      end
+
+    end
+
+  end
+
+end

data/lib/sqlite_ext/db_tracks_created_functions.rb

@@ -0,0 +1,49 @@
+require 'set'
+
+module SqliteExt
+
+  module DbTracksCreatedFunctions
+
+    # Adds recording of names of created functions to
+    # `create_function`.
+    if RUBY_VERSION.split('.').first.to_i >= 2
+
+      def create_function(name, arity, *other_args, &block)
+        super
+        created_function_names << name_key_from(name)
+      end
+
+    else
+
+      def self.included(other)
+        orig_create_function = other.instance_method(:create_function)
+        other.send :define_method, :create_function, proc{ |name, arity, *other_args, &block|
+          orig_create_function.bind(self).call name, arity, *other_args, &block
+          created_function_names << name_key_from(name)
+        }
+      end
+
+    end
+
+    # Given a name, returns true if a function of that hane has
+    # been created on the target instance. The name lookup is
+    # case-insensitive, and either a string or a symbol may be
+    # supplied.
+    def function_created?(name)
+      name_key = name_key_from(name)
+      created_function_names.include?(name_key)
+    end
+
+    private
+
+    def name_key_from(name)
+      "#{name}".upcase
+    end
+
+    def created_function_names
+      @created_function_names ||= Set.new
+    end
+
+  end
+
+end

data/lib/sqlite_ext/version.rb

@@ -1,3 +1,3 @@
 module SqliteExt
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/sqlite_ext.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0'
-
   spec.add_dependency "sqlite3", "~> 1.3"
 
   spec.add_development_dependency "bundler", "~> 1.12"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlite_ext
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Steve Jorgensen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -85,7 +85,8 @@ files:
 - bin/console
 - bin/setup
 - lib/sqlite_ext.rb
-- lib/sqlite_ext/db_method_prepends.rb
+- lib/sqlite_ext/db_auto_creates_registered_functions.rb
+- lib/sqlite_ext/db_tracks_created_functions.rb
 - lib/sqlite_ext/version.rb
 - sqlite_ext.gemspec
 homepage: https://github.com/stevecj/sqlite_ext
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/sqlite_ext/db_method_prepends.rb

@@ -1,48 +0,0 @@
-require 'set'
-
-module SqliteExt
-
-  module DbMethodPrepends
-
-    # Adds functions registered with SqliteExt to each new
-    # instance before it is returned from `.new` or `.open`or is
-    # passed to the given block.
-    def initialize(file, *other_init_args)
-      if block_given?
-        super file, *other_init_args do
-          SqliteExt.enhance_db_session self
-          yield self
-        end
-      else
-        super
-        SqliteExt.enhance_db_session self
-      end
-    end
-
-    def create_function(name, arity, *other_args, &block)
-      super
-      created_function_names << name_key_from(name)
-    end
-
-    # Given a name, returns true if a function of that hane has
-    # been created on the target instance. The name lookup is
-    # case-insensitive, and either a string or a symbol may be
-    # supplied.
-    def function_created?(name)
-      name_key = name_key_from(name)
-      created_function_names.include?(name_key)
-    end
-
-    private
-
-    def name_key_from(name)
-      "#{name}".upcase
-    end
-
-    def created_function_names
-      @created_function_names ||= Set.new
-    end
-
-  end
-
-end