filecluster 0.1.4 → 0.1.5

data/lib/fc/item.rb

@@ -113,5 +113,11 @@ module FC
     def get_item_storages
       FC::ItemStorage.where("item_id = #{id}")
     end
+    
+    def get_available_storages
+      r = FC::DB.connect.query("SELECT st.* FROM #{FC::Storage.table_name} as st, #{FC::ItemStorage.table_name} as ist WHERE 
+        ist.item_id = #{id} AND ist.status='ready' AND ist.storage_name = st.name")
+      r.map{|data| FC::Storage.create_from_fiels(data)}.select {|storage| storage.up? }
+    end
   end
 end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/item_test.rb

@@ -11,7 +11,7 @@ class ItemTest < Test::Unit::TestCase
       @@storages << FC::Storage.new(:name => 'rec2-sda', :host => 'rec2')
       @@item_storages = @@storages.map do |storage|
         storage.save
-        item_storage = FC::ItemStorage.new(:item_id => @@item.id, :storage_name => storage.name)
+        item_storage = FC::ItemStorage.new(:item_id => @@item.id, :storage_name => storage.name, :status => 'ready')
         item_storage.save
         item_storage
       end
@@ -21,10 +21,6 @@ class ItemTest < Test::Unit::TestCase
       FC::DB.connect.query("DELETE FROM items")
       FC::DB.connect.query("DELETE FROM storages")
     end
-  end 
-
-  should "get_item_storages" do
-    assert_same_elements @@item_storages.map(&:id), @@item.get_item_storages.map(&:id)
   end
   
   should "create_from_local" do
@@ -46,4 +42,13 @@ class ItemTest < Test::Unit::TestCase
     end
   end
   
+  should "get_item_storages" do
+    assert_same_elements @@item_storages.map(&:id), @@item.get_item_storages.map(&:id)
+  end
+  
+  should "item get_available_storages" do
+    @@storages[0].update_check_time
+    assert_equal 1, @@item.get_available_storages.count
+    assert_equal @@storages[0].name, @@item.get_available_storages.first.name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1105440005900324058
+      hash: 191961039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1105440005900324058
+      hash: 191961039
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24