vayacondios-server 0.0.5 → 0.0.6

data/lib/tasks/publish.rake

@@ -17,7 +17,7 @@ Dir['*.gemspec'].each do |gemspec|
     sh 'git', 'tag', '-m', "releasing #{gem_name}", "#{gem_name}-v#{Vayacondios::VERSION}"
     branch = `git branch | awk -F '/* ' '{print $2}'`.strip
     sh "git push origin #{branch}"
-    sh "git push origin vayacondios-#{branch}-v#{Vayacondios::VERSION}"
+    sh "git push origin #{gem_name}-v#{Vayacondios::VERSION}"
     sh "ls pkg/#{gem_name}*.gem | xargs -n 1 gem push"
   end
 end

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

@@ -56,7 +56,7 @@ class Vayacondios::ConfigDocument < Vayacondios::Document
     end
 
     # Merge ourselves
-    document = deep_merge(document)
+    document = body.deep_merge(document) if body
 
     fields = document
     # fields = {@field => document} if @field.present?

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/server/config_spec.rb

@@ -33,16 +33,7 @@ describe HttpShim do
         post_request({
           :path => '/v1/infochimps/config/power/level',
           :body => {:level=>"awesome"}
-        }, err) do |c|
-          c.response_header.status.should == 200
-          MultiJson.load(c.response).should eql ({
-            "topic" => "power",
-            "status" => "success",
-            "cargo" => {
-              "level" => "awesome"
-            }
-          })
-        end
+        }, err)
       end
       with_api(HttpShim) do |api|
         get_request({:path => '/v1/infochimps/config/power/level'}, err) do |c|
@@ -51,5 +42,31 @@ describe HttpShim do
         end
       end
     end
+    
+    it 'merge deep configuration' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/config/mergetest',
+          :body => { :foo => { :bar => 3 } }
+        }, err)
+      end
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/config/mergetest',
+          :body => { :foo => { :baz => 7 } }
+        }, err)
+      end
+      with_api(HttpShim) do |api|
+        get_request({:path => '/v1/infochimps/config/mergetest'}, err) do |c|
+          c.response_header.status.should == 200
+          MultiJson.load(c.response).should eql({
+            "foo" => {
+              "bar" => "3",
+              "baz" => "7"
+            }
+          })
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -884221921844700299
+      hash: -2723098123510614667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -884221921844700299
+      hash: -2723098123510614667
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23