druzy-server 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec849c3ea471cc472e4cfb3a8d7f1bf0a83662f
-  data.tar.gz: 552d7cdee6e49bc132a365b1a587b5354c4c3e5a
+  metadata.gz: ba37955cbc026750b06e411f2c1a68c1b7994f78
+  data.tar.gz: 913dc72ba12214063268340886d7f0e9d87b1625
 SHA512:
-  metadata.gz: 2d267385056806cd681ba9a05eb7a801f77f234b6dfcfeaf83cb0005a2921e60800c92c877dc6a38fd74440543d9e6c6f89e7bf4cf3444523fcd9ca8ca2955cf
-  data.tar.gz: 2b3a4e15c1b10b5e0e374b4d3d099a6d29d0af8515df21c7057ad9de06b155bc1c1cdef89625a7591a3e77c3fd251f74bf61c3ec3003e7ab3825a31c40d92375
+  metadata.gz: eeaec2a5f6e9812fb6ae3ad14fcbadfe0c3e96bc637461f3223598865cacfe41285ee9aa91054ebc5f15eefc3803f0fdb4205729bffa3f045e1ac378241d2350
+  data.tar.gz: 6815e298d064ad65db6b903b5e2838d921da2e8fbf1b7f01059a17323231f842b3bb39d75f9f738bbb93c318e9384cf9878993ac3b80602b8390458f74261487

data/lib/druzy/server/one_instance_by_port.rb

@@ -0,0 +1,33 @@
+require 'webrick'
+
+module Druzy
+  module Server  
+    class OneInstanceByPort
+      @@instances={}
+      
+      def initialize(port)
+        @server=WEBrick::HTTPServer.new(:Port => port)
+      end
+      
+      def self.instance(port)
+        if !@@instances.has_key?(port)
+          @@instances[port]=new(port)
+        end
+        @@instances[port]
+      end
+      
+      def start_server
+        Thread.new{@server.start()}
+      end
+      
+      def stop_server
+        @server.stop
+      end
+      
+      private_class_method :new
+      private :start_server, :stop_server
+      
+    end
+  
+  end
+end

data/lib/druzy/server/restricted_file_server.rb

@@ -0,0 +1,58 @@
+require_relative 'one_instance_by_port'
+
+require 'druzy/utils/net'
+require 'i18n'
+require 'socket'
+require 'webrick'
+
+I18n.enforce_available_locales = false
+
+module Druzy
+  module Server  
+    class RestrictedFileServer < OneInstanceByPort
+      
+      def initialize(port)
+        super(port)
+        
+        @files={}
+        @id=0
+      end
+      
+      def add_file(file)
+        @files[file]=@id
+        @server.mount("/"+@id.to_s+"/"+I18n.transliterate(File.basename(file)),WEBrick::HTTPServlet::FileHandler,file)
+        @id+=1
+        
+        if @files.size == 1 
+          start_server
+        end
+      end
+      
+      def remove_file(file)
+        @files.delete(file)
+        if @files.size == 0
+          stop_server
+        end
+      end
+      
+      def get_address(file)
+        if @files.include?(file)
+          ip=Druzy::Utils.get_local_public_ipv4
+          return "http://"+ip+":"+@server.config[:Port].to_s+"/"+@files[file].to_s+"/"+I18n.transliterate(File.basename(file))
+        else
+          return nil
+        end
+        
+      end
+      
+    end
+  
+  end
+end
+
+if $0 == __FILE__
+  server=Druzy::Server::RestrictedFileServer.instance(15433)
+  server.add_file("/home/druzy/elliot.mp4")
+  puts server.get_address("/home/druzy/elliot.mp4")
+  sleep 30
+end

data/lib/druzy/server/version.rb

@@ -1,5 +1,5 @@
 module Druzy
   module Server
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/lib/druzy/server.rb

@@ -1,68 +1,2 @@
-require 'druzy/server/version'
-
-require 'i18n'
-require 'socket'
-require 'webrick'
-
-I18n.enforce_available_locales = false
-
-module Druzy
-  module Server  
-    class RestrictedFileServer
-      @@instances={}
-      
-      def initialize(port)
-        @server=WEBrick::HTTPServer.new(:Port => port)
-        @files={}
-        @id=0
-      end
-      
-      def self.instance(port)
-        if !@@instances.has_key?(port)
-          @@instances[port]=new(port)
-        end
-        @@instances[port]
-      end
-      
-      def add_file(file)
-        @files[file]=@id
-        @server.mount("/"+@id.to_s+"/"+I18n.transliterate(File.basename(file)),WEBrick::HTTPServlet::FileHandler,file)
-        @id+=1
-        
-        if @files.size == 1 
-          start_server
-        end
-      end
-      
-      def remove_file(file)
-        @files.delete(file)
-        if @files.size == 0
-          stop_server
-        end
-      end
-      
-      def get_address(file)
-        if @files.include?(file)
-          ip=Socket.ip_address_list.detect{|intf| intf.ipv4? and !intf.ipv4_loopback? and !intf.ipv4_multicast?}
-          return "http://"+ip.ip_address+":"+@server.config[:Port].to_s+"/"+@files[file].to_s+"/"+I18n.transliterate(File.basename(file))
-        else
-          return nil
-        end
-        
-      end
-      
-      def start_server
-        Thread.new{@server.start()}
-      end
-      
-      def stop_server
-        @server.stop
-      end
-      
-      private_class_method :new
-      private :start_server, :stop_server
-      
-    end
-  
-  end
-end
+require_relative 'server/version'
+require_relative 'server/restricted_file_server'

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: druzy-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: druzy-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/druzy/server.rb
+- lib/druzy/server/one_instance_by_port.rb
+- lib/druzy/server/restricted_file_server.rb
 - lib/druzy/server/version.rb
 homepage: https://github.com/druzy/ruby-druzy-server
 licenses:
@@ -81,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A very restrictive http server