vayacondios-server 0.2.11 → 0.3.0

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

@@ -1,218 +0,0 @@
-package com.infochimps.vayacondios;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSyntaxException;
-
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.net.URL;
-
-import org.slf4j.Logger;
-
-import com.infochimps.util.DebugUtil;
-import com.infochimps.util.HttpHelper;
-import static com.infochimps.util.CurrentClass.getLogger;
-import static com.infochimps.vayacondios.ItemSets.Item;
-
-public class StandardVCDLink extends LinkToVCD {
-  public List<Item> fetch(String topic, String id) throws IOException {
-    BufferedReader reader = null;
-    try {
-      reader = openUrl(getParent().urlString(PATH_COMPONENT, topic, id));
-    } catch (FileNotFoundException ex) {
-      // In the case of a 404, return an empty set.
-      return new ArrayList();
-    }
-    String line = reader.readLine();
-    JsonElement response;
-    JsonElement itemSet;
-
-    ArrayList<Item> result = new ArrayList<Item>();
-
-    // assume Vayacondios response comes in a single line
-    if (line != null &&
-        (itemSet = VCD_HANDLER.extractContents(PARSER.parse(line))) != null) {
-      for (JsonElement elem : itemSet.getAsJsonArray()) {
-        if (!elem.isJsonPrimitive()) {
-          LOG.warn("ignoring non-primitive in itemset: " + elem);
-          continue;
-        }
-
-        JsonPrimitive item = elem.getAsJsonPrimitive();
-        if      (item.isBoolean()) result.add(new Item(item.getAsBoolean()));
-        else if (item.isNumber())  result.add(new Item(item.getAsNumber()));
-        else if (item.isString())  result.add(new Item(item.getAsString()));
-
-        else LOG.warn("ignoring unrecognized type in itemset: " + item);
-      }
-    }
-    
-    if ((line = reader.readLine()) != null)
-      LOG.warn("expected eof but saw " + line);
-
-    reader.close();
-
-    return result;
-  }
-
-  public void mutate(String method,
-                     String topic,
-                     String id,
-                     List<Item> items) throws IOException {
-    
-    // serialize the items
-    String body = VCD_HANDLER.wrapContents(items);
-    // connect to our standard path
-    URL url = new URL(getParent().urlString(PATH_COMPONENT, topic, id));
-    HttpURLConnection connection = (HttpURLConnection)
-      ((Boolean.valueOf(System.getProperty("ics.http.use_charles"))) ? 
-       url.openConnection(DebugUtil.useCharles()) : url.openConnection());
-
-    // configure connection
-    connection.setDoOutput(true);
-
-    // NOTE: Uncommenting this (and not calling
-    // connection.getInputStream()) causes Java to hang without
-    // sending its payload.
-
-    // connection.setDoInput(false);
-
-    if (method.equals("DELETE")) {
-      connection.setRequestMethod("PUT");
-      connection.setRequestProperty("X-Method", "DELETE");
-    } else if (method.equals("PATCH")) {
-      connection.setRequestMethod("PUT");
-      connection.setRequestProperty("X-Method", "PATCH");
-    } else connection.setRequestMethod(method);
-    connection.setRequestProperty("Content-Type", "application/json"); 
-    connection.setRequestProperty("Accept", "*/*");
-    connection.setRequestProperty("Content-Length",
-                                  Integer.toString(body.getBytes().length));
-    connection.setUseCaches(false);
-
-    LOG.debug("sending: " + body);
-    LOG.debug("via " +
-              connection.getRequestMethod() +
-              " to " +
-              getParent().urlString(PATH_COMPONENT, topic, id));
-
-    // connect and write
-    OutputStream os = connection.getOutputStream();
-    os.write(body.getBytes("UTF-8"));
-    os.flush();
-    os.close();
-
-    // ignore reponse
-    InputStream is = connection.getInputStream();
-
-    LOG.trace("ignoring response from Vayacondios.");
-    byte buf[] = new byte[256];
-    while (is.read(buf) != -1);
-    LOG.trace("response ignored.");
-    is.close();
-
-    // fin.
-    connection.disconnect();
-  }
-
-  //----------------------------------------------------------------------------
-
-  public static void forceLegacy(boolean vcdLegacy) {
-    LOG.info("forcing vayacondios {} mode", vcdLegacy ? "legacy" : "standard");
-
-    VCD_HANDLER = vcdLegacy ?
-      new LegacyContentsHandler() : new StandardContentsHandler();
-  }
-
-  //----------------------------------------------------------------------------
-
-  private BufferedReader openUrl(String urlString) throws IOException {
-    HashMap headers = new HashMap();
-    headers.put("Accept", "*/*");
-    return HttpHelper.open(LOG, urlString, headers, Charset.forName("UTF-8"));
-  }
-  
-  private static final Gson GSON                = new GsonBuilder().
-    registerTypeAdapter(Item.class, new Item.Serializer()).
-    create();
-  private static final JsonParser PARSER        = new JsonParser();
-  private static final Logger LOG               = getLogger();
-  private static final String PATH_COMPONENT    = "itemset";
-
-  private static LegacySwitch VCD_HANDLER = new StandardContentsHandler();
-
-  //----------------------------------------------------------------------------
-
-  private static interface LegacySwitch {
-    String wrapContents(List<Item> items);
-    JsonArray extractContents(JsonElement response);
-  } 
-
-  private static class LegacyContentsHandler implements LegacySwitch {
-    @Override
-    public String wrapContents(List<Item> items) {
-      String json = GSON.toJson(items);
-      LOG.trace("results of wrapping with legacy handler: {}", json);
-      return json;
-    }
-    @Override
-    public JsonArray extractContents(JsonElement response) {
-      if (response.isJsonArray()) {
-        return response.getAsJsonArray();
-      } else { return null; }
-    }
-  }
-
-  private static class StandardContentsHandler implements LegacySwitch {
-    @Override
-    public String wrapContents(final List<Item> items) {
-      // not at all sure why GSON is returning null given a
-      // Map<String,List<Item>> all of the sudden, but it seems to
-      // work on a Map<String,List<String>>, so here we go.
-      Map<String,List<String>> contents =
-        new HashMap<String,List<String>>();
-      List<String> strItems = new ArrayList<String>();
-      for (Item item : items) {
-        strItems.add(item.getObject().toString());
-      }
-      contents.put("contents", strItems);
-      LOG.trace("contents: {}", contents);
-      String json = GSON.toJson(contents);
-      LOG.trace("results of wrapping with standard handler: {}", json);
-      return json;
-    }
-    @Override
-    public JsonArray extractContents(JsonElement response) {
-      JsonElement itemSet;
-      
-      if (response.isJsonObject()) {
-        if ((itemSet = response.getAsJsonObject().get("contents"))
-            .isJsonArray()) {
-          return itemSet.getAsJsonArray();
-        }
-      }
-
-      return null;
-    }
-  }
-}

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

@@ -1,108 +0,0 @@
-package com.infochimps.vayacondios;
-
-import com.infochimps.vayacondios.VayacondiosClient;
-import com.infochimps.vayacondios.StandardVCDLink;
-
-import static com.infochimps.util.CurrentClass.getLogger;
-
-import static com.infochimps.vayacondios.ItemSets.Item;
-import static com.infochimps.vayacondios.ItemSets.ItemSet;
-import com.infochimps.vayacondios.ItemSets;
-
-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();
-
-  public static void setUp() {
-    // This will default to false when the property is null, which is
-    // what we happen to want.
-    boolean legacyMode =
-      Boolean.valueOf(System.getProperty("vayacondios.legacy"));
-    LOG.info("Using Vayacondios {} mode", legacyMode ? "legacy" : "standard");
-    StandardVCDLink.forceLegacy(legacyMode);
-  }
-  private static ItemSets itemSets() {
-    return new VayacondiosClient("localhost", VCD_PORT).
-      organization("org").
-      itemsets();
-  }
-
-  private static List<Item> buildItemList(String items[]) {
-    List<Item> result = new ArrayList<Item>();
-    for (String s : items) result.add(new Item(s));
-    return result;
-  }
-
-  private static List<String> getStrings(List<Item> items) {
-    List<String> result = new ArrayList<String>();
-    for (Item i : items) result.add(i.getAsString());
-    return result;
-  }
-
-  private static List<String> fetch() throws IOException {
-    return getStrings(itemSets().fetch("topic", "id"));
-  }
-
-  private static void create(String... items) throws IOException {
-    itemSets().create("topic", "id", buildItemList(items));
-  }
-
-  private static void remove(String... items) throws IOException {
-    itemSets().remove("topic", "id", buildItemList(items));
-  }
-
-  private static void update(String... items) throws IOException {
-    itemSets().update("topic", "id", buildItemList(items));
-  }
-
-  private static void assertEquals(String... expectedArr)
-    throws IOException {
-    List<String> items = fetch();
-    List<String> copy = new ArrayList<String>();
-    List<String> expected = Arrays.asList(expectedArr);
-
-    if (!items.containsAll(expected)) {
-      copy = new ArrayList(); copy.addAll(expected);
-      LOG.trace("removing items. copy change? " + copy.removeAll(items));
-      System.out.println("\033[31mFAIL\033[0m: expected but absent: " + copy);
-    } else
-      System.out.println("\033[32mSUCCESS\033[0m: all expected items present");
-    if (!expected.containsAll(items)) {
-      copy = new ArrayList(); copy.addAll(items);
-      LOG.trace("removing items. copy change? " + copy.removeAll(expected));
-      System.out.println("\033[31mFAIL\033[0m: unexpected and present: " + copy);
-    } else
-      System.out.println("\033[32mSUCCESS\033[0m: no unexpected items present");
-  }
-
-  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...");
-
-    setUp();
-
-    try {
-      create("foo", "baz", "bar", "bing");
-      assertEquals("foo", "baz", "bar", "bing");
-
-      update("biff");
-      assertEquals("foo", "baz", "bar", "bing", "biff");
-
-      remove("biff", "bar");
-      assertEquals("foo", "baz", "bing");
-      
-      System.out.println("Integration test complete.");
-    } catch (Exception ex) {
-      ex.printStackTrace();
-    }
-  }
-}

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

@@ -1,78 +0,0 @@
-package com.infochimps.vayacondios;
-
-import com.infochimps.vayacondios.VayacondiosClient;
-
-import static com.infochimps.util.CurrentClass.getLogger;
-
-import com.infochimps.vayacondios.MemoryVCDShim;
-import static com.infochimps.vayacondios.ItemSets.Item;
-import static com.infochimps.vayacondios.ItemSets.ItemSet;
-import com.infochimps.vayacondios.ItemSets;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import org.slf4j.Logger;
-
-@RunWith(JUnit4.class)
-  public class TestVayacondiosInMemory {
-    @Before
-      public void setup() {
-      _itemSets = new VayacondiosClient("localhost", VCD_PORT).
-        organization("org").
-        itemsets(new MemoryVCDShim());
-    }
-
-    @Test
-    public void testInMemVCD() throws Exception {
-      create("foo", "baz", "bar", "bing");
-      assertEquals(buildItemList("foo", "baz", "bar", "bing"), fetch());
-
-      update("biff");
-      assertEquals(buildItemList("foo", "baz", "bar", "bing", "biff"), fetch());
-
-      remove("biff", "bar");
-      assertEquals(buildItemList("foo", "baz", "bing"), fetch());
-    }
-
-    private ItemSets itemSets() {
-      return _itemSets;
-    }
-
-    private static List<Item> buildItemList(String... itemNames) {
-      List<Item> result = new ArrayList<Item>();
-      for (String s : itemNames) result.add(new Item(s));
-      return result;
-    }
-
-    private List<Item> fetch() throws IOException {
-      return itemSets().fetch("topic", "id");
-    }
-
-    private void create(String... items) throws IOException {
-      itemSets().create("topic", "id", buildItemList(items));
-    }
-
-    private void remove(String... items) throws IOException {
-      itemSets().remove("topic", "id", buildItemList(items));
-    }
-
-    private void update(String... items) throws IOException {
-      itemSets().update("topic", "id", buildItemList(items));
-    }
-
-    private static final int VCD_PORT = 8000;
-    private static final Logger LOG = getLogger();
-    private ItemSets _itemSets;
-  }

data/vayacondios-client.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-$:.push File.expand_path('../lib', __FILE__)
-require 'vayacondios/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = 'vayacondios-client'
-  gem.version       = Vayacondios::VERSION
-  gem.authors       = ['Philip (flip) Kromer', 'Travis Dempsey', 'Huston Hoburg', 'Logan Lowell']
-  gem.homepage      = 'https://github.com/infochimps-labs/vayacondios'
-  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 -- lib  | grep client`.split("\n")
-  gem.test_files    = `git ls-files -- spec | grep client`.split("\n")
-  gem.require_paths = ['lib']
-
-  gem.add_dependency('configliere', '>= 0.4.16')
-  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')
-  gem.add_development_dependency('rspec', '>= 2.8')
-end