inventory-server 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa2af8dd9d05ac5a2cca7365f5fa6c4c7e8bd67e
-  data.tar.gz: 89cfb258d7c89e880e36fe0cfae9bf88e0808f63
+  metadata.gz: ae35d4914717ef5ffb50b58df22542cf5bfaf5fe
+  data.tar.gz: 33b74f421d4c148469e2450dbc191a7287f98da8
 SHA512:
-  metadata.gz: 1996bd0a71360d16ed1f51b4f2780032741d8205b97b0854b94f9691a05c741eccb491c7d4468571b5ebd3ef3dacd2d5da6997cee46a94e5a4cc962ee98799db
-  data.tar.gz: 9c5427c47051827e4a4c9ef3250f3770359be8e282915cd85d61b8d1695cebd8d23241a25da23751b6f793ae2b9af8c68c476da7f1beef5e0be3ede4741b00dd
+  metadata.gz: cbc394386ceb1ea44fd4f511f5b5f8a8caa9e6432a0c6a4de69d1931f4ca7e616dbd2e231fa8bd6191a754982c4b1d23987db84d71cb3e448ee67d86c46153c6
+  data.tar.gz: fd4ca65d8efe8f2e7b9355c8fa03171507c330afcf87f690e039ab2c7aa13842f7e869b96ec42900164153eea135578779b1c73d9f9ca4f17ee868ea0e139bf1

data/Dockerfile

@@ -27,4 +27,6 @@ RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
 
 WORKDIR /app
 
+RUN cd /app  && bundle install
+
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/Dockerfile-unicorn

@@ -27,4 +27,6 @@ RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
 
 WORKDIR /app
 
+RUN cd /app  && bundle install
+
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/lib/inventory/server/version.rb

@@ -1,5 +1,5 @@
 module Inventory
   module Server
-    VERSION = "0.0.7"
+    VERSION = "0.1.0"
   end
 end

data/plugins/index.rb

@@ -28,10 +28,9 @@ module Inventory
         raise InventoryError.new 'id is missing' if id.nil? || id.empty?
         raise InventoryError.new 'facts is missing' if facts.nil?
 
-        type = facts[@config[:type_key]] || @config[:type_default]
         version = facts[@config[:version_key]] || @config[:version_default]
 
-        url = clean_string "#{@config[:es_host]}/#{@config[:es_index_prefix]}#{type}/#{version}/#{id}"
+        url = clean_string "#{@config[:es_host]}/#{@config[:es_index_prefix]}#{week_number}/#{version}/#{id}"
 
         begin
           response = RestClient.put(url, facts.to_json)
@@ -52,6 +51,10 @@ module Inventory
       def clean_string(str)
         str.gsub('.', '-').gsub(' ', '_').encode(Encoding.find('ASCII'), :invalid => :replace, :undef => :replace, :replace => '')
       end
+
+      def week_number
+        Time.now.strftime('%W')
+      end
     end
   end
 end

data/spec/unit/index_spec.rb

@@ -16,6 +16,10 @@ RSpec.describe Inventory::Server::Index, '#call' do
     WebMock.allow_net_connect!
   end
 
+  before() do
+    allow_any_instance_of(Inventory::Server::Index).to receive(:week_number).and_return 15
+  end
+
   context "without id" do
     env = {:facts => { :key => 'value' }}
     it "should throw an error" do
@@ -50,7 +54,7 @@ RSpec.describe Inventory::Server::Index, '#call' do
     env = {:id => 'MY_UUID', :facts => { :key => 'value' } }
 
     it "should throw an error" do
-      stub_request(:put, "#{config[:es_host]}/inventory_facts/1-0-0/MY_UUID").to_return(:status => [500, "Internal Server Error"], :body => '{"OK": false}')
+      stub_request(:put, "#{config[:es_host]}/inventory_15/1-0-0/MY_UUID").to_return(:status => [500, "Internal Server Error"], :body => '{"OK": false}')
 
       expect {
         Inventory::Server::Index.new(noop, config).call(env)
@@ -61,7 +65,7 @@ RSpec.describe Inventory::Server::Index, '#call' do
   context "with an ElasticSearch Server" do
     it "should call ElasticSearch" do
       env = {:id => 'MY_UUID', :facts => { :key => 'value' } }
-      stub = stub_request(:put, "#{config[:es_host]}/inventory_facts/1-0-0/MY_UUID").to_return(:body => '{"OK": true}')
+      stub = stub_request(:put, "#{config[:es_host]}/inventory_15/1-0-0/MY_UUID").to_return(:body => '{"OK": true}')
 
       result = Inventory::Server::Index.new(noop, config).call(env)
       expect(result).to eq({ :key => 'value' })
@@ -70,8 +74,8 @@ RSpec.describe Inventory::Server::Index, '#call' do
     end
 
     it "should change url depending on the type and version" do
-      env = {:id => 'MY_UUID', :facts => { 'key' => 'value', 'type' => 'my_type', 'version' => 'my_version' } }
-      stub = stub_request(:put, "#{config[:es_host]}/inventory_my_type/my_version/MY_UUID").to_return(:body => '{"OK": true}')
+      env = {:id => 'MY_UUID', :facts => { 'key' => 'value', 'version' => 'my_version' } }
+      stub = stub_request(:put, "#{config[:es_host]}/inventory_15/my_version/MY_UUID").to_return(:body => '{"OK": true}')
 
       Inventory::Server::Index.new(noop, config).call(env)
 
@@ -79,8 +83,8 @@ RSpec.describe Inventory::Server::Index, '#call' do
     end
 
     it "should change not pass dot, spaces and utf8 to elasticsearch" do
-      env = {:id => 'MY_UUID', :facts => { 'key' => 'value', 'type' => 'my typé.1', 'version' => 'my vérsion.1' } }
-      stub = stub_request(:put, "#{config[:es_host]}/inventory_my_typ-1/my_vrsion-1/MY_UUID").to_return(:body => '{"OK": true}')
+      env = {:id => 'MY_UUID', :facts => { 'key' => 'value', 'version' => 'my vérsion.1' } }
+      stub = stub_request(:put, "#{config[:es_host]}/inventory_15/my_vrsion-1/MY_UUID").to_return(:body => '{"OK": true}')
 
       Inventory::Server::Index.new(noop, config).call(env)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory-server
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Filirom1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-smtp-server