vayacondios-server 0.1.2 → 0.1.6

data/src/main/java/com/infochimps/vayacondios/Organization.java

@@ -0,0 +1,49 @@
+package com.infochimps.vayacondios;
+
+import java.util.Collection;
+
+/**
+ * An organization is the last commmon class in the Vayacondios
+ * hierarchy between the itemset and stash interface.
+ */
+public class Organization extends VayacondiosClient {
+  public Organization(PathBuilder delegate) { super(delegate); }
+
+  public Organization(VayacondiosClient server, String organization) {
+    super(server);
+    _server = server;
+    _organization = organization;
+  }
+
+  //----------------------------------------------------------------------------
+  // next in path hierarchy
+  //----------------------------------------------------------------------------
+
+  /**
+   * @return new ItemSets path builder for this organization
+   */
+  public ItemSets itemsets() { return new ItemSets(this); }
+
+  //----------------------------------------------------------------------------
+  // API HTTP path components
+  //----------------------------------------------------------------------------
+
+  protected String urlString(String type, String topic, String id) {
+    return urlString(getOrganization(), type, topic, id);
+  }
+
+  protected int getPort() {
+    return ((VayacondiosClient)getDelegate()).getPort();
+  }
+  protected String getServerName() {
+    return ((VayacondiosClient)getDelegate()).getServerName();
+  }
+  String getOrganization() { return _organization; }
+
+  //----------------------------------------------------------------------------
+  // fields
+  //----------------------------------------------------------------------------
+
+  private VayacondiosClient _server;
+  private String _organization;
+}

data/src/main/java/com/infochimps/vayacondios/PathBuilder.java

@@ -0,0 +1,13 @@
+package com.infochimps.vayacondios;
+
+class PathBuilder {
+  public PathBuilder() {}
+
+  public PathBuilder(PathBuilder delegate) {
+    _delegate = delegate;
+  }
+
+  protected PathBuilder getDelegate() { return _delegate; }
+
+  private PathBuilder _delegate;
+}

data/src/main/java/com/infochimps/vayacondios/VCDIntegrationTest.java

@@ -0,0 +1,68 @@
+package com.infochimps.vayacondios;
+
+import com.infochimps.vayacondios.VayacondiosClient;
+
+import static com.infochimps.util.CurrentClass.getLogger;
+
+import static com.infochimps.vayacondios.ItemSets.Item;
+import static com.infochimps.vayacondios.ItemSets.ItemSet;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.slf4j.Logger;
+
+public class VCDIntegrationTest {
+  private static final int VCD_PORT = 8000;
+  private static final Logger LOG = getLogger();
+
+  private static ItemSet newSet() {
+    return new VayacondiosClient("localhost", VCD_PORT).
+      organization("org").
+      itemsets().
+      topic("topic").
+      itemSet("id");
+  }
+
+  private static void assertEquals(String... expectedStringArr)
+    throws IOException {
+    List<Item> items = newSet().fetch();
+    List<Item> expectedItems = new ArrayList();
+    List<Item> copy;
+
+    for (String exp : expectedStringArr) expectedItems.add(new Item(exp));
+
+    if (!items.containsAll(expectedItems)) {
+      copy = new ArrayList(); copy.addAll(expectedItems);
+      LOG.trace("removing items. copy change? " + copy.removeAll(items));
+      System.out.println("\033[31mFAIL\033[0m: expected but absent: " + copy);
+    }
+    if (!expectedItems.containsAll(items)) {
+      copy = new ArrayList(); copy.addAll(items);
+      LOG.trace("removing items. copy change? " + copy.removeAll(expectedItems));
+      System.out.println("\033[31mFAIL\033[0m: unexpected and present: " + copy);
+    }
+  }
+
+  public static void main(String argv[]) {
+    System.out.println("*** If Vayacondios is not running on port " + VCD_PORT + ", " +
+		       "this will fail. ***");
+    System.out.println("Running Vayacondios integration test...");
+
+    try {
+      newSet().create(Arrays.asList(new Item("foo"), new Item("baz"), new Item("bar"), new Item("bing")));
+      assertEquals("foo", "baz", "bar", "bing");
+      newSet().update(Arrays.asList(new Item("biff")));
+      assertEquals("foo", "baz", "bar", "bing", "biff");
+      newSet().remove(Arrays.asList(new Item("biff"), new Item("bar")));
+      assertEquals("foo", "baz", "bing");
+      
+      System.out.println("Integration test complete.");
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+}

data/src/main/java/com/infochimps/vayacondios/VayacondiosClient.java

@@ -0,0 +1,88 @@
+package com.infochimps.vayacondios;
+
+import static com.infochimps.util.CurrentClass.getLogger;
+
+import com.infochimps.util.CurrentClass;
+import com.infochimps.util.HttpHelper;
+
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+
+import org.slf4j.Logger;
+
+/**
+ * VayacondiosClient is the root of the Vayacondios hierarchy. It
+ * communicates with a Vayacondios server via its HTTP API. Currently
+ * only Vayacondios itemsets are supported.
+ */
+public class VayacondiosClient extends PathBuilder {
+  public VayacondiosClient(PathBuilder delegate) { super(delegate); }
+
+  public VayacondiosClient(String serverName, int port) {
+    _serverName = serverName;
+    _port       = port;
+  }
+
+  //----------------------------------------------------------------------------
+  // next in path hierarchy
+  //----------------------------------------------------------------------------
+
+  /**
+   * @param organization Vayacondios organization. see Vayacondios
+   *                     documentation for details.
+   * @return new Organization path builder for this server with the
+   *         specified orgnanization name
+   *
+   */
+  public Organization organization(String organization) {
+    return new Organization(this, organization);
+  }
+
+  //----------------------------------------------------------------------------
+  // API HTTP path components
+  //----------------------------------------------------------------------------
+
+  protected String urlString(String organization,
+			     String type,
+			     String topic,
+			     String id) {
+    return new StringBuilder().
+      append("http://").
+      append(getServerName()).
+      append(":").
+      append(getPort()).
+      append("/v1/").
+      append(organization).
+      append("/").
+      append(type).
+      append("/").
+      append(topic).
+      append("/").
+      append(id)
+      .toString();
+  }
+
+  protected int    getPort()       { return _port;       }
+  protected String getServerName() { return _serverName; }
+
+  //----------------------------------------------------------------------------
+  // private methods
+  //----------------------------------------------------------------------------
+
+  protected BufferedReader openUrl(String urlString) throws IOException {
+    HashMap headers = new HashMap();
+    headers.put("Accept", "*/*");
+    return HttpHelper.open(LOG, urlString, headers, Charset.forName("UTF-8"));
+  }
+  
+  //----------------------------------------------------------------------------
+  // fields
+  //----------------------------------------------------------------------------
+
+  private String _serverName;
+  private int    _port;
+
+  private static final Logger LOG = getLogger();
+}

data/vayacondios-client.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency('configliere', '>= 0.4.16')
-  gem.add_dependency('multi_json',  '~> 1.1')
-  gem.add_dependency('gorillib',    '~> 0.4.2')
+  gem.add_dependency('multi_json',  '>= 1.3.6')
+  gem.add_dependency('gorillib',    '>= 0.4.2')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('yard', '>= 0.7')

data/vayacondios-server.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = ['lib']
 
-  gem.add_dependency('configliere',     '>= 0.4.13')
-  gem.add_dependency('gorillib',        '~> 0.4.2')
+  gem.add_dependency('configliere',     '>= 0.4.16')
+  gem.add_dependency('gorillib',        '>= 0.4.2')
+  gem.add_dependency('multi_json',      '>= 1.3.6')
+
   gem.add_dependency('eventmachine',    '~> 1.0.0.beta.4')
   gem.add_dependency('goliath',         '~> 1.0')
   gem.add_dependency('em-http-request', '~> 1.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.13
+        version: 0.4.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,13 +29,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.13
+        version: 0.4.16
 - !ruby/object:Gem::Dependency
   name: gorillib
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
@@ -43,9 +43,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -187,9 +203,11 @@ files:
 - lib/vayacondios-client.rb
 - lib/vayacondios-server.rb
 - lib/vayacondios/client/configliere.rb
+- lib/vayacondios/client/cube_client.rb
 - lib/vayacondios/client/http_client.rb
 - lib/vayacondios/client/itemset.rb
 - lib/vayacondios/client/notifier.rb
+- lib/vayacondios/client/zabbix_client.rb
 - lib/vayacondios/server/errors/bad_request.rb
 - lib/vayacondios/server/errors/not_found.rb
 - lib/vayacondios/server/handlers/config_handler.rb
@@ -199,10 +217,12 @@ files:
 - lib/vayacondios/server/model/document.rb
 - lib/vayacondios/server/model/event_document.rb
 - lib/vayacondios/server/model/itemset_document.rb
+- lib/vayacondios/server/rack/assume_json.rb
 - lib/vayacondios/server/rack/extract_methods.rb
 - lib/vayacondios/server/rack/path.rb
 - lib/vayacondios/server/rack/path_validation.rb
 - lib/vayacondios/version.rb
+- pom.xml
 - scripts/hadoop_monitor/configurable.rb
 - scripts/hadoop_monitor/hadoop_attempt_scraper.rb
 - scripts/hadoop_monitor/hadoop_client.rb
@@ -223,6 +243,14 @@ files:
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongo_cleaner.rb
+- src/main/java/com/infochimps/util/CurrentClass.java
+- src/main/java/com/infochimps/util/DebugUtil.java
+- src/main/java/com/infochimps/util/HttpHelper.java
+- src/main/java/com/infochimps/vayacondios/ItemSets.java
+- src/main/java/com/infochimps/vayacondios/Organization.java
+- src/main/java/com/infochimps/vayacondios/PathBuilder.java
+- src/main/java/com/infochimps/vayacondios/VCDIntegrationTest.java
+- src/main/java/com/infochimps/vayacondios/VayacondiosClient.java
 - vayacondios-client.gemspec
 - vayacondios-server.gemspec
 homepage: https://github.com/infochimps-labs/vayacondios
@@ -239,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1142154938423914035
+      hash: -1849202629108369085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,10 +276,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1142154938423914035
+      hash: -1849202629108369085
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Data goes in. The right thing happens