leofs_manager_client 0.2.15 → 0.2.16

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -105,17 +105,33 @@ module LeoFSManager
       @checksum  = h[:checksum]
       timestamp = h[:timestamp]
       @timestamp = timestamp.empty? ? timestamp : Time.parse(timestamp)
-      @delete    = h[:delete]
+      @delete    = h[:delete] != 0 # bool
       @num_of_chunks = h[:num_of_chunks]
     end
   end
 
   # Storage Status Model
   class StorageStat
-    attr_reader :total_of_objects
+    attr_reader :active_num_of_objects, :total_num_of_objects,
+                :active_size_of_objects, :total_size_of_objects,
+                :last_compaction_start, :last_compaction_end
+
+    alias total_of_objects total_num_of_objects # for compatibility
 
     def initialize(h)
-      @total_of_objects = h[:total_of_objects]
+      @active_num_of_objects  = h[:active_num_of_objects]
+      @total_num_of_objects   = h[:total_num_of_objects]
+      @active_size_of_objects = h[:active_size_of_objects]
+      @total_size_of_objects  = h[:total_size_of_objects]
+
+      last_compaction_start = h[:last_compaction_start]
+      if last_compaction_start && last_compaction_start != "____-_-__- __:__:__"
+        @last_compaction_start = Time.parse(h[:last_compaction_start])
+      end
+      last_compaction_end = h[:last_compaction_end]
+      if last_compaction_end && last_compaction_end != "____-_-__- __:__:__"
+        @last_compaction_end = Time.parse(h[:last_compaction_end])
+      end
     end
 
     def file_size

data/lib/leofs_manager_client.rb

@@ -26,7 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 
   class Client
     CMD_VERSION          = "version"

data/spec/leofs_manager_client_spec.rb

@@ -44,6 +44,53 @@ NoResultAPIs = {
 include LeoFSManager
 
 describe LeoFSManager do
+  describe StorageStat do
+    shared_examples_for StorageStat do
+      its(:active_num_of_objects) { should == 0 }
+      its(:total_num_of_objects) { should == 0 }
+      its(:active_size_of_objects) { should == 0 }
+      its(:total_size_of_objects) { should == 0 }
+    end
+
+    context "there is no last compaction" do
+      subject do
+        StorageStat.new(
+          :active_num_of_objects => 0,
+          :total_num_of_objects => 0,
+          :active_size_of_objects => 0,
+          :total_size_of_objects => 0,
+          :last_compaction_start => "____-_-__- __:__:__",
+          :last_compaction_end => "____-_-__- __:__:__"
+        )
+      end
+
+      it_behaves_like StorageStat
+
+      its(:last_compaction_start) { should be_nil }
+      its(:last_compaction_end) { should be_nil }
+    end
+
+    context "there is last compaction" do
+      let(:time_str) { Time.now.to_s }
+
+      subject do
+        StorageStat.new(
+          :active_num_of_objects => 0,
+          :total_num_of_objects => 0,
+          :active_size_of_objects => 0,
+          :total_size_of_objects => 0,
+          :last_compaction_start => time_str,
+          :last_compaction_end => time_str
+        )
+      end
+    
+      it_behaves_like StorageStat
+
+      its(:last_compaction_start) { subject.to_s == time_str }
+      its(:last_compaction_end) { subject.to_s == time_str }
+    end
+  end
+
   describe Client do
     before(:all) do
       Dummy::Manager.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email:
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client for LeoFS Manager