kamerling 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fc62bb2935ad87b89aab902c23a18f7ca22ec6
-  data.tar.gz: 130ab735ffaca0ea074199318838895de984db52
+  metadata.gz: 9be4e3ac2863218c3d390f4afb2e80f8da0c93be
+  data.tar.gz: 98c18518041d91d383daa9c79c5bd46999de4b75
 SHA512:
-  metadata.gz: 95ce8867168f59361bbe8d3f6b711f65b8a2de44fe3aa8bb9d0d61dcdfc509c30a166d0a07881733b00c34bdfd9365de49f9c443dfead6fb057bcd994e1157f5
-  data.tar.gz: 37b7debbd247514aa960526b2a28fda463d9eaf0992037d40484326a24b5674278e63fce7d5e8b2ed4ac0d3d029a41d70b838a9e207d93377284e09b03848a95
+  metadata.gz: e1b0aeb3ea6a079fd8999f326e6800edcc9f6b56ad1ab0ed997fbf71223e571ae44a7e8c02dc0f5d7d11c65e4dc98b0eae55be57e532bfd90a8d9e61030a56b6
+  data.tar.gz: ffe10141b36930b5bf9b4b904312ca96e62e652b51b35f1fceab122fabd7a77258cd9a137936ce6af9c48fefc5968784f189c619cb3685c53091fea66fabcde0

data/.rubocop.yml

@@ -1,27 +1,9 @@
 AccessModifierIndentation:
   Enabled: false
 
-AlignArray:
-  Enabled: false
-
-AlignHash:
-  Enabled: false
-
-AlignParameters:
-  Enabled: false
-
 AndOr:
   Enabled: false
 
-CaseEquality:
-  Enabled: false
-
-ConstantName:
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
 Documentation:
   Enabled: false
 
@@ -29,22 +11,14 @@ EndAlignment:
   Enabled: false
 
 HandleExceptions:
-  Enabled: false
+  Exclude:
+    - lib/kamerling/server/sock.rb
 
 IndentationWidth:
   Enabled: false
 
 MethodDefParentheses:
-  Enabled: false
-
-MethodName:
-  Enabled: false
-
-SignalException:
-  Enabled: false
-
-SpaceAroundOperators:
-  Enabled: false
+  EnforcedStyle: require_no_parentheses
 
 TrailingComma:
-  Enabled: false
+  EnforcedStyleForMultiline: comma

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gemspec
+gem 'virtus', github: 'solnic/virtus'

data/Gemfile.lock

@@ -1,34 +1,62 @@
+GIT
+  remote: git://github.com/solnic/virtus.git
+  revision: c31940a63d1a4a2ac30032a0c01a9a217b5f5f82
+  specs:
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
+
 PATH
   remote: .
   specs:
-    kamerling (0.0.1)
+    kamerling (0.0.2)
       after_do (~> 0.3.0)
       sequel (~> 4.4)
       sinatra (~> 1.4)
       slim (~> 2.0)
       sqlite3 (~> 1.3)
+      virtus (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     after_do (0.3.0)
     ast (1.1.0)
+    atomic (1.1.16)
+    axiom-types (0.1.0)
+      descendants_tracker (~> 0.0.3)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.1.3)
     bogus (0.1.4)
       dependor (>= 0.0.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     dependor (1.0.1)
+    descendants_tracker (0.0.3)
+    equalizer (0.0.9)
     ffi (1.9.3)
+    ice_nine (0.11.0)
     json (1.8.1)
-    listen (1.0.3)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     mini_portile (0.5.2)
-    minitest (5.3.0)
+    minitest (5.3.1)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
+    nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    parser (2.1.5)
+    parser (2.1.7)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -42,26 +70,26 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
     reek (1.3.6)
       ruby2ruby (~> 2.0.7)
       ruby_parser (~> 3.2)
       sexp_processor
-    rerun (0.8.2)
-      listen (~> 1.0.3)
-    rubocop (0.18.1)
+    rerun (0.9.0)
+      listen (~> 2.7)
+    rubocop (0.19.1)
       json (>= 1.7.7, < 2)
-      parser (~> 2.1.3)
+      parser (~> 2.1.7)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.4.2)
     ruby2ruby (2.0.7)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
     ruby_parser (3.4.1)
       sexp_processor (~> 4.1)
-    sequel (4.7.0)
-    sexp_processor (4.4.1)
+    sequel (4.8.0)
+    sexp_processor (4.4.2)
     sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -69,10 +97,13 @@ GEM
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.4.7)
+    slop (3.5.0)
     sqlite3 (1.3.9)
     temple (0.6.7)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
@@ -86,5 +117,6 @@ DEPENDENCIES
   rack-test (~> 0.6.2)
   rake (~> 10.1)
   reek (~> 1.3)
-  rerun (~> 0.8.2)
-  rubocop (~> 0.18.0)
+  rerun (~> 0.9.0)
+  rubocop (~> 0.19.0)
+  virtus!

data/config/reek.yml

@@ -9,10 +9,6 @@ IrresponsibleModule:
 NestedIterators:
   max_allowed_nesting: 2
 
-UncommunicativeMethodName:
-  exclude:
-  - Kamerling#self.UUIDObject
-
 UnusedParameters:
   exclude:
   - Kamerling::Server::HTTP#initialize

data/kamerling.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'kamerling'
   gem.summary     = 'Kamerling: a computation network server'
-  gem.version     = '0.0.1'
+  gem.version     = '0.0.2'
 
   gem.files       = `git ls-files -z`.split "\0"
   gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename path }
@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra',  '~> 1.4'
   gem.add_dependency 'slim',     '~> 2.0'
   gem.add_dependency 'sqlite3',  '~> 1.3'
+  gem.add_dependency 'virtus',   '~> 1.0'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.0'
@@ -25,6 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rack-test',      '~> 0.6.2'
   gem.add_development_dependency 'rake',           '~> 10.1'
   gem.add_development_dependency 'reek',           '~> 1.3'
-  gem.add_development_dependency 'rerun',          '~> 0.8.2'
-  gem.add_development_dependency 'rubocop',        '~> 0.18.0'
+  gem.add_development_dependency 'rerun',          '~> 0.9.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.19.0'
 end

data/lib/kamerling.rb

@@ -20,10 +20,10 @@ require_relative 'kamerling/server/udp'
 require_relative 'kamerling/server_runner'
 require_relative 'kamerling/task_dispatcher'
 require_relative 'kamerling/uuid'
-require_relative 'kamerling/uuid_object'
+require_relative 'kamerling/uuid_entity'
 require_relative 'kamerling/client'
 require_relative 'kamerling/project'
 require_relative 'kamerling/registration'
-require_relative 'kamerling/result'
 require_relative 'kamerling/task'
+require_relative 'kamerling/result'
 require_relative 'kamerling/logging'

data/lib/kamerling/addr.rb

@@ -11,6 +11,10 @@ module Kamerling
       [host, port]
     end
 
+    def to_h
+      super.merge prot: prot.to_s
+    end
+
     def to_s
       "#{host}:#{port} (#{prot})"
     end

data/lib/kamerling/client.rb

@@ -1,2 +1,14 @@
-module Kamerling class Client < UUIDObject :addr, busy: false
+module Kamerling class Client < UUIDEntity
+  attribute :addr, Addr
+  attribute :busy, Boolean, default: false
+
+  def self.from_h hash
+    super.tap do |client|
+      client.addr = Addr[hash[:host], hash[:port], hash[:prot]]
+    end
+  end
+
+  def to_h
+    super.reject { |key, _| key == :addr }.merge addr.to_h
+  end
 end end

data/lib/kamerling/core_extensions/main.rb

@@ -3,8 +3,8 @@ module Kamerling module CoreExtensions module Main
 
   def req param
     method   = caller.first[/`(.*)'$/, 1]
-    callsite = Class === self ? "#{name}.#{method}" : "#{self.class}##{method}"
-    raise "#{callsite}: param #{param} is required"
+    callsite = is_a?(Class) ? "#{name}.#{method}" : "#{self.class}##{method}"
+    fail "#{callsite}: param #{param} is required"
   end
 
   def warn_off

data/lib/kamerling/handler.rb

@@ -6,19 +6,24 @@ module Kamerling class Handler
   end
 
   def handle input, addr
-    message = Message.new input
+    process Message.new(input), addr
+  rescue Message::UnknownType => exception
+    raise UnknownInput, exception.message
+  end
+
+  attr_reader :receiver, :registrar
+  private     :receiver, :registrar
+
+  private
+
+  def process message, addr
     case message.type
     when :RGST
       registrar.register addr: addr, client_uuid: message.client_uuid,
-        project_uuid: message.project_uuid
+                         project_uuid: message.project_uuid
     when :RSLT
       receiver.receive addr: addr, client_uuid: message.client_uuid,
-        data: message.payload, task_uuid: message.task_uuid
+                       data: message.payload, task_uuid: message.task_uuid
     end
-  rescue Message::UnknownType => exception
-    raise UnknownInput, exception.message
   end
-
-  attr_reader :receiver, :registrar
-  private     :receiver, :registrar
 end end

data/lib/kamerling/logging.rb

@@ -4,17 +4,29 @@ require 'logger'
 module Kamerling module Logging
   module_function
 
-  def log_to logger: Logger.new($stdout)
-    Server::Sock.extend AfterDo
-    Server::Sock.before :start do |*, server|
-      logger.info "start #{server.addr}"
-    end
-    Server::Sock.before :handle do |input, client_addr|
-      logger.info "connect #{client_addr}"
-      logger.debug "received #{client_addr} #{input}"
+  def log_to logger = Logger.new($stdout)
+    log_dispatcher_to logger
+    log_server_to     logger
+  end
+
+  class << self
+    private
+
+    def log_dispatcher_to logger
+      NetDispatcher.singleton_class.extend AfterDo
+      NetDispatcher.singleton_class.before :dispatch do |addr, bytes|
+        logger.debug "sent #{addr} #{bytes}"
+      end
     end
-    Server::Sock.after :stop do |*, server|
-      logger.info "stop #{server.addr}"
+
+    def log_server_to logger
+      Server::Sock.extend AfterDo
+      Server::Sock.before(:start) { |srv| logger.info "start #{srv.addr}" }
+      Server::Sock.after(:stop)   { |srv| logger.info "stop #{srv.addr}"  }
+      Server::Sock.before :handle do |input, client_addr|
+        logger.info "connect #{client_addr}"
+        logger.debug "received #{client_addr} #{input}"
+      end
     end
   end
 end end

data/lib/kamerling/message.rb

@@ -1,9 +1,8 @@
 module Kamerling class Message
-  KnownTypes  = %w[DATA PING RGST RSLT]
   UnknownType = Class.new RuntimeError
 
-  def self.[](client: req(:client), payload: req(:payload),
-              project: req(:project), task: req(:task), type: req(:type))
+  def self.[] client: req(:client), payload: req(:payload),
+              project: req(:project), task: req(:task), type: req(:type)
     new "#{type}\0\0\0\0\0\0\0\0\0\0\0\0" + UUID.bin(client.uuid) +
       UUID.bin(project.uuid) + UUID.bin(task.uuid) + payload
   end
@@ -11,7 +10,8 @@ module Kamerling class Message
   def initialize raw
     @raw = raw
     type = raw[0..3]
-    raise UnknownType, type unless KnownTypes.include? type or type.empty?
+    known_types = %w(DATA PING RGST RSLT)
+    fail UnknownType, type unless known_types.include? type or type.empty?
   end
 
   def == other

data/lib/kamerling/migrations/1_basic_schema.rb

@@ -19,9 +19,9 @@ Sequel.migration do
       integer :port, null: false
       string  :prot, null: false
       foreign_key :client_uuid,  :clients,  index: true, null: false,
-        type: :uuid
+                                            type: :uuid
       foreign_key :project_uuid, :projects, index: true, null: false,
-        type: :uuid
+                                            type: :uuid
     end
 
     create_table :results do
@@ -39,7 +39,7 @@ Sequel.migration do
       boolean :done, null: false
       bytea   :data, null: false
       foreign_key :project_uuid, :projects, index: true, null: false,
-        type: :uuid
+                                            type: :uuid
     end
   end
 end

data/lib/kamerling/net_dispatcher.rb

@@ -1,4 +1,6 @@
-module Kamerling class NetDispatcher
+module Kamerling module NetDispatcher
+  module_function
+
   def dispatch addr, bytes
     case addr.prot
     when :TCP then TCPSocket.open(*addr) { |socket| socket << bytes }

data/lib/kamerling/project.rb

@@ -1,2 +1,3 @@
-module Kamerling class Project < UUIDObject :name
+module Kamerling class Project < UUIDEntity
+  attribute :name, String
 end end

data/lib/kamerling/registration.rb

@@ -1,2 +1,12 @@
-module Kamerling class Registration < UUIDObject :addr, :client, :project
+module Kamerling class Registration < UUIDEntity
+  attribute :addr,    Addr
+  attribute :client,  Client
+  attribute :project, Project
+
+  def to_h
+    super
+      .reject { |key, _| key == :addr    }.merge(addr.to_h)
+      .reject { |key, _| key == :client  }.merge(client_uuid:  client.uuid)
+      .reject { |key, _| key == :project }.merge project_uuid: project.uuid
+  end
 end end

data/lib/kamerling/repo.rb

@@ -14,7 +14,7 @@ module Kamerling class Repo
 
   def [] uuid
     hash = warn_off { source[uuid: uuid] }
-    raise NotFound, "#{klass} with UUID #{uuid}" unless hash
+    fail NotFound, "#{klass} with UUID #{uuid}" unless hash
     klass.from_h hash
   end
 

data/lib/kamerling/result.rb

@@ -1,2 +1,13 @@
-module Kamerling class Result < UUIDObject :addr, :client, :data, :task
+module Kamerling class Result < UUIDEntity
+  attribute :addr,   Addr
+  attribute :client, Client
+  attribute :data,   String
+  attribute :task,   Task
+
+  def to_h
+    super
+      .reject { |key, _| key == :addr   }.merge(addr.to_h)
+      .reject { |key, _| key == :client }.merge(client_uuid: client.uuid)
+      .reject { |key, _| key == :task   }.merge task_uuid:   task.uuid
+  end
 end end

data/lib/kamerling/server_runner.rb

@@ -1,8 +1,6 @@
 require 'optparse'
 
 module Kamerling class ServerRunner
-  Settings = Struct.new(*%i[db host http tcp udp])
-
   def initialize args, classes: def_classes, orm: Sequel, repos: Repos
     @args    = args
     repos.db = orm.connect settings.db
@@ -26,24 +24,24 @@ module Kamerling class ServerRunner
 
   private
 
+  Settings = Struct.new(*%i(db host http tcp udp))
+
   def def_classes
     { http: Server::HTTP, tcp: Server::TCP, udp: Server::UDP }
   end
 
+  def defaults
+    Settings.new 'sqlite::memory:', '127.0.0.1'
+  end
+
   def settings
-    @settings ||= Settings.new.tap do |sets|
-      sets.db   = 'sqlite::memory:'
-      sets.host = '127.0.0.1'
-      OptionParser.new do |opts|
-        opts.on("--db #{sets.db}", String, 'database') do |db|
-          sets.db = db
-        end
-        opts.on("--host #{sets.host}", String, 'server host') do |host|
-          sets.host = host
-        end
-        opts.on('--http 0', Integer, 'HTTP port') { |http| sets.http = http }
-        opts.on('--tcp 0',  Integer, 'TCP port')  { |tcp|  sets.tcp  = tcp  }
-        opts.on('--udp 0',  Integer, 'UDP port')  { |udp|  sets.udp  = udp  }
+    @settings ||= defaults.tap do |set|
+      OptionParser.new do |opt|
+        opt.on("--db #{set.db}", String, 'database') { |db| set.db = db }
+        opt.on("--host #{set.host}", String, 'host') { |host| set.host = host }
+        opt.on('--http 0', Integer, 'HTTP port') { |http| set.http = http }
+        opt.on('--tcp 0',  Integer, 'TCP port')  { |tcp|  set.tcp  = tcp  }
+        opt.on('--udp 0',  Integer, 'UDP port')  { |udp|  set.udp  = udp  }
       end.parse! args
     end
   end

data/lib/kamerling/task.rb

@@ -1,2 +1,9 @@
-module Kamerling class Task < UUIDObject :data, :project, done: false
+module Kamerling class Task < UUIDEntity
+  attribute :data,    String
+  attribute :done,    Boolean, default: false
+  attribute :project, Project
+
+  def to_h
+    super.reject { |key, _| key == :project }.merge project_uuid: project.uuid
+  end
 end end

data/lib/kamerling/task_dispatcher.rb

@@ -1,5 +1,5 @@
 module Kamerling class TaskDispatcher
-  def initialize net_dispatcher: NetDispatcher.new, repos: Repos
+  def initialize net_dispatcher: NetDispatcher, repos: Repos
     @net_dispatcher = net_dispatcher
     @repos          = repos
   end
@@ -21,7 +21,7 @@ module Kamerling class TaskDispatcher
   def dispatch_task client: req(:client), project: req(:project),
                     task: req(:task)
     message = Message[client: client, payload: task.data, project: project,
-      task: task, type: :DATA]
+                      task: task, type: :DATA]
     net_dispatcher.dispatch client.addr, message.to_s
     client.busy = true
     repos << client

data/lib/kamerling/uuid_entity.rb

@@ -0,0 +1,15 @@
+require 'virtus'
+
+module Kamerling class UUIDEntity
+  include Equalizer.new :uuid
+
+  include Virtus.model
+
+  attribute :uuid, String, default: -> * { UUID.new }
+
+  class << self
+    alias_method :from_h, :new
+  end
+
+  alias_method :to_h, :attributes
+end end

data/spec/kamerling/addr_spec.rb

@@ -19,6 +19,12 @@ module Kamerling describe Addr do
     end
   end
 
+  describe '#to_h' do
+    it 'returns a Hash with Integer and String values' do
+      addr.to_h.must_equal host: 'localhost', port: 1981, prot: 'TCP'
+    end
+  end
+
   describe '#to_s' do
     it 'returns the Addr in ‘host:port (protocol)’ notation' do
       addr.to_s.must_equal 'localhost:1981 (TCP)'

data/spec/kamerling/handler_spec.rb

@@ -7,19 +7,30 @@ module Kamerling describe Handler do
 
     it 'handles RGST inputs' do
       input = 'RGST' + "\0" * 12 + '16B client  UUID16B project UUID'
+      client_uuid  = UUID['16B client  UUID']
+      project_uuid = UUID['16B project UUID']
       handler.handle input, addr
-      registrar.must_have_received :register, [{ addr: addr,
-        client_uuid: UUID['16B client  UUID'],
-        project_uuid: UUID['16B project UUID'] }]
+      args = {
+        addr:         addr,
+        client_uuid:  client_uuid,
+        project_uuid: project_uuid,
+      }
+      registrar.must_have_received :register, [args]
     end
 
     it 'handles RSLT inputs' do
-      input = 'RSLT' + "\0" * 12
-      input << '16B client  UUID16B project UUID16B task    UUIDdata'
+      input = 'RSLT' + "\0" * 12 +
+        '16B client  UUID16B project UUID16B task    UUIDdata'
+      client_uuid = UUID['16B client  UUID']
+      task_uuid   = UUID['16B task    UUID']
       handler.handle input, addr
-      receiver.must_have_received :receive, [{ addr: addr,
-        client_uuid: UUID['16B client  UUID'], data: 'data',
-        task_uuid: UUID['16B task    UUID'] }]
+      args = {
+        addr:        addr,
+        client_uuid: client_uuid,
+        data:        'data',
+        task_uuid:   task_uuid,
+      }
+      receiver.must_have_received :receive, [args]
     end
 
     it 'raises on unknown inputs' do

data/spec/kamerling/logging_spec.rb

@@ -8,7 +8,7 @@ module Kamerling describe Logging do
   let(:udp_server) { Server::UDP.new addr: Addr['localhost', 1979, :UDP] }
 
   before do
-    Logging.log_to logger: logger
+    Logging.log_to logger
     tcp_server.start
     udp_server.start
   end
@@ -18,7 +18,7 @@ module Kamerling describe Logging do
     udp_server.stop
   end
 
-  describe '.new' do
+  describe '.log_to' do
     it 'logs TCP server starts' do
       logged.must_include 'start localhost:1981 (TCP)'
     end
@@ -69,5 +69,12 @@ module Kamerling describe Logging do
       run_all_threads
       logged.must_include "received #{udp_addr} PING"
     end
+
+    it 'logs packet dispatches' do
+      server = UDPSocket.new.tap { |s| s.bind '127.0.0.1', 0 }
+      addr   = Addr[server.addr[3], server.addr[1], :UDP]
+      NetDispatcher.dispatch addr, 'PING'
+      logged.must_include "sent #{addr} PING"
+    end
   end
 end end

data/spec/kamerling/message_spec.rb

@@ -12,7 +12,7 @@ module Kamerling describe Message do
       project = fake :project, uuid: UUID.new
       task    = fake :task,    uuid: UUID.new
       message = Message[client: client, payload: 'pay', project: project,
-        task: task, type: :DATA]
+                        task: task, type: :DATA]
       message.client_uuid.must_equal client.uuid
       message.project_uuid.must_equal project.uuid
       message.task_uuid.must_equal task.uuid
@@ -57,7 +57,7 @@ module Kamerling describe Message do
 
   describe '#to_s' do
     it 'returns the raw bytes' do
-      mess.to_s.must_equal "#{mess.type}\0\0\0\0\0\0\0\0\0\0\0\0" +
+      mess.to_s.must_equal "#{mess.type}\0\0\0\0\0\0\0\0\0\0\0\0" \
         '16B client  UUID16B project UUID16B task    UUIDsome payload'
     end
   end

data/spec/kamerling/net_dispatcher_spec.rb

@@ -6,7 +6,7 @@ module Kamerling describe NetDispatcher do
       server = TCPServer.open 0
       thread = Thread.new { server.accept.read }
       addr   = Addr[server.addr[3], server.addr[1], :TCP]
-      NetDispatcher.new.dispatch addr, 'foo'
+      NetDispatcher.dispatch addr, 'foo'
       thread.value.must_equal 'foo'
     end
 
@@ -14,7 +14,7 @@ module Kamerling describe NetDispatcher do
       server = UDPSocket.new.tap { |s| s.bind '127.0.0.1', 0 }
       thread = Thread.new { server.recvfrom(2**16).first }
       addr   = Addr[server.addr[3], server.addr[1], :UDP]
-      NetDispatcher.new.dispatch addr, 'foo'
+      NetDispatcher.dispatch addr, 'foo'
       thread.value.must_equal 'foo'
     end
   end

data/spec/kamerling/receiver_spec.rb

@@ -10,13 +10,14 @@ module Kamerling describe Receiver do
       stub(repos).[](Client)   { fake :repo, :[] => client }
       stub(repos).[](Task)     { fake :repo, :[] => task   }
       Receiver.new.receive addr: addr, client_uuid: client.uuid, data: 'data',
-        repos: repos, task_uuid: task.uuid
+                           repos: repos, task_uuid: task.uuid
+      result = Result.new addr: addr, client: client, data: 'data', task: task,
+                          uuid: anything
       client.must_have_received :busy=, [false]
       task.must_have_received   :done=, [true]
-      repos.must_have_received :<<, [client]
-      repos.must_have_received :<<, [task]
-      repos.must_have_received :<<, [Result.new(addr: addr, client: client,
-        data: 'data', task: task, uuid: anything)]
+      repos.must_have_received  :<<,    [client]
+      repos.must_have_received  :<<,    [task]
+      repos.must_have_received  :<<,    [result]
     end
   end
 end end

data/spec/kamerling/registrar_spec.rb

@@ -5,12 +5,16 @@ module Kamerling describe Registrar do
     fakes :addr, :client, :project, :repo
 
     it 'registers that the given client can do the given project' do
-      repos = { Client => { client.uuid => client },
-        Project => { project.uuid => project }, Registration => repo }
+      repos = {
+        Client       => { client.uuid  => client  },
+        Project      => { project.uuid => project },
+        Registration => repo,
+      }
       Registrar.new.register addr: addr, client_uuid: client.uuid,
-        project_uuid: project.uuid, repos: repos
-      repo.must_have_received :<<, [Registration.new(addr: addr,
-        client: client, project: project, uuid: anything)]
+                             project_uuid: project.uuid, repos: repos
+      registration = Registration.new addr: addr, client: client,
+                                      project: project, uuid: anything
+      repo.must_have_received :<<, [registration]
     end
   end
 end end

data/spec/kamerling/repo_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../spec_helper'
 
 module Kamerling describe Repo do
-  Tune = Kamerling.UUIDObject :genre
+  Tune = Class.new(UUIDEntity) { attribute :genre, Symbol }
 
   describe '#<<' do
     it 'passes the Hash version of an object to the source' do
@@ -15,7 +15,7 @@ module Kamerling describe Repo do
       dataset = fake Sequel::Dataset
       source  = fake Sequel::Dataset
       tune    = Tune.new genre: :chap_hop
-      stub(source).<<(tune.to_h) { raise Sequel::UniqueConstraintViolation }
+      stub(source).<<(tune.to_h) { fail Sequel::UniqueConstraintViolation }
       stub(source).where(uuid: tune.uuid) { dataset }
       Repo.new(Tune, source) << tune
       dataset.must_have_received :update, [tune.to_h]
@@ -39,7 +39,7 @@ module Kamerling describe Repo do
     it 'returns all objects' do
       tune = Tune.new genre: :chap_hop, uuid: UUID.new
       source = fake Sequel::Dataset,
-        all: [{ genre: :chap_hop, uuid: tune.uuid }]
+                    all: [{ genre: :chap_hop, uuid: tune.uuid }]
       Repo.new(Tune, source).all.must_equal [tune]
     end
   end

data/spec/kamerling/server/tcp_spec.rb

@@ -30,7 +30,7 @@ module Kamerling describe Server::TCP do
     it 'doesn’t blow up on unknown inputs' do
       server = Server::TCP.new addr: addr, handler: handler = fake(:handler)
       server.start
-      stub(handler).handle('foo', any(Addr)) { raise Handler::UnknownInput }
+      stub(handler).handle('foo', any(Addr)) { fail Handler::UnknownInput }
       TCPSocket.open(*server.addr) { |socket| socket << 'foo' }
       server.stop
     end

data/spec/kamerling/server/udp_spec.rb

@@ -22,7 +22,7 @@ module Kamerling describe Server::UDP do
     it 'doesn’t blow up on unknown inputs' do
       server = Server::UDP.new addr: addr, handler: handler = fake(:handler)
       server.start
-      stub(handler).handle('foo', any(Addr)) { raise Handler::UnknownInput }
+      stub(handler).handle('foo', any(Addr)) { fail Handler::UnknownInput }
       UDPSocket.new.send 'foo', 0, *server.addr
       run_all_threads
       server.stop

data/spec/kamerling/server_runner_spec.rb

@@ -20,7 +20,7 @@ module Kamerling describe ServerRunner do
 
   describe '.new' do
     it 'hooks to the given database' do
-      args  = %w[--host 0.0.0.0 --db sqlite::memory:]
+      args  = %w(--host 0.0.0.0 --db sqlite::memory:)
       db    = fake { Sequel::SQLite::Database }
       orm   = fake :sequel, as: :class
       stub(orm).connect('sqlite::memory:') { db }
@@ -32,7 +32,7 @@ module Kamerling describe ServerRunner do
 
   describe '#join' do
     it 'joins all the created servers' do
-      args = %w[--host 0.0.0.0 --http 1234]
+      args = %w(--host 0.0.0.0 --http 1234)
       ServerRunner.new(args, classes: classes).join
       http.must_have_received :join, []
       tcp.wont_have_received :join,  []
@@ -42,7 +42,7 @@ module Kamerling describe ServerRunner do
 
   describe '#start' do
     it 'starts the servers based on the given command-line parameters' do
-      args = %w[--host 0.0.0.0 --http 1234 --tcp 3456 --udp 5678]
+      args = %w(--host 0.0.0.0 --http 1234 --tcp 3456 --udp 5678)
       ServerRunner.new(args, classes: classes).start
       http.must_have_received :start, []
       tcp.must_have_received :start,  []
@@ -50,7 +50,7 @@ module Kamerling describe ServerRunner do
     end
 
     it 'starts only the servers for which the port was given' do
-      args = %w[--host 0.0.0.0 --http 1234]
+      args = %w(--host 0.0.0.0 --http 1234)
       ServerRunner.new(args, classes: classes).start
       http.must_have_received :start, []
       tcp.wont_have_received :start,  []

data/spec/kamerling/task_dispatcher_spec.rb

@@ -10,12 +10,12 @@ module Kamerling describe TaskDispatcher do
       repos   = fake :repos, as: :class, projects: [project]
       stub(repos).next_task_for(project) { task }
       stub(repos).free_clients_for(project) { [client] }
-      net_dispatcher = fake :net_dispatcher
+      net_dispatcher = fake :net_dispatcher, as: :class
 
       TaskDispatcher.new(net_dispatcher: net_dispatcher, repos: repos).dispatch
 
-      net_dispatcher.must_have_received :dispatch, [addr,
-        "DATA#{"\0" * 12}16B client  UUID16B project UUID16B task    UUIDdata"]
+      header = "DATA#{"\0" * 12}16B client  UUID16B project UUID16B task    "
+      net_dispatcher.must_have_received :dispatch, [addr, header + 'UUIDdata']
       client.must_have_received :busy=, [true]
       repos.must_have_received :<<, [client]
     end

data/spec/kamerling/uuid_entity_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../spec_helper'
+
+module Kamerling describe UUIDEntity do
+  describe '.from_h' do
+    it 'deserialises the object from a Hash' do
+      Trivial = Class.new(UUIDEntity) { attribute :question, Symbol }
+      Trivial.from_h(question: :answer).question.must_equal :answer
+    end
+  end
+
+  describe '.new' do
+    it 'creates a class with an UUID property defaulting to a random UUID' do
+      AttrLess = Class.new UUIDEntity
+      AttrLess.new.uuid.must_match(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
+      AttrLess.new.uuid.wont_equal AttrLess.new.uuid
+    end
+  end
+
+  describe '#==' do
+    it 'reports UUID-based euqality' do
+      Actor = Class.new(UUIDEntity) { attribute :name, Symbol }
+      Actor.new(name: :laurel).wont_equal Actor.new name: :laurel
+      uuid = UUID.new
+      Actor.new(name: :laurel, uuid: uuid)
+        .must_equal Actor.new name: :hardy, uuid: uuid
+    end
+  end
+
+  describe '#to_h' do
+    it 'serialises the object to a Hash' do
+      Hashble = Class.new(UUIDEntity) { attribute :param, Symbol }
+      Hashble.new(param: :val).to_h.must_equal param: :val, uuid: any(String)
+    end
+  end
+end end

data/spec/spec_helper.rb

@@ -9,14 +9,16 @@ require 'kamerling'
 
 Bogus.configure { |config| config.search_modules << Kamerling }
 
-module MiniTest::Spec::DSL
-  def fakes *args
-    args.map { |arg| fake arg }
-  end
-end
+module Minitest
+  class Spec
+    include Rack::Test::Methods
 
-class MiniTest::Spec
-  include Rack::Test::Methods
+    module DSL
+      def fakes *args
+        args.map { |arg| fake arg }
+      end
+    end
+  end
 end
 
 Thread.abort_on_exception = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamerling
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_do
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 description: A network server for distributing computations across different clients
   speaking TCP or UDP.
 email: p.szotkowski@tele.pw.edu.pl
@@ -250,7 +264,7 @@ files:
 - lib/kamerling/task.rb
 - lib/kamerling/task_dispatcher.rb
 - lib/kamerling/uuid.rb
-- lib/kamerling/uuid_object.rb
+- lib/kamerling/uuid_entity.rb
 - lib/kamerling/views/clients.slim
 - lib/kamerling/views/layout.slim
 - lib/kamerling/views/project.slim
@@ -274,7 +288,7 @@ files:
 - spec/kamerling/server_runner_spec.rb
 - spec/kamerling/task_dispatcher_spec.rb
 - spec/kamerling/task_spec.rb
-- spec/kamerling/uuid_object_spec.rb
+- spec/kamerling/uuid_entity_spec.rb
 - spec/kamerling/uuid_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/chastell/kamerling
@@ -320,6 +334,7 @@ test_files:
 - spec/kamerling/server_runner_spec.rb
 - spec/kamerling/task_dispatcher_spec.rb
 - spec/kamerling/task_spec.rb
-- spec/kamerling/uuid_object_spec.rb
+- spec/kamerling/uuid_entity_spec.rb
 - spec/kamerling/uuid_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/kamerling/uuid_object.rb

@@ -1,79 +0,0 @@
-module Kamerling
-  def self.UUIDObject *params
-    class_definition_from attrs_from params
-  end
-
-  private
-
-  def self.attrs_from params
-    { uuid: -> { UUID.new } }.tap do |attrs|
-      attrs.merge! params.pop if params.last.is_a? Hash
-      attrs.merge! raises_from params
-    end
-  end
-
-  def self.class_definition_from attrs
-    Class.new do
-      define_singleton_method(:attrs) { attrs }
-
-      def self.from_h hash, repos: Repos
-        args = hash.reduce({}) do |result, (key, _)|
-          result.merge from_h_mapping hash, key, repos
-        end
-        new args
-      end
-
-      def initialize args = {}
-        @values = Hash[self.class.attrs.map do |attr, default|
-          value = args.fetch attr do
-            default.respond_to?(:call) ? default.call : default
-          end
-          [attr, value]
-        end]
-      end
-
-      def == other
-        uuid == other.uuid
-      end
-
-      attrs.each do |attr, _|
-        define_method(attr)       { @values[attr]             }
-        define_method("#{attr}=") { |val| @values[attr] = val }
-      end
-
-      def to_h
-        self.class.attrs.reduce({}) do |hash, (attr, _)|
-          hash.merge to_h_mapping attr
-        end
-      end
-
-      private
-
-      def self.from_h_mapping hash, key, repos
-        case key
-        when :host, :port, :prot
-          { addr: Addr[hash[:host], hash[:port], hash[:prot].to_sym] }
-        when :client_uuid  then { client:  repos[Client][hash[key]]  }
-        when :project_uuid then { project: repos[Project][hash[key]] }
-        when :task_uuid    then { task:    repos[Task][hash[key]]    }
-        else { key => hash[key] }
-        end
-      end
-
-      def to_h_mapping attr
-        case value = @values[attr]
-        when Addr
-          { host: value.host, port: value.port, prot: value.prot.to_s }
-        when Client  then { client_uuid:  client.uuid  }
-        when Project then { project_uuid: project.uuid }
-        when Task    then { task_uuid:    task.uuid    }
-        else { attr => value }
-        end
-      end
-    end
-  end
-
-  def self.raises_from params
-    Hash[params.map { |param| [param, -> { raise "#{param} required" }] }]
-  end
-end

data/spec/kamerling/uuid_object_spec.rb

@@ -1,101 +0,0 @@
-require_relative '../spec_helper'
-
-module Kamerling describe '.UUIDObject' do
-  describe '.from_h' do
-    it 'deserialises the object from a Hash' do
-      Trivial = Kamerling.UUIDObject :question
-      Trivial.from_h(question: :answer).question.must_equal :answer
-    end
-
-    it 'deserialises addr' do
-      Netable = Kamerling.UUIDObject :addr
-      Netable.from_h(host: '127.0.0.1', port: 1981, prot: :TCP).addr
-        .must_equal Addr['127.0.0.1', 1981, :TCP]
-    end
-
-    it 'deserialises {client,project,task}_uuid' do
-      client  = fake :client,  uuid: UUID.new
-      project = fake :project, uuid: UUID.new
-      task    = fake :task,    uuid: UUID.new
-      Complete = Kamerling.UUIDObject :client, :project, :task
-      repos = {
-        Client  => { client.uuid  => client  },
-        Project => { project.uuid => project },
-        Task    => { task.uuid    => task    },
-      }
-      hash = { client_uuid: client.uuid, project_uuid: project.uuid,
-        task_uuid: task.uuid, uuid: UUID.new }
-      complete = Complete.from_h hash, repos: repos
-      complete.client.must_equal  client
-      complete.project.must_equal project
-      complete.task.must_equal    task
-    end
-  end
-
-  describe '.new' do
-    it 'creates a class with an UUID property defaulting to a random UUID' do
-      AttrLess = Kamerling.UUIDObject
-      AttrLess.new.uuid.must_match(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
-      AttrLess.new.uuid.wont_equal AttrLess.new.uuid
-    end
-
-    it 'allows setting custom properties and raises when they lack defaults' do
-      FooFul = Kamerling.UUIDObject :foo
-      FooFul.new(foo: 'bar').foo.must_equal 'bar'
-      -> { FooFul.new }.must_raise RuntimeError
-    end
-
-    it 'allows setting properties’ default procs' do
-      ProcFul = Kamerling.UUIDObject rand: -> { rand }
-      ProcFul.new.rand.wont_equal ProcFul.new.rand
-    end
-
-    it 'allows setting properties’ default values' do
-      ValFul = Kamerling.UUIDObject bar: :baz
-      ValFul.new.bar.must_equal :baz
-    end
-  end
-
-  describe '#==' do
-    it 'reports UUID-based euqality' do
-      Actor = Kamerling.UUIDObject :name
-      Actor.new(name: :laurel).wont_equal Actor.new name: :laurel
-      uuid = UUID.new
-      Actor.new(name: :laurel, uuid: uuid)
-        .must_equal Actor.new name: :hardy, uuid: uuid
-    end
-  end
-
-  describe '#to_h' do
-    it 'serialises the object to a Hash' do
-      Hashble = Kamerling.UUIDObject :param
-      Hashble.new(param: :val).to_h.must_equal param: :val, uuid: anything
-    end
-
-    it 'serialises addr' do
-      Addrble = Kamerling.UUIDObject :addr
-      addrble = Addrble.new addr: Addr['127.0.0.1', 1981, :TCP]
-      addrble.to_h.must_equal host: '127.0.0.1', port: 1981, prot: 'TCP',
-        uuid: anything
-    end
-
-    it 'serialises client' do
-      Clintable = Kamerling.UUIDObject :client
-      clintable = Clintable.new client: client = Client.new(addr: fake(:addr))
-      clintable.to_h.must_equal client_uuid: client.uuid, uuid: anything
-    end
-
-    it 'serialises project' do
-      Projable = Kamerling.UUIDObject :project
-      projable = Projable.new project: project = Project.new(name: 'name')
-      projable.to_h.must_equal project_uuid: project.uuid, uuid: anything
-    end
-
-    it 'serialises task' do
-      project = fake :project
-      Tskble = Kamerling.UUIDObject :task
-      tskble = Tskble.new task: task = Task.new(data: 'data', project: project)
-      tskble.to_h.must_equal task_uuid: task.uuid, uuid: anything
-    end
-  end
-end end