vayacondios-client 0.2.11 → 0.3.0

data/src/test/java/com/infochimps/vayacondios/HTTPClientIT.java

@@ -0,0 +1,267 @@
+package com.infochimps.vayacondios;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Set;
+
+import java.net.UnknownHostException;
+
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import static org.junit.Assert.assertEquals;
+import com.infochimps.vayacondios.test.IntegrationTest;
+import org.junit.experimental.categories.Category;
+
+import com.mongodb.MongoClient;
+import com.mongodb.DB;
+
+@RunWith(JUnit4.class)
+@Category(IntegrationTest.class)
+public class HTTPClientIT {
+
+    private String organization = "organization";
+    private String topic        = "topic";
+    private String id           = "id";
+    
+    private HTTPClient client;
+
+    private Map event() {
+	Map e = new HashMap();
+	e.put("foo", "bar");
+	e.put("baz", 12.0);
+	return e;
+    }
+
+    private List list() {
+	List l = new ArrayList();
+	l.add(1.0);
+	l.add("2");
+	l.add("three");
+	return l;
+    }
+
+    private Map stash() {
+	Map s = new HashMap();
+	s.put("map", event());
+	s.put("list", list());
+	s.put("string", "hello");
+	s.put("double", 3.1415);
+	return s;
+    }
+    
+    private Map query() {
+	Map q = new HashMap();
+	q.put("foo", "bar");
+	return q;
+    }
+
+    @Before
+    public void createClient() {
+	client = new HTTPClient(organization);
+    }
+
+    @Before
+    public void cleanMongo() {
+	try {
+	    MongoClient mongo = new MongoClient( "localhost" , 27017 );
+	    DB database = mongo.getDB( "vayacondios_test" );
+	    Set<String> collections = database.getCollectionNames();
+	    for (String collection : collections) {
+		if (! collection.matches("^system.*$")) {
+		    database.getCollection(collection).drop();
+		}
+	    }
+	} catch (UnknownHostException e) {
+	    System.err.println("Could not connect to MongoDB, aborting");
+	}
+    } 
+    
+    @After
+    public void closeClient() throws InterruptedException {
+	client.close();
+    }
+
+    @Test
+    public void canGetSetHost() {
+	assertEquals(client.host(), HTTPClient.DEFAULT_HOST);
+    }
+
+    @Test
+    public void canGetSetPort() {
+	assertEquals(client.port(), HTTPClient.DEFAULT_PORT);
+    }
+
+    @Test
+    public void eventsEmpty() {
+	assertEquals(0, client.events(topic, query()).size());
+    }
+    
+    @Test
+    public void announce() {
+	client.announce(topic, event());
+	client.announce(topic, event());
+	client.announce(topic, event());
+	assertEquals(3, client.events(topic, query()).size());
+    }
+    
+    @Test
+    public void announceWithId() {
+	client.announce(topic, event(), "1");
+	client.announce(topic, event(), "2");
+	client.announce(topic, event(), "2");
+	assertEquals(2, client.events(topic, query()).size());
+    }
+
+    @Test
+    public void get() {
+	client.set(topic, stash());
+	Map s = client.get(topic);
+	assertEquals("hello", s.get("string"));
+	assertEquals(3.1415, s.get("double"));
+    }
+
+    @Test
+    public void getMap() {
+	client.set(topic, stash());
+	Map e = client.getMap(topic, "map");
+	assertEquals("bar", e.get("foo"));
+    }
+
+    @Test
+    public void getList() {
+	client.set(topic, stash());
+	List l = client.getList(topic, "list");
+	assertEquals("2", l.get(1));
+	assertEquals("three", l.get(2));
+    }
+
+    @Test
+    public void getString() {
+	client.set(topic, stash());
+	String s = client.getString(topic, "string");
+	assertEquals("hello", s);
+    }
+
+    @Test
+    public void getDouble() {
+	client.set(topic, stash());
+	Double d = client.getDouble(topic, "double");
+	assertEquals((Double) 3.1415, d);
+    }
+
+    @Test
+    public void setOverwrites() {
+	client.set(topic, stash());
+	client.set(topic, event());
+	Map s = client.get(topic);
+	assertEquals(null, s.get("string"));
+	assertEquals("bar", s.get("foo"));
+    }
+
+    @Test
+    public void setWithIdMapOverwrites() {
+	client.set(topic, stash());
+	client.set(topic, "map", stash());
+	Map s = client.getMap(topic, "map");
+	assertEquals(null, s.get("foo"));
+	assertEquals("hello", s.get("string"));
+    }
+
+    @Test
+    public void setWithIdListOvewrites() {
+	client.set(topic, stash());
+	List ol = list();
+	ol.set(0, "WOW");
+	client.set(topic, "list", ol);
+	List nl = client.getList(topic, "list");
+	assertEquals("WOW", nl.get(0));
+	assertEquals("2", nl.get(1));
+    }
+
+    @Test
+    public void setWithIdStringOvewrites() {
+	client.set(topic, stash());
+	client.set(topic, "string", "goodbye");
+	String s = client.getString(topic, "string");
+	assertEquals("goodbye", s);
+    }
+
+    @Test
+    public void setWithIdDoubleOvewrites() {
+	client.set(topic, stash());
+	client.set(topic, "double", 2.718);
+	Double d = client.getDouble(topic, "double");
+	assertEquals((double) 2.718, d, 0.001);
+    }
+    
+    @Test
+    public void mergeMerges() {
+	Map s = stash();
+	client.set(topic, s);
+	s.put("newstring", "goodbye");
+	client.set(topic, s);
+	
+	s = client.get(topic);
+	assertEquals("hello", s.get("string"));
+	assertEquals("goodbye", s.get("newstring"));
+    }
+
+    @Test
+    public void mergeWithIdMapMerges() throws InterruptedException {
+	client.set(topic, stash());
+	Map e = new HashMap();
+	e.put("bang", "boof");
+	client.merge(topic, "map", e);
+	Thread.sleep(100);	// need to give the server time to process the merge
+	Map s = client.getMap(topic, "map");
+	assertEquals("bar", s.get("foo"));
+	assertEquals("boof", s.get("bang"));
+    }
+
+    public void mergeWithIdListConcatenates() throws InterruptedException {
+	client.set(topic, stash());
+	client.merge(topic, "list", list());
+	Thread.sleep(100);	// need to give the server time to process the merge
+	List l = client.getList(topic, "list");
+	assertEquals(6, l.size());
+    }
+
+    public void mergeWithIdStringConcatenates() throws InterruptedException {
+	client.set(topic, stash());
+	client.merge(topic, "string", "goodbye");
+	Thread.sleep(100);	// need to give the server time to process the merge
+	String s = client.getString(topic, "string");
+	assertEquals("hellogoodbye", s);
+    }
+
+    public void mergeWithIdDoubleIncrements() throws InterruptedException {
+	client.set(topic, stash());
+	client.merge(topic, "double", 3.1415);
+	Thread.sleep(100);	// need to give the server time to process the merge
+	Double d = client.getDouble(topic, "double");
+	assertEquals((double) 6.2830, d, 0.001);
+    }
+
+    public void delete() throws InterruptedException {
+	client.set(topic, stash());
+	client.delete(topic);
+	Thread.sleep(100);	// need to give the server time to process the delete
+	Map s = client.get(topic);
+	assertEquals(null, s);
+    }
+
+    public void deleteWithId() throws InterruptedException {
+	client.set(topic, stash());
+	client.delete(topic, "map");
+	Thread.sleep(100);	// need to give the server time to process the delete
+	Map s = client.getMap(topic, "map");
+	assertEquals(null, s);
+    }
+    
+}

data/vayacondios-client.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+$:.push File.expand_path('../lib', __FILE__)
+require 'vayacondios'
+
+Gem::Specification.new do |gem|
+  gem.name          = 'vayacondios-client'
+  gem.version       = Vayacondios::GEM_VERSION
+  gem.authors       = ['Philip (flip) Kromer', 'Travis Dempsey', 'Huston Hoburg', 'Logan Lowell', 'Dhruv Bansal']
+  gem.homepage      = 'https://github.com/infochimps-labs/vayacondios'
+  gem.email         = 'coders@infochimps.com'
+  gem.licenses      = ['Apache 2.0']
+  gem.summary       = 'Data goes in. The right thing happens'
+  gem.description   = "Simple enough to use in a shell script, performant enough to use everywhere. Dios mío! Record that metric, ese!"
+
+  gem.files         = `git ls-files`.split("\n").reject{ |f| f =~ /server/ }
+  gem.executables   = ['vcd']
+  gem.test_files    = gem.files.grep(/^spec/)
+  gem.require_paths = ['lib']
+
+  gem.add_dependency('configliere')
+  gem.add_dependency('multi_json')
+  gem.add_dependency('faraday', '= 0.8.9')
+  gem.add_dependency('faraday_middleware')
+end

metadata

@@ -1,146 +1,182 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-client
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Philip (flip) Kromer
 - Travis Dempsey
 - Huston Hoburg
 - Logan Lowell
+- Dhruv Bansal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gorillib
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.8'
 description: Simple enough to use in a shell script, performant enough to use everywhere.
   Dios mío! Record that metric, ese!
-email: 
-executables: []
+email: coders@infochimps.com
+executables:
+- vcd
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
+- CHANGELOG.md
+- Gemfile
+- LICENSE.md
+- Procfile
+- README.md
+- Rakefile
+- bin/vcd
+- config/database.yml
+- config/spec.example.yml
+- config/vayacondios.example.yml
+- examples/configuration.rb
+- examples/event_stream.rb
+- examples/simple.rb
+- features/event.feature
+- features/events.feature
+- features/stash.feature
+- features/stashes.feature
+- features/step_definitions/stash_steps.rb
+- features/stream.feature
+- features/support/em.rb
+- features/support/env.rb
 - lib/vayacondios-client.rb
-- lib/vayacondios/client/config.rb
-- lib/vayacondios/client/configliere.rb
-- lib/vayacondios/client/cube_client.rb
+- lib/vayacondios.rb
+- lib/vayacondios/client.rb
+- lib/vayacondios/client/cli.rb
+- lib/vayacondios/client/configuration.rb
+- lib/vayacondios/client/connection.rb
 - lib/vayacondios/client/http_client.rb
-- lib/vayacondios/client/itemset.rb
-- lib/vayacondios/client/legacy_switch.rb
-- lib/vayacondios/client/notifier.rb
-- lib/vayacondios/client/zabbix_client.rb
-- spec/client/itemset_legacy_spec.rb
-- spec/client/itemset_spec.rb
-- spec/client/notifier_spec.rb
+- lib/vayacondios/client/http_methods.rb
+- lib/vayacondios/configuration.rb
+- pom.xml
+- spec/client/cli_spec.rb
+- spec/client/configuration_spec.rb
+- spec/client/http_client_spec.rb
+- spec/configuration_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_helper.rb
+- spec/support/log_helper.rb
+- spec/support/shared_context_for_events.rb
+- spec/support/shared_context_for_stashes.rb
+- spec/support/shared_examples_for_handlers.rb
+- src/main/java/com/infochimps/vayacondios/BaseClient.java
+- src/main/java/com/infochimps/vayacondios/HTTPClient.java
+- src/main/java/com/infochimps/vayacondios/VayacondiosClient.java
+- src/main/java/com/infochimps/vayacondios/test/IntegrationTest.java
+- src/test/java/com/infochimps/vayacondios/BaseClientTest.java
+- src/test/java/com/infochimps/vayacondios/HTTPClientIT.java
+- vayacondios-client.gemspec
 homepage: https://github.com/infochimps-labs/vayacondios
-licenses: []
-metadata: {}
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3142814313644370706
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3142814313644370706
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Data goes in. The right thing happens
 test_files:
-- spec/client/itemset_legacy_spec.rb
-- spec/client/itemset_spec.rb
-- spec/client/notifier_spec.rb
+- spec/client/cli_spec.rb
+- spec/client/configuration_spec.rb
+- spec/client/http_client_spec.rb
+- spec/configuration_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_helper.rb
+- spec/support/log_helper.rb
+- spec/support/shared_context_for_events.rb
+- spec/support/shared_context_for_stashes.rb
+- spec/support/shared_examples_for_handlers.rb
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmEzMjBjNzFlYzE5OTc5N2VmZTBlNDc5MjAwNWMxZWYzNGE3OTIwNQ==
-  data.tar.gz: !binary |-
-    OTFmNjUzOGU3YzNmODk2ZWM3ZDgyMzJhNjlkNmNiNDhiZDZmZDY5Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWZmYTVhZTFlODg2YTZjNWM2Mzc0Mjk2M2FiMTg1MTEyOGFmYTA3NmZkYjMw
-    YzBhMTgyNmFiZTFkNjZjYTcwNmQyYWUzZGEyY2Q1YWRmMGQxMWFkNGFiYzlk
-    OWI1Y2Y4ZGFiZDlmZWQ2NzcxNzZkNjM5NWU5YTI3ZDY3MzY3MWM=
-  data.tar.gz: !binary |-
-    ZDQyZmQ2Yzc4MDJmZGMzZjQwN2QwNThkZjQ5ZjljZjNlMjg2YWNlNTE2NmJk
-    YzM4NjM2ZDYzY2FiMmY3MWE5YjA5MTY2MThmOWM2YTFkYjY4NmEzNTAzZWQz
-    M2Q1ZDg3NDAyZTlmZDk4MTlhMjc3ZmIyMTczNzFjYWJkMjk2NWU=

data/lib/vayacondios/client/config.rb

@@ -1,7 +0,0 @@
-def ENV.root_path(*args)
-  File.expand_path(File.join(File.dirname(__FILE__), '../../../', *args))
-end
-
-require 'configliere'
-
-Settings.read(ENV.root_path('config/vayacondios.yaml'))

data/lib/vayacondios/client/configliere.rb

@@ -1,38 +0,0 @@
-class Vayacondios
-  module Configliere
-
-    def load_from_vayacondios(organization, id, options = {})
-      options.symbolize_keys!.deep_merge!(organization: organization)
-
-      client = ::Vayacondios::HttpClient.receive(options.deep_compact!)
-      id     = [id, options[:env]].compact.join('.')
-      
-      begin
-        new_data = client.fetch(:config, id)
-      rescue ::Vayacondios::HttpClient::Error
-        warn "Unable to load vayacondios config '#{id}' for #{organization} at: #{client.host}:#{client.port}"
-        new_data = {}
-      end
-      deep_merge! new_data
-      self
-    end
-    
-    def save_to_vayacondios(organization, id, options = {})
-      options.symbolize_keys!.deep_merge!(organization: organization)
-
-      client = ::Vayacondios::HttpClient.receive(options.deep_compact!)
-      id = [id, options[:env]].compact.join('.')
-      
-      begin
-        client.insert(self.to_hash, :config, id)
-      rescue ::Vayacondios::HttpClient::Error
-        warn "Unable to save vayacondios config '#{id}' for #{organization} at: #{client.host}:#{client.port}"
-      end
-      self
-    end
-  end
-end
-
-::Configliere::Param.class_eval do
-  include ::Vayacondios::Configliere
-end

data/lib/vayacondios/client/cube_client.rb

@@ -1,39 +0,0 @@
-class Vayacondios
-  class CubeClient
-    include Gorillib::Model
-
-    field :host,         String,  :default => 'localhost'
-    field :port,         Integer, :default => 6000
-    
-    class Error < StandardError; end
-
-    def uri
-      return @uri if @uri
-
-      uri_str  = "http://#{host}:#{port}/1.0"
-      @uri ||= URI(uri_str)
-    end
-    
-    def event(topic, document = {})
-      request(:post, File.join(uri.path, 'event'), MultiJson.dump(document))
-    end
-    
-  private
-    
-    def request(method, path, document=nil)
-      http    = Net::HTTP.new(uri.host, uri.port)
-
-      params  = [method.to_sym, path]
-      params += [document, {'Content-Type' => 'application/json'}] unless document.nil?
-      
-      response = http.send *params
-
-      if Net::HTTPSuccess === response
-        MultiJson.load(response.body) rescue response.body
-      else
-        raise Error.new("Error (#{response.code}) while #{method.to_s == 'get' ? 'fetching' : 'inserting'} document: " + response.body)
-      end
-    end
-  end
-end
-