tshield 0.2.0.0 → 0.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d02f83eebd27cd44d08a4c412fd85f0c80c880
-  data.tar.gz: d48b98aa498b0fe184d9a62105c5f5a2bd2e8b49
+  metadata.gz: d38191a1b4051da47c94d62f65e23a908c2ff8b3
+  data.tar.gz: 96b0176cb11b3f635b3671406c024d803c480b96
 SHA512:
-  metadata.gz: 925f01bebb1a163727ec0ab50afc1fd32118fc4d1397e67f4b563bcd9fd536564619e3297b78b1a20b7966922c96b16345b8bbfa30fe2cc721e5435c25461d64
-  data.tar.gz: 0df5eec384e06763f3c59b33cd3ff64d4715c3b8fedf71bde667403a46e594bf4e87e3d73ee264534202756ea187127ec30e7870b6441f1cc8ddf90af9ebd9a2
+  metadata.gz: 6480b0e7408e523f498d71503ac505daed9bf9a0acb55a24ea5154f42d3b1100e47af69a50e43de8e62b484627970520f13f5cf45d2044af921246d8c13c4676
+  data.tar.gz: 9cffbac477c63f2d84b64d1c3ebc65f25a373fc34f6dd38995cae22c7306fb1f570140751d4c8d2333e11237fb08585192686260266be90d796e68eeef36a27f

data/lib/tshield.rb

@@ -1,4 +1,5 @@
 require 'tshield/server'
+require 'tshield/options'
 
 module TShield
 end

data/lib/tshield/configuration.rb

@@ -1,7 +1,10 @@
+require 'yaml'
+
 module TShield
   class Configuration
 
     attr_accessor :domains
+    attr_writer :session_path
 
     def initialize(attributes)
       attributes.each do |key, value|
@@ -24,6 +27,10 @@ module TShield
       domains[domain]['headers'] || {}
     end
 
+    def session_path
+      @session_path ||= '/sessions'
+    end
+
     private
     def self.load_configuration
       config_path = File.join('config', 'tshield.yml')

data/lib/tshield/controllers/requests.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+require 'sinatra'
+
+require 'byebug'
+
+require 'tshield/options'
+require 'tshield/configuration'
+require 'tshield/request'
+
+module TShield
+  module Controllers
+    module Requests
+      PATHP = /([a-zA-Z\/\.-_]+)/
+
+      def self.registered(app)
+        app.configure :production, :development do
+          app.enable :logging
+        end
+
+        
+        app.get (PATHP) do
+          treat(params, request)
+        end
+
+        app.post (PATHP) do
+          treat(params, request)
+        end
+
+        app.put (PATHP) do
+          treat(params, request)
+        end
+
+        app.patch (PATHP) do
+          treat(params, request)
+        end
+
+        app.head (PATHP) do
+          treat(params, request)
+        end
+      end
+
+      module Helpers
+        def treat(params, request)
+          path = params.fetch('captures', [])[0]
+
+          debugger if TShield::Options.instance.break?(path: path, moment: :before)
+
+          method = request.request_method
+          request_content_type = request.content_type
+
+          headers = {
+            'Content-Type' => request.content_type || 'application/json'
+          }
+
+          add_headers(headers, path)
+
+          options = {
+            method: method,
+            headers: headers,
+            raw_query: request.env['QUERY_STRING'],
+            ip: request.ip
+          }
+
+          if ['POST', 'PUT', 'PATCH'].include? method
+            result = request.body.read.encode('UTF-8', {
+              :invalid => :replace,
+              :undef   => :replace,
+              :replace => ''
+            })
+            options[:body] = result
+          end
+
+          set_content_type content_type
+
+          response = TShield::Request.new(path, options).response
+
+          logger.info(
+            "original=#{response.original} method=#{method} path=#{path} content-type=#{request_content_type}")
+
+          response.body
+        end
+
+        def set_content_type(request_content_type)
+          content_type :json
+        end
+
+        def add_headers(headers, path)
+          @configuration ||= TShield::Configuration.singleton
+          domain = @configuration.get_domain_for(path)
+          @configuration.get_headers(domain).each do |source, destiny| 
+            headers[destiny] = request.env[source] unless request.env[source].nil?
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/tshield/controllers/sessions.rb

@@ -0,0 +1,27 @@
+require 'sinatra/base'
+
+require 'tshield/configuration'
+require 'tshield/sessions'
+
+module TShield
+  module Controllers
+    module Sessions
+      def self.registered(app)
+
+        app.get TShield::Configuration.singleton.session_path do
+          TShield::Sessions.current(request.ip).to_json
+        end
+
+        app.post TShield::Configuration.singleton.session_path do
+          TShield::Sessions.start(request.ip, params[:name]).to_json
+        end
+
+        app.delete TShield::Configuration.singleton.session_path do
+          TShield::Sessions.stop(request.ip).to_json
+        end
+
+      end
+    end
+  end
+end
+

data/lib/tshield/counter.rb

@@ -1,27 +1,24 @@
 module TShield
   class Counter
 
-    attr_reader :sessions
-
     def initialize
-      @sessions = {}
+      @requests = {}
     end
 
-    def add(from, key)
-      requests = @sessions.fetch(from, {})
-      requests[key] ||= 0
-      requests[key] += 1
-      @sessions[from] = requests
+    def add(path, method)
+      requests_to_path = @requests.fetch(path, {})
+      requests_to_method = requests_to_path.fetch(method, 0)
+
+      requests_to_path[method] = requests_to_method += 1
+      @requests[path] = requests_to_path
     end
 
-    def self.singleton
-      @@counter ||= init
+    def current(path, method)
+      @requests.fetch(path, {}).fetch(method, 0)
     end
 
-    private
-    def self.init
-      counter = Counter.new
-      counter
+    def to_json(options = {})
+      @requests.to_json
     end
 
   end

data/lib/tshield/request.rb

@@ -3,9 +3,9 @@ require 'json'
 require 'byebug'
 
 require 'tshield/configuration'
-require 'tshield/counter'
 require 'tshield/options'
 require 'tshield/response'
+require 'tshield/sessions'
 
 module TShield
 
@@ -17,7 +17,6 @@ module TShield
       @path = path
       @options = options 
       @configuration = TShield::Configuration.singleton
-      @counter = TShield::Counter.singleton
       request
     end
 
@@ -37,6 +36,7 @@ module TShield
         @response = TShield::Response.new(raw.body, raw.header)
         @response.original = true
       end
+      current_session[:counter].add(@path, method) if current_session
       debugger if TShield::Options.instance.break?(path: @path, moment: :after)
       @response
     end
@@ -53,29 +53,33 @@ module TShield
     def save(raw_response)
       content << {body: raw_response.body}
       write(content)
-
       content
     end
 
+    def current_session
+      TShield::Sessions.current(@options[:ip])
+    end
+
     def content
-      return @content if @content
-      @content = []
-      if exists
-        @content = JSON.parse(File.open(destiny).read)
-      end
-      @content
+      @content ||= file_exists ? JSON.parse(File.open(destiny).read) : []
+    end
+
+    def file_exists
+      File.exists?(destiny)
     end
 
     def exists
-      File.exists?(destiny) && include_current_response?
+      file_exists  && include_current_response?
     end
 
     def include_current_response?
-      true
+      session = current_session
+      @content_idx = session ? session[:counter].current(@path, method) : 0
+      not content[@content_idx].nil?
     end
 
     def get_current_response
-      current = content[0]
+      current = content[@content_idx || 0]
       TShield::Response.new(current['body'], current['header']) 
     end
 
@@ -89,6 +93,11 @@ module TShield
       request_path = File.join('requests')
       Dir.mkdir(request_path) unless File.exists?(request_path)
 
+      if session = current_session
+        request_path = File.join(request_path, session[:name])
+        Dir.mkdir(request_path) unless File.exists?(request_path)
+      end
+
       domain_path = File.join(request_path, domain.gsub(/.*:\/\//, ''))
       Dir.mkdir(domain_path) unless File.exists?(domain_path)
 

data/lib/tshield/server.rb

@@ -1,94 +1,17 @@
-# encoding: utf-8
-
 require 'sinatra'
 
-require 'byebug'
-
-require 'tshield/options'
-require 'tshield/configuration'
-require 'tshield/request'
+require 'tshield/controllers/requests'
+require 'tshield/controllers/sessions'
 
 module TShield
   class Server < Sinatra::Base
 
-    configure :production, :development do
-      enable :logging
-    end
-
-    PATHP = /([a-zA-Z\/\.-_]+)/
-    
-    get (PATHP) do
-      treat(params, request)
-    end
-
-    post (PATHP) do
-      treat(params, request)
-    end
-
-    put (PATHP) do
-      treat(params, request)
-    end
-
-    patch (PATHP) do
-      treat(params, request)
-    end
-
-    head (PATHP) do
-      treat(params, request)
-    end
-
-    private
-    def treat(params, request)
-      path = params.fetch('captures', [])[0]
-
-      debugger if TShield::Options.instance.break?(path: path, moment: :before)
-
-      method = request.request_method
-      request_content_type = request.content_type
+    include TShield::Controllers::Requests::Helpers
 
-      headers = {
-        'Content-Type' => request.content_type || 'application/json'
-      }
-
-      add_headers(headers, path)
-
-      options = {
-        method: method,
-        headers: headers,
-        raw_query: request.env['QUERY_STRING']
-      }
-
-      if ['POST', 'PUT', 'PATCH'].include? method
-        result = request.body.read.encode('UTF-8', {
-          :invalid => :replace,
-          :undef   => :replace,
-          :replace => ''
-        })
-        options[:body] = result
-      end
-
-      set_content_type content_type
-
-      response = TShield::Request.new(path, options).response
-
-      logger.info(
-        "original=#{response.original} method=#{method} path=#{path} content-type=#{request_content_type}")
-
-      response.body
-    end
-
-    def set_content_type(request_content_type)
-      content_type :json
-    end
-
-    def add_headers(headers, path)
-      @configuration ||= TShield::Configuration.singleton
-      domain = @configuration.get_domain_for(path)
-      @configuration.get_headers(domain).each do |source, destiny| 
-        headers[destiny] = request.env[source] unless request.env[source].nil?
-      end
-    end
+    register TShield::Controllers::Sessions
+    register TShield::Controllers::Requests
 
   end
 end
 
+

data/lib/tshield/sessions.rb

@@ -0,0 +1,24 @@
+require 'byebug'
+require 'tshield/counter'
+
+module TShield
+  module Sessions
+    def self.start(ip, name)
+      sessions[ip] = {name: name, counter: TShield::Counter.new}
+    end
+
+    def self.stop(ip)
+      sessions[ip] = nil
+    end
+
+    def self.current(ip)
+      sessions[ip]
+    end
+
+    protected 
+    def self.sessions
+      @sessions ||= {}
+    end
+  end
+end
+

data/lib/tshield/version.rb

@@ -1,7 +1,7 @@
 module TShield
   class Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     PRE = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.2.0.0
+  version: 0.3.0.0
 platform: ruby
 authors:
 - Diego Rubin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -163,11 +163,14 @@ files:
 - bin/tshield
 - lib/tshield.rb
 - lib/tshield/configuration.rb
+- lib/tshield/controllers/requests.rb
+- lib/tshield/controllers/sessions.rb
 - lib/tshield/counter.rb
 - lib/tshield/options.rb
 - lib/tshield/request.rb
 - lib/tshield/response.rb
 - lib/tshield/server.rb
+- lib/tshield/sessions.rb
 - lib/tshield/version.rb
 - spec/spec_helper.rb
 - spec/tshield/configuration_spec.rb