iprange 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cf4818d4ba6e945d3d11f15edd860b7586bf815
-  data.tar.gz: 10995790fd132aa1bc7100f71b4ddb9f155e75f1
+SHA256:
+  metadata.gz: af5afe44bc65284d1801beab8b3dacf81773b151c535eaf354a4e6f3d3f241c3
+  data.tar.gz: f99758acb9dbaeb69f70cd0f23290f361244f28c27fe5180ec51d80385969512
 SHA512:
-  metadata.gz: 0d4ffb3db2965f645f80c92b77fb77b2623cb34c2fbd485426d652cc39678e04d3a173d5dc867825e36613a2bc4c03aeac95c925204ac6bedc79edb318daf273
-  data.tar.gz: f9d801b8bd54dedb193ba169b7aa738bfe1af0fd94fcd10d87135c5359195120eca1c1252664753de46d02b25bbb12035e4bacdf0fb288b1c18548a976bcc35b
+  metadata.gz: 465610649a517b9516533cae8080b52f13333efbec0433cbf30b3d63e82984d49a33d3098ca375f93875efd46a321f67e0882c49603a80537278a7cee47400d9
+  data.tar.gz: 774d3e8c2c618709bd2f56b76251b0cabb048ff6b58b6a632711b5a43365020ad39a3d73c4b4fdf4bd1038cd2ce42ddf7818958795b544653d5453130dadb49f

data/README.md

@@ -32,7 +32,7 @@ If your intervals do not, you can try the tag v0.0.1, which uses sorted sets ins
 
 ## Contributing
 
-1. Fork it ( http://github.com/jbochi/iprange/fork )
+1. Fork it ( http://github.com/globocom/iprange/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/iprange.rb

@@ -10,15 +10,21 @@ module IPRange
     end
 
     def remove(range)
-      @redis.irem(@redis_key, range)
-      @redis.del(metadata_key(range))
+      @redis.pipelined do
+        @redis.irem(@redis_key, range)
+        @redis.del(metadata_key(range))
+      end
     end
 
     def add(range, metadata={})
       ipaddr_range = IPAddr.new(range).to_range
-      @redis.iadd(@redis_key, ipaddr_range.first.to_i, ipaddr_range.last.to_i, range)
+      range = "#{metadata[:key]}:#{range}" if metadata[:key]
       hash = metadata_key(range)
-      @redis.mapped_hmset(hash, metadata) unless metadata.empty?
+
+      @redis.pipelined do
+        @redis.iadd(@redis_key, ipaddr_range.first.to_i, ipaddr_range.last.to_i, range)
+        @redis.mapped_hmset(hash, metadata) unless metadata.empty?
+      end
     end
 
     def find(ip)

data/lib/iprange/version.rb

@@ -1,3 +1,3 @@
 module Iprange
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/iprange_spec.rb

@@ -66,6 +66,21 @@ describe IPRange::Range do
     end
   end
 
+  describe "when a range is added with extra key" do
+    after :each do
+      range = IPRange::Range.new()
+      range.remove("router1:192.168.0.1/24")
+    end
+
+    it "should find it with the key" do
+      range = IPRange::Range.new
+      range.add("192.168.0.1/24", key: "router1")
+
+      response = range.find("192.168.0.20")
+      expect(response[:range]).to eq("router1:192.168.0.1/24")
+    end
+  end
+
   describe "when there is multiple ranges with overlap" do
     subject do
       IPRange::Range.new

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: iprange
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Juarez Bochi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Save IP ranges on Redis for fast lookup using interval sets.
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,17 +102,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: IP ranges on Redis