hsss 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1664e6c83468f56b9c849d810198affc6b598ec
-  data.tar.gz: 6aa1c40b2971fb1bb24749700b0d03c77c283a7f
+  metadata.gz: c63fa9e158201da35d648e6a03ed4ca5b471387d
+  data.tar.gz: 6cadb149d7b7ba5089bc3b93364a90c53025272a
 SHA512:
-  metadata.gz: 67a16b01da0dd267d06fa266876997c342d74d90b88029a736a43eea7cae40e42ac6ab53fd9b1c555491522a573368fa246bbf2a78f93fa630e10dda5946893c
-  data.tar.gz: cbd123d2c4e7e75f2f0875e96b94054fd4a58cf75b8ef47e733fa2bf77603e2075ad658822d52c97c2b052079cd15c83e1043e7ce1f6ceb3c1ec244e7265388d
+  metadata.gz: f1ceb56c5b93b08394ee2436345e3745b23d534a5a1b1612e4afae5c2268744394540fd30ec87ff516bf0f7b535e447172dbd92fd2f4b52274e02a2be0a5f537
+  data.tar.gz: 2682f818c6ab443bcb1720ed67a4a931b2c8a1455641937f7e7ad2b6ab271f22ff2c9df490fa7e7856564d154d089be9aa8dd167109bb5058b7943645a5e92f1

data/exe/hsss

@@ -18,7 +18,7 @@ arg=OptionParser.new do |opts|
   opts.on("--no-each", "Omit the iterator macro"){opt[:skip_each]=true}
   opts.on("--no-parse", "Skip using luac to check script syntax"){opt[:no_luac]=true}
   opts.on("--no-static", "Don't make variables static (file-scoped)"){opt[:no_static]=true}
-  opts.on("--prefix PREFIX", "Prefix default names with this"){|v| opt[:prefix]=v}
+  opts.on("--prefix [#{Hsss::DEFAULT_PREFIX}]", "Prefix default names with this"){|v| opt[:prefix]=v}
 end
 arg.banner=<<EOS
 Hash-Safe Script Splinterer, a Lua Script and hash embedder into C source. 

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/hsss.rb

@@ -2,35 +2,44 @@ require "hsss/version"
 require 'digest/sha1'
 
 module Hsss
-  DEFAULT_STRUCT_NAME="redis_lua_scripts_t"
-  DEFAULT_ROW_STRUCT_NAME="redis_lua_script_t"
-  DEFAULT_HASHES_NAME="redis_lua_hashes"
-  DEFAULT_NAMES_NAME="redis_lua_script_names"
-  DEFAULT_SCRIPTS_NAME="redis_lua_scripts"
-  DEFAULT_COUNT_NAME="redis_lua_scripts_count"
-  DEFAULT_ITER_MACRO_NAME="REDIS_LUA_SCRIPTS_EACH"
+  DEFAULT_STRUCT_NAME="lua_scripts_t"
+  DEFAULT_ROW_STRUCT_NAME="lua_script_t"
+  DEFAULT_HASHES_NAME="lua_hashes"
+  DEFAULT_NAMES_NAME="lua_script_names"
+  DEFAULT_SCRIPTS_NAME="lua_scripts"
+  DEFAULT_COUNT_NAME="lua_scripts_count"
+  DEFAULT_ITER_MACRO_NAME="LUA_SCRIPTS_EACH"
+  DEFAULT_PREFIX="redis_"
   
   class COutput
     EXT="lua"
     attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name, :iter_macro_name, :row_struct_name
     
+    def cased_prefix(prefix, name)
+      if name && prefix
+        if name.upcase == name and name.downcase != name
+          name = "#{prefix.upcase}#{name}"
+        else
+          name = "#{prefix}#{name}"
+        end
+      end
+      name
+    end
+    
     def initialize(files, opt={})
       @scripts={}
-      { struct_name: DEFAULT_STRUCT_NAME, 
+      names = { struct_name: DEFAULT_STRUCT_NAME, 
         row_struct_name: DEFAULT_ROW_STRUCT_NAME,
         hashes_struct: DEFAULT_HASHES_NAME,
         names_struct: DEFAULT_NAMES_NAME,
         scripts_struct: DEFAULT_SCRIPTS_NAME,
         count_name: DEFAULT_COUNT_NAME,
-        iter_macro_name: DEFAULT_ITER_MACRO_NAME}.each do |var, default|
-        send "#{var}=", opt[var]!=false ? opt[var] || default : false
-      end
+        iter_macro_name: DEFAULT_ITER_MACRO_NAME}
       
-      if opt[:prefix]
-        [:struct_name, :hashes_struct, :names_struct, :scripts_struct].each do |var|
-          send "#{var}=", "#{opt[:prefix]}#{send var}" if send(var)
-        end
+      names.each do |var, default|
+        send "#{var}=", opt[var]!=false ? opt[var] || cased_prefix(opt[:prefix], default) : false
       end
+      
       @include_count = !opt[:skip_count]
       @include_iter_macro = !opt[:skip_each]
       @include_hash = !!hashes_struct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Leo P.