redis_eval 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a6600dac30e393a8ecd8b4602c8d35eddf7d14
-  data.tar.gz: 46365e2a76f227fd680febda183fa88155c6dc96
+  metadata.gz: 815d43d7a444de7a9d1e8f180a1f3e5f205aabdd
+  data.tar.gz: c2f597cdc40b93ee8505ac42a0bbba91d01d497c
 SHA512:
-  metadata.gz: 4dc87bb459df935910f8380b59d593c22f2a2d9ab593516490607aadb01fb58326aa6b2dd653d274fb6e53bea4ad20cb1f61ef28ff62ff320bdb719b055ff15a
-  data.tar.gz: 66ff511f7e349669f0e2d22449f2d797f17e2ac3c40620240c7e4cfed773d92c675bb17cb851b58c4e3ba7a0bec01d57aa508cece9c3b1be24b1dfbb5d1e060f
+  metadata.gz: bad362bcf223b7600ca11ea3717836e9f8f09aa88f5223a90a550908e7ec1462cf9fb86426ad72d1e2fe4a986d17f3a8bb0d2369b78f9b5af8c055f6233163f2
+  data.tar.gz: 25d4a20564c83090e9fef0b0e9147c963dd7e275be3849f3e788839f077b4a2e8d50467210efbcdd9f7afa85d00fa648d7330f89152c84738840a075bdb00bf7

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.7
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6
+  - 2.3.3
+  - 2.4.1
+before_install: gem install bundler -v 1.14.6
 services:
   - redis-server

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in redis_eval.gemspec
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # RedisEval
 
 [![Build Status](https://travis-ci.org/i2bskn/redis_eval.svg)](https://travis-ci.org/i2bskn/redis_eval)
-[![Coverage Status](https://coveralls.io/repos/i2bskn/redis_eval/badge.svg?branch=master&service=github)](https://coveralls.io/github/i2bskn/redis_eval?branch=master)
+[![codecov](https://codecov.io/gh/i2bskn/redis_eval/branch/master/graph/badge.svg)](https://codecov.io/gh/i2bskn/redis_eval)
 
 Evaluate Lua scripts with Redis.
 
@@ -10,7 +10,7 @@ Evaluate Lua scripts with Redis.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'redis_eval'
+gem "redis_eval"
 ```
 
 And then execute:
@@ -23,63 +23,23 @@ Or install it yourself as:
 
 ## Usage
 
-#### Configurations
-
-- `redis_options` [Hash] Generation options of Redis instance.
-- `script_paths` [Array] Path to find a script file.
-
-Example:
-
-```ruby
-RedisEval.configure do |config|
-  config.redis_options = { url: "redis://localhost:6379/1" }
-  config.script_paths = ["/path/to/script_dir"]
-end
-```
-
-#### Basic usage
-
-Build and execute the script path to argument.
-
-```ruby
-script = RedisEval.build("/path/to/script.lua")
-script.execute
-```
-
-Directly by the code in the argument to build.
+Build and execute a script source as argument.
 
 ```ruby
-script = RedisEval::Script.new("hello", "return 'Hello world!'")
-script.execute
+script = RedisEval::Script.new("return {KEYS[1], ARGV[1]}")
+script.execute([1], [2]) # => ["1", "2"]
 ```
 
-#### Find and Build
-
-To build and looking for a script from name.  
-This function must be set `script_paths` option.
+Find and build scripts from a specific directory.
 
 ```ruby
-RedisEval.hello.execute # => Execute "/path/to/script_dir/hello.lua".
-```
-
-#### Script test
-
-Test the script by execute the command.
-
-```
-$ redis_eval_test /path/to/script.lua 1 key1 argv1
+scripts = RedisEval::ScriptSet.new("/path/to/script_dir")
+scripts.hello.execute(keys, argv) # build /path/to/script_dir/hello.lua and run.
 ```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/i2bskn/redis_eval. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/i2bskn/redis_eval.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rake/testtask"
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
 
-task :default => :spec
+task :default => :test

data/lib/redis_eval.rb

@@ -3,6 +3,5 @@ require "pathname"
 require "redis"
 
 require "redis_eval/version"
-require "redis_eval/configuration"
-require "redis_eval/generator_methods"
 require "redis_eval/script"
+require "redis_eval/script_set"

data/lib/redis_eval/script.rb

@@ -1,51 +1,46 @@
 module RedisEval
   class Script
-    attr_reader :name, :script, :sha
+    attr_accessor :parent
+    attr_reader :source, :sha
 
-    class << self
-      # @param path [Pathname]
-      # @return [RedisEval::Script]
-      def build_from_path(path)
-        name = path.basename(".*").to_s
-        script = File.read(path)
-        new(name, script)
-      end
-
-      def load(script)
-        redis.script(:load, script)
-      end
+    def self.build_from_parent(src, parent, with_load: true)
+      script        = new(src, with_load: with_load)
+      script.parent = parent
+      script
+    end
 
-      def flush
-        redis.script(:flush)
-      end
+    def initialize(src, with_load: true)
+      @source = src
+      @sha    = Digest::SHA1.hexdigest(@source)
+      @redis  = nil
+      self.load if with_load
+    end
 
-      def redis
-        RedisEval.config.redis
-      end
+    def load
+      redis.script(:load, source)
     end
 
-    def initialize(name, script)
-      @name = name
-      @script = script
-      @sha = Digest::SHA1.hexdigest(script)
+    def exist?
+      redis.script(:exists, sha)
     end
 
     def execute(keys = [], argv = [])
       redis.evalsha(sha, Array(keys), Array(argv))
     rescue Redis::CommandError => e
       if e.message =~ /NOSCRIPT/
-        redis.eval(script, Array(keys), Array(argv))
+        redis.eval(source, Array(keys), Array(argv))
       else
         raise
       end
     end
 
-    def exist?
-      redis.script(:exists, sha)
+    def redis
+      return @redis if @redis
+      parent ? parent.redis : Redis.current
     end
 
-    def redis
-      self.class.redis
+    def redis=(conn)
+      @redis = conn
     end
   end
 end

data/lib/redis_eval/script_set.rb

@@ -0,0 +1,60 @@
+module RedisEval
+  class ScriptSet
+    attr_reader :path
+
+    SCRIPT_SUFFIX = ".lua"
+
+    def initialize(target_path, conn = nil)
+      @path  = pathname(target_path)
+      @redis = conn
+    end
+
+    def load(name)
+      source = script_path(name).read
+      loaded_scripts[name.to_s] ||= RedisEval::Script.build_from_parent(source, self)
+    end
+
+    def load_all
+      path.children(false).each do |child|
+        name   = child.basename(SCRIPT_SUFFIX).to_s
+        source = script_path(name).read
+        loaded_scripts[name] ||= RedisEval::Script.build_from_parent(source, self)
+      end
+      true
+    end
+
+    def redis
+      @redis || Redis.current
+    end
+
+    def redis=(conn)
+      @redis = conn
+    end
+
+    private
+
+      def pathname(path)
+        path.is_a?(Pathname) ? path : Pathname.new(path)
+      end
+
+      def loaded_scripts
+        @loaded_scripts ||= {}
+      end
+
+      def script_path(name)
+        path.join(name.to_s).sub_ext(SCRIPT_SUFFIX)
+      end
+
+      def method_missing(name, *args, &block)
+        super unless respond_to?(name)
+
+        self.load(name)
+        define_singleton_method(name) { |*a, &b| loaded_scripts[name.to_s] }
+        send(name, *args, &block)
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        loaded_scripts.has_key?(name.to_s) || script_path(name).exist? || super
+      end
+  end
+end

data/lib/redis_eval/version.rb

@@ -1,3 +1,3 @@
 module RedisEval
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/redis_eval.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'redis_eval/version'
+require "redis_eval/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "redis_eval"
@@ -14,17 +14,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/i2bskn/redis_eval"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   spec.require_paths = ["lib"]
 
   spec.add_dependency "redis"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "codecov"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_eval
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,27 +111,19 @@ dependencies:
 description: Evaluate Lua scripts with Redis.
 email:
 - i2bskn@gmail.com
-executables:
-- redis_eval_test
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
-- exe/redis_eval_test
 - lib/redis_eval.rb
-- lib/redis_eval/configuration.rb
-- lib/redis_eval/generator_methods.rb
 - lib/redis_eval/script.rb
+- lib/redis_eval/script_set.rb
 - lib/redis_eval/version.rb
 - redis_eval.gemspec
 homepage: https://github.com/i2bskn/redis_eval
@@ -154,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Evaluate Lua scripts with Redis.

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: bhxUt56VkshTmwvYPRYtNwhwJhcS5RBCF

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/bin/console

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "redis_eval"
-require "pry"
-
-Pry.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/exe/redis_eval_test

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "redis_eval"
-
-if url = ENV["REDIS_EVAL_URL"]
-  RedisEval.config.redis_options = { url: url }
-end
-
-lua_script = ARGV[0] || (raise ArgumentError, "Unknown script path")
-key_count = ARGV[1].to_i
-argv = ARGV[2..-1] || []
-
-raise ArgumentError, "Not enough KEYS of argument." if key_count > argv.size
-keys = argv.shift(key_count)
-
-script = RedisEval.build(lua_script)
-p script.execute(keys, argv)

data/lib/redis_eval/configuration.rb

@@ -1,58 +0,0 @@
-module RedisEval
-  class Configuration
-    module Accessible
-      def configure(options = {}, &block)
-        config.merge!(options) unless options.empty?
-        config.configure(&block) if block_given?
-      end
-
-      def config
-        @_config ||= Configuration.new
-      end
-    end
-
-    VALID_OPTIONS = [
-      :redis_options,
-      :script_paths,
-    ].freeze
-
-    attr_accessor *VALID_OPTIONS
-
-    def initialize
-      reset
-    end
-
-    def redis(cache_disable: false)
-      if cache_disable
-        @_redis = generate_redis_connection!
-      else
-        @_redis ||= generate_redis_connection!
-      end
-    end
-
-    def configure
-      yield self
-    end
-
-    def merge(params)
-      self.dup.merge!(params)
-    end
-
-    def merge!(params)
-      params.keys.each {|key| self.send("#{key}=", params[key]) }
-      self
-    end
-
-    def reset
-      self.redis_options = nil
-      self.script_paths = []
-    end
-
-    private
-      def generate_redis_connection!
-        redis_options ? Redis.new(**redis_options) : Redis.current
-      end
-  end
-
-  extend Configuration::Accessible
-end

data/lib/redis_eval/generator_methods.rb

@@ -1,50 +0,0 @@
-module RedisEval
-  module GeneratorMethods
-    def build(name)
-      path = case name
-        when Pathname
-          name
-        when String, Symbol
-          name =~ /\.lua$/ ? pathname(name.to_s) : script_path(name)
-        else
-          raise ArgumentError
-        end
-
-      RedisEval::Script.build_from_path(path)
-    end
-
-    private
-      def pathname(path)
-        path.is_a?(String) ? Pathname.new(path) : path
-      end
-
-      def script_cache
-        @script_cache ||= {}
-      end
-
-      def script_path(name)
-        RedisEval.config.script_paths.each {|path|
-          if (script = pathname(path).join("#{name}.lua")).exist?
-            return script
-          end
-        }
-        nil
-      end
-
-      def method_missing(name, *args, &block)
-        super unless respond_to?(name)
-
-        define_singleton_method(name) do |*a, &b|
-          script_cache[name.to_s] ||= build(name)
-        end
-
-        send(name, *args, &block)
-      end
-
-      def respond_to_missing?(name, include_private = false)
-        !!script_path(name)
-      end
-  end
-
-  extend GeneratorMethods
-end