vayacondios-server 0.2.1 → 0.2.2

data/config/vayacondios.example.yaml

@@ -4,4 +4,4 @@ mongo:
   database:     vayacondios_dev
 
 vayacondios:
-  legacy: false
+  legacy: true

data/config/vayacondios.yaml

@@ -4,4 +4,4 @@ mongo:
   database:     vayacondios_dev
 
 vayacondios:
-  legacy: false
+  legacy: true

data/lib/vayacondios/client/config.rb

@@ -0,0 +1,9 @@
+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'))
+Settings.resolve!
+

data/lib/vayacondios/client/itemset.rb

@@ -1,6 +1,8 @@
 require 'gorillib/logger/log'
 require 'net/http'
 require 'multi_json'
+require_relative 'config'
+require_relative '../legacy_switch'
 
 class Vayacondios
   class Client
@@ -15,7 +17,7 @@ class Vayacondios
 
       def fetch organization=nil, topic=nil, id=nil
         resp = execute_request(_req(:fetch, nil, organization, topic, id)) and
-          resp["contents"]
+          Vayacondios.legacy_switch.extract_response(resp)
       end
 
       def update ary, organization=nil, topic=nil, id=nil
@@ -70,7 +72,10 @@ class Vayacondios
         when :remove then Net::HTTP::Delete
         else         raise ArgumentError.new("invalid type: #{type}")
         end.new(the_path, headers).tap do |req|
-          req.body = MultiJson.encode(contents: ary) unless type == :fetch
+          unless type == :fetch
+            req.body =
+              MultiJson.encode(Vayacondios.legacy_switch.wrap_contents(ary))
+          end
         end
       end
     end

data/lib/vayacondios/legacy_switch.rb

@@ -1,3 +1,5 @@
+require 'gorillib/logger/log'
+
 class Vayacondios
   # Are we operating on JSON Hashes (Vayacondios) or on JSON arrays
   # (Vayacondios Legacy)? These classes determine which to use.
@@ -5,24 +7,30 @@ class Vayacondios
   class StandardContentsHandler
     def wrap_contents(contents) {contents: contents} end
     def extract_contents(document) document['contents'] end
+    def extract_response(document) document['contents'] end
     def proper_request(document)
-      result = document.is_a?(Hash) and document.fetch('_json', {}).is_a?(Hash)
-      result
+      document.is_a? Hash and document.fetch('_json', {}).is_a? Hash
     end
   end
 
   class LegacyContentsHandler
     def wrap_contents(contents) contents end
     def extract_contents(document) document.fetch('_json', {}) end
+    def extract_response(document) document 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
+      document.is_a? Array or document.fetch('_json', {}).is_a? Array
     end
   end
 
+  @@legacy_switch = nil
+
   def self.legacy_switch
-    @@legacy_switch ||= get_legacy_switch(Settings[:vayacondios][:legacy])
+    legacy_mode_on = Settings[:vayacondios][:legacy]
+    if @@legacy_switch.nil?
+      @@legacy_switch = get_legacy_switch(legacy_mode_on)
+      Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
+    end
+    @@legacy_switch
   end
 
   def self.force_legacy_mode on

data/lib/vayacondios/version.rb

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

data/spec/client/itemset_legacy_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require_relative '../../lib/vayacondios/legacy_switch'
+
+require 'multi_json'
+
+require_relative '../../lib/vayacondios/client/itemset'
+
+describe Vayacondios::Client::ItemSet do
+  context "after instantiation in legacy mode" do
+    itemset = Vayacondios::Client::ItemSet.new("foohost", 9999, "fooorg", "footopic", "fooid")
+    ary = ["foo", "bar", "baz"]
+
+    # testing internals here to avoid shimming up HTTP libraries.
+
+    it "generates a put request without a patch header when asked to create" do
+      Vayacondios.force_legacy_mode true
+
+      req = itemset.instance_eval{_req(:create, ary)}
+
+      req.method.should eql('PUT')
+      req.body.should eql(MultiJson.encode(ary))
+      req.path.should eql('/v1/fooorg/itemset/footopic/fooid')
+      req.each_header.to_a.should_not include(["x_method", "PATCH"])
+    end
+
+    it "generates a put request with a patch header when asked to update" do
+      Vayacondios.force_legacy_mode true
+
+      req = itemset.instance_eval{_req(:update, ary)}
+
+      req.method.should eql('PUT')
+      req.body.should eql(MultiJson.encode(ary))
+      req.path.should eql('/v1/fooorg/itemset/footopic/fooid')
+      req.each_header.to_a.should include(["x-method", "PATCH"])
+    end
+
+    it "generates a get request when asked to fetch" do
+      req = itemset.instance_eval{_req(:fetch)}
+
+      req.method.should eql('GET')
+      req.body.should be_nil
+      req.path.should eql('/v1/fooorg/itemset/footopic/fooid')
+    end
+
+    it "generates a delete request when asked to remove" do
+      Vayacondios.force_legacy_mode true
+
+      req = itemset.instance_eval{_req(:remove, ary)}
+
+      req.method.should eql('DELETE')
+      req.body.should eql(MultiJson.encode(ary))
+      req.path.should eql('/v1/fooorg/itemset/footopic/fooid')
+    end
+  end
+end

data/spec/client/itemset_spec.rb

@@ -12,13 +12,14 @@ describe Vayacondios::Client::ItemSet do
   end
 
   context "after instantiation" do
-
     itemset = Vayacondios::Client::ItemSet.new("foohost", 9999, "fooorg", "footopic", "fooid")
     ary = ["foo", "bar", "baz"]
 
     # testing internals here to avoid shimming up HTTP libraries.
 
     it "generates a put request without a patch header when asked to create" do
+      Vayacondios.force_legacy_mode false
+
       req = itemset.instance_eval{_req(:create, ary)}
 
       req.method.should eql('PUT')
@@ -28,6 +29,8 @@ describe Vayacondios::Client::ItemSet do
     end
 
     it "generates a put request with a patch header when asked to update" do
+      Vayacondios.force_legacy_mode false
+
       req = itemset.instance_eval{_req(:update, ary)}
 
       req.method.should eql('PUT')
@@ -45,6 +48,8 @@ describe Vayacondios::Client::ItemSet do
     end
 
     it "generates a delete request when asked to remove" do
+      Vayacondios.force_legacy_mode false
+
       req = itemset.instance_eval{_req(:remove, ary)}
 
       req.method.should eql('DELETE')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -203,6 +203,7 @@ files:
 - lib/tasks/yard.rake
 - lib/vayacondios-client.rb
 - lib/vayacondios-server.rb
+- lib/vayacondios/client/config.rb
 - lib/vayacondios/client/configliere.rb
 - lib/vayacondios/client/cube_client.rb
 - lib/vayacondios/client/http_client.rb
@@ -234,6 +235,7 @@ files:
 - scripts/s3_cataloger/buckets
 - scripts/s3_cataloger/foreach_bucket
 - scripts/s3_cataloger/parse_ls.py
+- spec/client/itemset_legacy_spec.rb
 - spec/client/itemset_spec.rb
 - spec/client/notifier_spec.rb
 - spec/server/config_spec.rb
@@ -275,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3916110167630393144
+      hash: -2368824716653400706
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3916110167630393144
+      hash: -2368824716653400706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -292,6 +294,7 @@ signing_key:
 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/server/config_spec.rb