redis-diff_match_patch 1.1.0 → 1.1.1

data/lib/diff_match_patch-merge.lua

@@ -2321,28 +2321,28 @@ local diff2 = diff_main(src, dst2)
 local diff = diff1
 local diff1_offset = 1
 
-function diffToString(diffs)
-  local s = ""
-
-  for x, e in ipairs(diffs) do
-    if e[1] == DIFF_EQUAL then
-      s = s .. " EQU " .. e[2]
-    elseif e[1] == DIFF_DELETE then
-      s = s .. " DEL " .. e[2]
-    elseif e[1] == DIFF_INSERT then
-      s = s .. " INS " .. e[2]
-    end
-  end
-
-  return s
-end
-
-redis.call("set", "diff1-demo", diffToString(diff1))
-redis.call("set", "diff2-demo", diffToString(diff2))
-redis.call("del", "diff-demo-log")
-redis.call("del", "diff2-demo-log")
-redis.call("rpush", "diff-demo-log", diffToString(diff))
-redis.call("rpush", "diff2-demo-log", diffToString(diff2))
+-- function diffToString(diffs)
+--   local s = ""
+-- 
+--   for x, e in ipairs(diffs) do
+--     if e[1] == DIFF_EQUAL then
+--       s = s .. " EQU " .. e[2]
+--     elseif e[1] == DIFF_DELETE then
+--       s = s .. " DEL " .. e[2]
+--     elseif e[1] == DIFF_INSERT then
+--       s = s .. " INS " .. e[2]
+--     end
+--   end
+-- 
+--   return s
+-- end
+-- 
+-- redis.call("set", "diff1-demo", diffToString(diff1))
+-- redis.call("set", "diff2-demo", diffToString(diff2))
+-- redis.call("del", "diff-demo-log")
+-- redis.call("del", "diff2-demo-log")
+-- redis.call("rpush", "diff-demo-log", diffToString(diff))
+-- redis.call("rpush", "diff2-demo-log", diffToString(diff2))
 
 -- Merge diff2 into diff1.
 while table.getn(diff2) > 0 do
@@ -2420,8 +2420,8 @@ while table.getn(diff2) > 0 do
     diff1_offset = diff1_offset + 1
   end
 
-  redis.call("rpush", "diff-demo-log", diffToString(diff))
-  redis.call("rpush", "diff2-demo-log", diffToString(diff2))
+--   redis.call("rpush", "diff-demo-log", diffToString(diff))
+--   redis.call("rpush", "diff2-demo-log", diffToString(diff2))
 end
 
 local patches = patch_make(src, diff)

data/lib/redis-diff_match_patch.rb

@@ -7,7 +7,7 @@ class Redis
 
     attr_reader :redis
 
-    VERSION      = "1.1.0"
+    VERSION      = "1.1.1"
 
     RESOURCE_DIR = File.dirname(__FILE__)
     DIFF_SCRIPT  = File.read File.join(RESOURCE_DIR, "diff_match_patch-diff.lua")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-diff_match_patch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70096136592700 !ruby/object:Gem::Requirement
+  requirement: &70096334634300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096136592700
+  version_requirements: *70096334634300
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70096136592280 !ruby/object:Gem::Requirement
+  requirement: &70096334633880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096136592280
+  version_requirements: *70096334633880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70096136591860 !ruby/object:Gem::Requirement
+  requirement: &70096334633460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096136591860
+  version_requirements: *70096334633460
 description: This library will allow you to perform atomic diffs, patches and merges
   on Redis strings.
 email:
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2305032445798493678
+      hash: 1886756281668609739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2305032445798493678
+      hash: 1886756281668609739
 requirements: []
 rubyforge_project: redis-diff_match_patch
 rubygems_version: 1.8.11