softwear-lib 1.9.4 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76a6c901c0fdabb3e406471cd1f56d9fa663c4c3
-  data.tar.gz: efefa401b769ba1f484a4a6538ac74cdfc288ac2
+  metadata.gz: f4ffc6852fd827bfa7f32f9db01d2b19e73cd5e1
+  data.tar.gz: 9e869b8b7166141a64c1f261800b45e184e4f478
 SHA512:
-  metadata.gz: 8023d0eb9c4eb1b4a0bbc9b31dd691deb45f21bdf38aea33892a07209cc881185507ffb326a82232a13cd32d4cc012f3316a17abc09aa52f64764e0f60d0add3
-  data.tar.gz: a007ebf93851b2f5a483678ab5120bbd57eca4f2f2ae007439764417ff2b81a300449087c72e71e2d60281f5a8689da591c5eaf6983936516924f2d9d1c78ab0
+  metadata.gz: fb32f5c83861fccdee7594c31ffa62553dcadb5e380502c7f405ddaba0b6e5b34d92e10bf9631e5f10e38c1fae31f78904674781bf33ccba111cdb4f67e0dea7
+  data.tar.gz: 116fedc2e671d956da3a8bed15b5925c53ce26cb8a62095996fd7e1c77e11c468b60b0fcb33a5f3d628e3e56a3d81c7fff223037751fde1ffd63a5e61995457d

data/lib/softwear/auth/standard_model.rb

@@ -394,8 +394,8 @@ module Softwear
         # Given an invalid signin token:
         #   Returns false
         # ====================
-        def auth(token)
-          response = validate_response query "auth #{Figaro.env.hub_app_name} #{token}"
+        def auth(token, app_name = nil)
+          response = validate_response query "auth #{app_name || Figaro.env.hub_app_name} #{token}"
 
           return false unless response =~ /^yes .+$/
 

data/lib/softwear/auth/stubbed_model.rb

@@ -65,6 +65,14 @@ users:
           @users_yml
         end
 
+        #
+        # Transforms
+        # ['email@email.com', { 'attr1' => 'val1', 'attr2' => 'val2' }]
+        # From the yml format
+        #
+        # Into
+        # { 'email' => 'email@email.com', 'attr1' => 'val1', 'attr2' => 'val2' }
+        #
         def yml_entry(entry, id_if_default = nil)
           attributes = {}.with_indifferent_access
 
@@ -95,7 +103,7 @@ users:
           all.select { |u| !u.roles.nil? && roles.any? { |r| u.roles.include?(r) } }
         end
 
-        def auth(_token)
+        def auth(_token, _appname = nil)
           signed_in = users_yml[:signed_in]
 
           yml_entry [signed_in, users_yml[:users][signed_in]] unless signed_in.blank?

data/lib/softwear/lib/tcp_server.rb

@@ -0,0 +1,107 @@
+def split(string, limit = nil)
+  string.split(/\s+/, limit)
+end
+
+def report_error(client, whole_command, error)
+  $stderr.puts "=== ERROR WHILE PROCESSING THE COMMAND \"#{whole_command}\" ===\n"\
+    "#{error.class.name}: #{error.message}\n#{error.backtrace.join("\n")}"
+  client.puts "sorry"
+end
+
+def dev_log(*a)
+  $stdout.puts(*a) if Rails.env.development?
+end
+
+def log(*a)
+  $stdout.puts(*a) unless Rails.env.test?
+end
+
+# TODO for production, we want to use the SSL server instead of straight up TCP.
+
+# ==== Send Format: =======
+# One line strings: "#{command} #{arg1} #{arg2} #{etc}"
+# The last argument, depending on the command, may contain spaces (but usually does not need to)
+# =========================
+# === Receive Format: =====
+# Usually one string, like "yes", or "no".
+# Returns "denied"  if an unauthorized command was attempted.
+# Returns "invalid" if an invalid command was attempted.
+# Returns "sorry"   if an error was raised while processing the command.
+# Can be a json argument, often following "yes ".
+# =========================
+def address_of(socket)
+  _family, port, name, host = socket.addr
+  if host == name
+    "#{host}:#{port}"
+  else
+    "#{name}(#{host}):#{port}"
+  end
+end
+
+def start_server!(*args)
+  log "Connecting...!"
+  
+  if args.size > 1
+    port = args.first
+  else
+    port = ENV['port'] || ENV['PORT'] || 2900
+  end
+
+  server = TCPServer.new port
+  log "Ready! Using \"#{ActiveRecord::Base.connection.current_database}\" database"
+
+  client_count = 0
+  commands = args.last
+
+  loop do
+    Thread.start(server.accept) do |client|
+      client_count += 1
+      dev_log "New client! ##{client_count} #{address_of client}"
+
+      if Rails.env.development?
+        response_logger = Module.new do
+          def puts(s)
+            $stdout.puts "==> #{s}"
+            super
+          end
+        end
+        client.singleton_class.send :include, response_logger
+      end
+
+      while line_in = client.gets.chomp
+        log "Processing \"#{line_in}\"" if Rails.env.test?
+
+        command, rest_of_command = split(line_in, 2)
+
+        before = Time.now
+        begin
+          command = commands[command.downcase.to_sym]
+
+          if command.nil?
+            log "SOMEONE attempted invalid command: \"#{line_in}\""
+          else
+            dev_log "<== #{line_in}"
+            ActiveRecord::Base.connection_pool.with_connection do
+              command.call(client, rest_of_command)
+            end
+          end
+
+        rescue StandardError => e
+          report_error(client, line_in, e)
+        rescue Exception => e
+          report_error(client, line_in, e)
+          break
+        end
+        after = Time.now
+
+        ms = (after - before) * 1000
+        dev_log %((#{'%.2f' % ms}ms) from #{address_of(client)})
+        dev_log ""
+      end
+
+      client_count -= 1
+      client.close rescue nil
+      dev_log "Client disconnected. #{address_of client}"
+    end
+  end
+end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.9.4"
+    VERSION = "1.10.1"
   end
 end

data/softwear-lib.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2.0"
 
-  spec.add_dependency "activesupport", "4.2.6"
+  spec.add_dependency "activesupport", "~> 4.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.10.1
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.5
 description: 
 email:
 - nigel@annarbortees.com
@@ -97,6 +97,7 @@ files:
 - lib/softwear/lib/controller_authentication.rb
 - lib/softwear/lib/enqueue.rb
 - lib/softwear/lib/spec.rb
+- lib/softwear/lib/tcp_server.rb
 - lib/softwear/lib/version.rb
 - softwear-lib.gemspec
 - spec/spec_helper.rb