vayacondios-server 0.1.12 → 0.2.1

data/Rakefile

@@ -1,5 +1,9 @@
+# -*- ruby -*-
+
 require 'bundler' ; Bundler.setup
 
+require 'configliere'
+
 # App-specific tasks
 Dir[File.dirname(__FILE__)+'/lib/tasks/**/*.rake'].sort.each{|f| load f }
 

data/config/vayacondios.example.yaml

@@ -2,3 +2,6 @@ mongo:
   host:         localhost
   port:         27017
   database:     vayacondios_dev
+
+vayacondios:
+  legacy: false

data/config/vayacondios.yaml

@@ -2,3 +2,6 @@ mongo:
   host:         localhost
   port:         27017
   database:     vayacondios_dev
+
+vayacondios:
+  legacy: false

data/lib/tasks/spec.rake

@@ -1,3 +1,5 @@
+# -*- ruby -*-
+
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new

data/lib/vayacondios/legacy_switch.rb

@@ -0,0 +1,38 @@
+class Vayacondios
+  # Are we operating on JSON Hashes (Vayacondios) or on JSON arrays
+  # (Vayacondios Legacy)? These classes determine which to use.
+
+  class StandardContentsHandler
+    def wrap_contents(contents) {contents: contents} end
+    def extract_contents(document) document['contents'] end
+    def proper_request(document)
+      result = document.is_a?(Hash) and document.fetch('_json', {}).is_a?(Hash)
+      result
+    end
+  end
+
+  class LegacyContentsHandler
+    def wrap_contents(contents) contents end
+    def extract_contents(document) document.fetch('_json', {}) end
+    def proper_request(document)
+      result = document.is_a?(Array) or document.fetch('_json', {}).is_a?(Array)
+      puts "proper legacy request? #{document.inspect}: #{result.inspect}"
+      result
+    end
+  end
+
+  def self.legacy_switch
+    @@legacy_switch ||= get_legacy_switch(Settings[:vayacondios][:legacy])
+  end
+
+  def self.force_legacy_mode on
+    @@legacy_switch = get_legacy_switch on
+  end
+
+  private
+
+  def self.get_legacy_switch on
+    (on ? LegacyContentsHandler : StandardContentsHandler).new
+  end
+end
+

data/lib/vayacondios/server/model/itemset_document.rb

@@ -1,4 +1,5 @@
 require 'vayacondios/server/model/document'
+require 'vayacondios/legacy_switch'
 
 # The configuration model
 #
@@ -21,6 +22,8 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
     @body         = nil
     @mongo        = mongodb
 
+    @handler = Vayacondios.legacy_switch
+
     collection_name = [organization.to_s, topic, 'itemset'].join('.')
     @collection = @mongo.collection(collection_name)
   end
@@ -34,7 +37,7 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def body
-    {contents: @body}
+    @handler.wrap_contents(@body)
   end
 
   def find
@@ -50,9 +53,9 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def update(document)
-    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
+    raise Vayacondios::Error::BadRequest.new unless @handler.proper_request(document)
 
-    @body = document['contents']
+    @body = extract_contents(document)
 
 
     @collection.update({:_id => @id}, {:_id => @id, 'd' => @body }, {upsert: true})
@@ -61,19 +64,19 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def patch(document)
-    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
+    raise Vayacondios::Error::BadRequest.new unless @handler.proper_request(document)
 
     # Merge ourselves
     if @body
-      @body = @body + document['contents']
+      @body = @body + extract_contents(document)
     else
-      @body = document['contents']
+      @body = extract_contents(document)
     end
 
     @collection.update({:_id => @id}, {
       '$addToSet' => {
         'd' => {
-          '$each'=> document['contents']
+          '$each'=> extract_contents(document)
         }
       }
     }, {upsert: true})
@@ -82,13 +85,13 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def destroy(document)
-    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
+    raise Vayacondios::Error::BadRequest.new unless @handler.proper_request(document)
 
-    @body -= document['contents']
+    @body -= extract_contents(document)
     
     @collection.update({:_id => @id}, {
       '$pullAll' => {
-        'd' => document['contents']
+        'd' => extract_contents(document)
       }
     })
     
@@ -97,6 +100,11 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
 
   protected
 
+  def extract_contents(document)
+    puts "doc = #{document}. contents = #{result = @handler.extract_contents(document)}"
+    result
+  end
+
   def sanitize_options(options)
     options = options.symbolize_keys
 

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.1.12'
+  VERSION = '0.2.1'
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.infochimps</groupId>
   <artifactId>vayacondios</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.2-SNAPSHOT</version>
   <name>java-common</name>
   <url>http://maven.apache.org</url>
 
@@ -14,6 +14,10 @@
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <test.logLevel>info</test.logLevel>
+  </properties>
+
   <reporting>
     <plugins>
       <plugin>
@@ -63,6 +67,16 @@
 	  </arguments>
 	</configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.14.1</version>
+        <configuration>
+          <systemPropertyVariables>
+            <org.slf4j.simpleLogger.defaultLogLevel>${test.logLevel}</org.slf4j.simpleLogger.defaultLogLevel>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   
@@ -100,10 +114,16 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

data/spec/server/itemset_legacy_spec.rb

@@ -0,0 +1,320 @@
+require 'spec_helper'
+
+require 'multi_json'
+
+require File.join(File.dirname(__FILE__), '../../', 'app/http_shim')
+
+describe HttpShim do
+  include Goliath::TestHelper
+
+  let(:err) { Proc.new{ |c| fail "HTTP Request Failed #{c.response}" } }
+
+  context 'Basic requirements' do
+    it 'requires a topic' do
+      Vayacondios.force_legacy_mode(true)
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/',
+          :body => MultiJson.dump(["foo"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+      end
+    end
+
+    it 'requires an id' do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power',
+          :body => MultiJson.dump(["foo"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+
+        get_mongo_db do |db|
+          db.collection("infochimps.power.itemset").find_one().should be_nil
+        end
+      end
+    end
+
+    it 'rejects deep IDs' do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level/is/invalid',
+          :body => MultiJson.dump(["foo"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+
+        get_mongo_db do |db|
+          db.collection("infochimps.power.itemset").find_one({:_id => "level"}).should be_nil
+        end
+      end
+    end
+  end
+
+
+  context 'can handle GET requests' do
+      Vayacondios.force_legacy_mode(true)
+
+    it 'and return 404 for missing resources' do
+      with_api(HttpShim) do |api|
+      Vayacondios.force_legacy_mode(true)
+
+        get_request({:path => '/v1/infochimps/itemset/missing/resource'}, err) do |c|
+          c.response_header.status.should == 404
+        end
+      end
+    end
+
+    it 'and return an array for valid resources' do
+
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err)
+      end
+      with_api(HttpShim) do |api|
+        get_request({:path => '/v1/infochimps/itemset/power/level'}, err) do |c|
+          c.response_header.status.should == 200
+          MultiJson.load(c.response).should eql(["foo", "bar"])
+        end
+      end
+    end
+  end
+
+  context "will not handle POST requests" do
+    it 'fails on POST' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/itemset/post/unsupported',
+          :body => MultiJson.dump({ :totally => :ignored }),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should eql 405
+          c.response_header["ALLOW"].should_not be_nil
+        end
+      end
+    end
+  end
+
+  context 'handles PUT requests in legacy mode' do
+    Vayacondios.force_legacy_mode(true)
+    it 'only accepts arrays' do
+      with_api(HttpShim) do |api|
+        put_request({
+                      :path => '/v1/infochimps/itemset/power/level',
+                      :body => MultiJson.dump({'foo' => 'bar'}),
+                      :head => { :content_type => 'application/json' }
+                    }, err) do |c|
+          c.response_header.status.should == 400  # geometrid: changed from 500
+        end
+
+        get_mongo_db do |db|
+          db.collection("infochimps.itemset").find_one({:_id => "power"}).should be_nil
+        end
+      end
+      with_api(HttpShim) do |api|
+        put_request({
+                      :path => '/v1/infochimps/itemset/power/level',
+                      :body => "foo",
+                      :head => { :content_type => 'application/json' }
+                    }, err) do |c|
+          c.response_header.status.should == 400
+        end
+
+        get_mongo_db do |db|
+          db.collection("infochimps.itemset").find_one({:_id => "power"}).should be_nil
+        end
+      end
+    end
+    it "stores the array when the resource doesn't exist" do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 201 Created
+          c.response.should eql ""
+        end
+
+        get_mongo_db do |db|
+          db.collection("infochimps.power.itemset").find_one({:_id => "level"})["d"].should eql ["foo", "bar"]
+        end
+      end
+    end
+    it "clobbers the previous array when the resource does exist" do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["chimpanzee", "bonobo"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 204 No content
+          c.response.should eql ""
+        end
+      end
+
+      # Verify the first was created
+      get_mongo_db do |db|
+        db.collection("infochimps.power.itemset").find_one({:_id => "level"})["d"].should eql ["chimpanzee", "bonobo"]
+      end
+
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200
+          c.response.should eql ""
+        end
+
+        # Verify the first was clobbered
+        get_mongo_db do |db|
+          db.collection("infochimps.power.itemset").find_one({:_id => "level"})["d"].should eql ["foo", "bar"]
+        end
+      end
+    end
+  end
+
+  context "handles PATCH requests in legacy mode" do
+    Vayacondios.force_legacy_mode(true)
+    it 'creates a missing resource' do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :head => ({'X-Method' => 'PATCH', :content_type => 'application/json' }),
+          :body => MultiJson.dump(["bar"])
+        }, err) do |c|
+          c.response_header.status.should eql 200 # TODO Make this 201 Created
+          c.response.should eql ""
+        end
+
+        # Verify the resource was created
+        get_mongo_db do |db|
+          db.collection("infochimps.power.itemset").find_one({:_id => "level"})["d"].should eql ["bar"]
+        end
+      end
+    end
+
+    it 'merges with PATCH' do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/merge/test',
+          :body => MultiJson.dump(["foo"]),
+          :head => { :content_type => 'application/json' }
+        }, err)
+      end
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/merge/test',
+          :head => ({'X-Method' => 'PATCH', :content_type => 'application/json' }),
+          :body => MultiJson.dump(["bar"])
+        }, err)
+      end
+      with_api(HttpShim) do |api|
+        get_request({:path => '/v1/infochimps/itemset/merge/test'}, err) do |c|
+          c.response_header.status.should == 200
+          MultiJson.load(c.response).should eql(["foo", "bar"])
+        end
+      end
+    end
+  end
+
+  context "will handle DELETE requests in legacy mode" do
+    Vayacondios.force_legacy_mode(true)
+    it 'will not delete a missing resource' do
+      with_api(HttpShim) do |api|
+        delete_request({
+          :path => '/v1/infochimps/itemset/merge/test',
+          :body => MultiJson.dump(["bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 404
+        end
+      end
+    end
+
+    it "will be ok to delete items that don't exist" do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 201 Created
+        end
+      end
+      with_api(HttpShim) do |api|
+        delete_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 204 No content
+        end
+      end
+    end
+
+    it "will delete items that do exist" do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Makes this 201 Created
+        end
+      end
+      with_api(HttpShim) do |api|
+        delete_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 204 No content
+        end
+      end
+      with_api(HttpShim) do |api|
+        get_request({:path => '/v1/infochimps/itemset/power/level'}, err) do |c|
+          c.response_header.status.should == 200
+          MultiJson.load(c.response).should eql(["foo"])
+        end
+      end
+    end
+
+    it "leaves behind an empty array if everything is deleted" do
+      with_api(HttpShim) do |api|
+        put_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Makes this 201 Created
+        end
+      end
+      with_api(HttpShim) do |api|
+        delete_request({
+          :path => '/v1/infochimps/itemset/power/level',
+          :body => MultiJson.dump(["foo", "bar"]),
+          :head => { :content_type => 'application/json' }
+        }, err) do |c|
+          c.response_header.status.should == 200 # TODO Make this 204 No content
+        end
+      end
+      with_api(HttpShim) do |api|
+        get_request({:path => '/v1/infochimps/itemset/power/level'}, err) do |c|
+          c.response_header.status.should == 200
+          MultiJson.load(c.response).should eql([])
+        end
+      end
+    end
+  end
+end

data/spec/server/itemset_spec.rb

@@ -47,25 +47,29 @@ describe HttpShim do
         }, err) do |c|
           c.response_header.status.should == 400
         end
-        
+
         get_mongo_db do |db|
           db.collection("infochimps.power.itemset").find_one({:_id => "level"}).should be_nil
         end
       end
     end
   end
-    
+
   context 'handles PUT requests' do
     it 'only accepts hashes' do
+      # note: due to unknown class variable handling by rspec,
+      # force_legacy_mode must be set inside the it block to
+      # get all tests to pass at once
+      Vayacondios.force_legacy_mode(false)
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
           :body => MultiJson.dump(['foo', 'bar']),
           :head => { :content_type => 'application/json' }
         }, err) do |c|
-          c.response_header.status.should == 500
+          c.response_header.status.should == 400 # geometrid: changed from 500
         end
-        
+
         get_mongo_db do |db|
           db.collection("infochimps.itemset").find_one({:_id => "power"}).should be_nil
         end
@@ -177,8 +181,8 @@ describe HttpShim do
       end
     end
   end
-  
-  context "handles PATCH requests" do    
+
+  context "handles PATCH requests" do
     it 'creates a missing resource' do
       with_api(HttpShim) do |api|
         put_request({
@@ -222,6 +226,7 @@ describe HttpShim do
   end
   
   context "will handle DELETE requests" do
+    Vayacondios.force_legacy_mode(false)
     it 'will not delete a missing resource' do
       with_api(HttpShim) do |api|
         delete_request({

data/src/main/java/com/infochimps/util/DebugUtil.java

@@ -17,22 +17,22 @@ import java.net.Proxy;
 
 public class DebugUtil {
     public static Proxy useCharles() {
-	trustAllCerts();
-	return new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8888));
+        trustAllCerts();
+        return new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8888));
     }
 
     public static void trustAllCerts() {
-	try {
-	    SSLContext sc = SSLContext.getInstance("SSL"); 
-	    sc.init(null,
-		    new TrustManager[] { 
-			new X509TrustManager() {     
-			    public X509Certificate[] getAcceptedIssuers() { return null;} 
-			    public void checkClientTrusted(X509Certificate[] certs, String authType) {} 
-			    public void checkServerTrusted(X509Certificate[] certs, String authType) {}
-			} 
-		    }, new SecureRandom()); 
-	    HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-	} catch (GeneralSecurityException e) {}
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL"); 
+            sc.init(null,
+                    new TrustManager[] { 
+                        new X509TrustManager() {     
+                            public X509Certificate[] getAcceptedIssuers() { return null;} 
+                            public void checkClientTrusted(X509Certificate[] certs, String authType) {} 
+                            public void checkServerTrusted(X509Certificate[] certs, String authType) {}
+                        } 
+                    }, new SecureRandom()); 
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        } catch (GeneralSecurityException e) {}
     }
 }