cocainum 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e3eed6ffd3ca8cece471c859d71dc417821bf5
-  data.tar.gz: 4104780a5e80f70291a38519b5e3a11ebc71fada
+  metadata.gz: f9d9dcad4ba3243cfdf32ee8cf2dbea6d06c9563
+  data.tar.gz: ddd9e821b49a29800017eaa46343de21d93686ea
 SHA512:
-  metadata.gz: fb426094a1d27f49dc55580adbb505ec4db9737dec920507a7bdef9a6a4a9a20d7165ad7969b416ab944d869d52b459a7248a59d0e5038bfd19c5e339b2d2a59
-  data.tar.gz: 3294c81b8ce1c39b11a6e481fb7296e0eca8089b388f2da7d256877f33f64cd6ceca41590ca7896fe6d9d890e0079a65e5404eb94fd73e70876e07b23f1bb797
+  metadata.gz: f73780fad3e3f793ac5d55fbf9fe43a3803d746d5d7c541e1d5a5e38aba0effc4c8b0f24cc9dd80d578561baa4a28fde0ff4cee01fb875e61ddd0d0af84676b1
+  data.tar.gz: 1b5d37c785cf3e612659d88114488a494a52fe2683a736172b6a05569d4a248adbae9f3403c301af2795163e59e4834c4664c01aefb051ef2ea5be9d224c2f15

data/lib/cocainum.rb

@@ -6,102 +6,5 @@ require 'socket'
 require 'nokogiri'
 
 require 'cocaine/synchrony/service'
+require 'cocainum/overrides'
 
-class Cocaine::Locator < Cocaine::AbstractService
-  private
-  def do_resolve(name, df)
-    node = ''
-    if name.include? '/'
-      node, service_name = name.split('/', 2)
-      if node == (self.class.default_host == 'localhost' ? Socket.gethostname : self.class.default_host)
-        name = service_name
-      end
-    end
-
-    $log.debug "resolving service '#{name}'"
-    channel = invoke 0, name
-    channel.callback do |future|
-      begin
-        res = future.get
-        if node != '' && res[0][0] != node
-          raise Cocaine::ServiceError.new 'the specified service is not available in the group'
-        else
-          df.succeed future.get
-        end
-      rescue Exception => err
-        df.fail err
-      end
-    end
-  end
-end
-
-class Nokogiri::XML::Node
-  TYPENAMES = {1=>'element',2=>'attribute',3=>'text',4=>'cdata',8=>'comment'}
-  def to_hash
-    [name.to_sym, case TYPENAMES[node_type]
-                    when 'element'
-                      node = {}
-                      attribute_nodes.each {|attr| node[attr.name.to_sym] = attr.value}
-                      children.each {|chld|
-                        c = chld.to_hash
-                        node[c[0].to_sym] = c[1] unless c[1] == nil
-                      }
-                      node
-                    when 'text'
-                      text.strip.empty? ? nil : text.strip
-                    else
-                      nil
-                  end]
-  end
-end
-
-class Nokogiri::XML::Document
-  def to_hash; Hash[[root.to_hash]]; end
-end
-
-class Array
-  def to_xml(key)
-    map do |v|
-      if Hash === v
-        v.to_xml(false, key)
-      else
-        '<%s>%s</%s>' % [key, v, key]
-      end
-    end.join
-  end
-end
-
-class Hash
-  def to_xml(recurse = false, default_root = 'root')
-    attributes = []
-    children = []
-    each do |k, v|
-      if Hash === v
-        a, c = v.to_xml(true)
-        if c.size > 0
-          children << '<%s%s>%s</%s>' % [k, a.size > 0 ? ' ' + a.join(' ') : '', c.join, k]
-        else
-          children << '<%s%s />' % [k, a.size > 0 ? ' ' + a.join(' ') : '']
-        end
-      elsif Array === v
-        key = v.shift
-        children << '<%s>%s</%s>' % [k, v.to_xml(key), k]
-      else
-        attributes << '%s="%s"' % [k, v]
-      end
-    end
-    if recurse
-      [attributes, children]
-    else
-      if children.size > 1 || attributes.size > 0
-        if children.size > 0
-          '<%s%s>%s</%s>' % [default_root, attributes.size > 0 ? ' ' + attributes.join(' ') : '', children.join, default_root]
-        else
-          '<%s %s />' % [default_root, attributes.join(' ')]
-        end
-      else
-        children[0]
-      end
-    end
-  end
-end

data/lib/cocainum/api.rb

@@ -1,7 +1,6 @@
 require 'cocainum'
 require 'cocaine/server/http'
 require 'json'
-require 'nokogiri'
 
 module Cocainum
 

data/lib/cocainum/overrides.rb

@@ -0,0 +1,98 @@
+class Cocaine::Locator < Cocaine::AbstractService
+  private
+  def do_resolve(name, df)
+    node = ''
+    if name.include? '/'
+      node, service_name = name.split('/', 2)
+      if node == (self.class.default_host == 'localhost' ? Socket.gethostname : self.class.default_host)
+        name = service_name
+      end
+    end
+
+    $log.debug "resolving service '#{name}'"
+    channel = invoke 0, name
+    channel.callback do |future|
+      begin
+        res = future.get
+        if node != '' && res[0][0] != node
+          raise Cocaine::ServiceError.new 'the specified service is not available in the group'
+        else
+          df.succeed future.get
+        end
+      rescue Exception => err
+        df.fail err
+      end
+    end
+  end
+end
+
+class Nokogiri::XML::Node
+  TYPENAMES = {1=>'element',2=>'attribute',3=>'text',4=>'cdata',8=>'comment'}
+  def to_hash
+    [name.to_sym, case TYPENAMES[node_type]
+                    when 'element'
+                      node = {}
+                      attribute_nodes.each {|attr| node[attr.name.to_sym] = attr.value}
+                      children.each {|chld|
+                        c = chld.to_hash
+                        node[c[0].to_sym] = c[1] unless c[1] == nil
+                      }
+                      node
+                    when 'text'
+                      text.strip.empty? ? nil : text.strip
+                    else
+                      nil
+                  end]
+  end
+end
+
+class Nokogiri::XML::Document
+  def to_hash; Hash[[root.to_hash]]; end
+end
+
+class Array
+  def to_xml(key)
+    map do |v|
+      if Hash === v
+        v.to_xml(false, key)
+      else
+        '<%s>%s</%s>' % [key, v, key]
+      end
+    end.join
+  end
+end
+
+class Hash
+  def to_xml(recurse = false, default_root = 'root')
+    attributes = []
+    children = []
+    each do |k, v|
+      if Hash === v
+        a, c = v.to_xml(true)
+        if c.size > 0
+          children << '<%s%s>%s</%s>' % [k, a.size > 0 ? ' ' + a.join(' ') : '', c.join, k]
+        else
+          children << '<%s%s />' % [k, a.size > 0 ? ' ' + a.join(' ') : '']
+        end
+      elsif Array === v
+        key = v.shift
+        children << '<%s>%s</%s>' % [k, v.to_xml(key), k]
+      else
+        attributes << '%s="%s"' % [k, v]
+      end
+    end
+    if recurse
+      [attributes, children]
+    else
+      if children.size > 1 || attributes.size > 0
+        if children.size > 0
+          '<%s%s>%s</%s>' % [default_root, attributes.size > 0 ? ' ' + attributes.join(' ') : '', children.join, default_root]
+        else
+          '<%s %s />' % [default_root, attributes.join(' ')]
+        end
+      else
+        children[0]
+      end
+    end
+  end
+end

data/lib/cocainum/service.rb

@@ -0,0 +1,15 @@
+require 'cocainum'
+require 'cocaine/synchrony/service'
+
+module Cocainum
+  class Service
+
+    def initialize(name)
+      @service = Cocaine::Synchrony::Service.new(name)
+    end
+
+    def enqueue(*args)
+      @service.enqueue(*args).collect
+    end
+  end
+end

data/lib/cocainum/storage.rb

@@ -0,0 +1,23 @@
+require 'cocainum'
+require 'cocaine/synchrony/service'
+
+module Cocainum
+  class Storage
+
+    def initialize
+      @storage = Cocaine::Synchrony::Service.new('storage')
+    end
+
+    def write(namespace, key, value, tags = [])
+      @storage.write(namespace, key, value, tags).collect
+    end
+
+    def read(namespace, key)
+      @storage.read(namespace, key).collect
+    end
+
+    def find(namespace, tags)
+      @storage.find(namespace, tags).collect
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Cocainum
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocainum
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Andrey Elmanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine-framework-ruby
@@ -65,6 +65,9 @@ files:
 - cocainum.gemspec
 - lib/cocainum.rb
 - lib/cocainum/api.rb
+- lib/cocainum/overrides.rb
+- lib/cocainum/service.rb
+- lib/cocainum/storage.rb
 - lib/version.rb
 homepage: 
 licenses: