hsss 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c214ad328e8c64a680d183de71a3d70ecfc4033e
-  data.tar.gz: 8f94f9e93cceb204226fdfbe975d2d12473d5814
+  metadata.gz: 487fa212d82812cc8a4857fa40ac9c187f24655f
+  data.tar.gz: adcd2bfd44090494e15c4c5e1244136cfe1597a4
 SHA512:
-  metadata.gz: 58c666e386a44a976090f939b9c88006909f3ab3cb2fb6f31a47294bf4193298b2e5af67195fbe2cc83f9cb4bad98c8b30f8f8627fcec05d2bb9bbfd196efdec
-  data.tar.gz: 36eb952a2a3ad64a5481895a715cecad71d10a1c0a9f534008bd1b5640ff6ce434334a29d1f0658464adbbdb2649ab3ace0b3c863e8858037c81dc56b46be992
+  metadata.gz: 05afc51d04680fbfe69190cde89918e5838156858c25ce88c6a9001d4eab710808ae623d8d9535283a5c148f446e33ba117a7ea131bd3cfbfebf1a62d3ebfa6b
+  data.tar.gz: 0d1d0db05ab197ab623540b023ed7a5777886a4bb04c6c55b8c411d6fd930a56c0ce5e6cefed2c6a5de470d182354764e80bee64c7f6107c92970a4d33729c7d

data/CODE_OF_CONDUCT.md

@@ -1,6 +1,7 @@
-In the spirit of inclusiveness, cooperation and community, this gem is 
+In the spirit of inclusiveness, cooperation and community, this software is 
 distributed with the strictly enforced CYHTFYW Code of Conduct. Failure to 
-comply with this code may result in punitive action and angry bees.
+comply with this code may result in punitive action and loss of privilege.
+
+## CYHTFYW Code of Conduct:
 
-CYHTFYW Code of Conduct:
 1. Conduct yourself however the fuck you want.

data/README.md

@@ -1,40 +1,123 @@
 # Hsss
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/hsss`. To experiment with that code, run `bin/console` for an interactive prompt.
+Hash-Safe Script Splinterer, a Lua Script and hash embedder into C source. 
+Good for putting Redis Lua scripts in your C headers.
+```
+Usage: hsss [options] files
+  --struct [redis_lua_script_t]     C struct name
+  --scripts [redis_lua_scripts]     Scripts variable
+  --hashes [redis_lua_hashes]       Hashes variable
+  --names [redis_lua_script_names]  Script names variable
+  --count [redis_lua_scripts_count] integer script count variable
+  --no-count                        Omit script count variable
+  --each-macro [REDIS_LUA_SCRIPTS_EACH] Iterator macro
+  --no-each                         Omit the iterator macro
+  --no-parse                        Skip using luac to check script syntax
+  --prefix PREFIX                   Prefix default names with this
+```
 
-TODO: Delete this and the text above, and describe your gem
+## Example
 
-## Installation
+Let's say you have two scripts in directory `example/`:
 
-Add this line to your application's Gemfile:
+`echo.lua`:
+```lua
+--echoes the first argument
+redis.call('echo', ARGS[1])
 
-```ruby
-gem 'hsss'
 ```
 
-And then execute:
-
-    $ bundle
+`delete.lua`
+```lua
+--deletes first key
+redis.call('del', KEYS[1])
 
-Or install it yourself as:
+```
 
-    $ gem install hsss
+running `hsss example/*.lua` outputs
+```c
+// don't edit this please, it was auto-generated by hsss
+// https://github.com/slact/hsss
 
-## Usage
+typedef struct {
+  //deletes first key
+  char *delete;
 
-TODO: Write usage instructions here
+  //echoes the first argument
+  char *echo;
 
-## Development
+} redis_lua_script_t;
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+static redis_lua_script_t redis_lua_hashes = {
+  "c6929c34f10b0fe8eaba42cde275652f32904e03",
+  "8f8f934c6049ab4d6337cfa53976893417b268bc"
+};
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+static redis_lua_script_t redis_lua_script_names = {
+  "delete",
+  "echo",
+};
 
-## Contributing
+static redis_lua_script_t redis_lua_scripts = {
+  //delete
+  "--deletes first key\n"
+  "redis.call('del', KEYS[1])\n",
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hsss.
+  //echo
+  "--echoes the first argument\n"
+  "redis.call('echo', ARGS[1])\n"
+};
 
+const int redis_lua_scripts_count=2;
+#define REDIS_LUA_SCRIPTS_EACH(script_src, script_name, script_hash) \
+for((script_src)=(char **)&redis_lua_scripts, (script_hash)=(char **)&redis_lua_hashes, (script_name)=(char **)&redis_lua_script_names; (script_src) < (char **)(&redis_lua_scripts + 1); (script_src)++, (script_hash)++, (script_name)++)
+```
 
+## Using in your C code
+
+- `EVALSHA`:  
+  ```c
+  redisAsyncCommand(asyncContext, callback, data, "EVALSHA %s 0", redis_lua_hashes.script_name);
+  ```
+  
+- iterator macro, loading scripts  
+  ```c
+  
+  //privdata for error checking callback
+  typedef struct {
+    char      *name;
+    char      *hash;
+  } script_hash_and_name_t;
+  
+  //error checking callback
+  static void redisLoadScriptCallback(redisAsyncContext *c, void *r, void *privdata) {
+    script_hash_and_name_t *hn = privdata;
+    redisReply *reply = r;
+    switch(reply->type) {
+      case REDIS_REPLY_ERROR:
+        printf("nchan: Failed loading redis lua script %s :%s", hn->name, reply->str);
+        break;
+      case REDIS_REPLY_STRING:
+        if(strcmp(reply->str, hn->hash)!=0) { //sha1 hash length is 40 chars
+          printf("nchan Redis lua script %s has unexpected hash %s (expected %s)", hn->name, reply->str, hn->hash);
+        }
+        break;
+    }
+    free(hn);
+  }
+  
+  static void redisInitScripts(redisAsyncContext *c){
+    char **script, **script_name, **script_hash;
+    
+    REDIS_LUA_SCRIPTS_EACH(script, script_name, script_hash) {
+      script_hash_and_name_t *hn = alloc(sizeof(*hn));
+      hn->name=*script_name;
+      hn->hash=*script_hash;
+      redisAsyncCommand(c, redisLoadScriptCallback, hn, "SCRIPT LOAD %s", *script);
+    }
+  }
+  ```
+  
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/hsss.rb

@@ -46,7 +46,8 @@ module Hsss
       end
       
       @cout= <<-EOS.gsub(/^ {8}/, '')
-        //don't edit this please, it was auto-generated
+        // don't edit this please, it was auto-generated by hsss
+        // https://github.com/slact/hsss
         
         typedef struct {
         %s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler