rbbt-study 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTg4YWExYzRjYzE1NzMwNjg0ZmNlOWZlOWM1ZTVmMDk4MWNiZDQ5Yg==
+    Nzg0NmExMGQ2YjAzMjM1YWJlOWNhN2M1MGRiYTVlZTczZmVjMjlhNw==
   data.tar.gz: !binary |-
-    MWE4Y2U3YzMyODdkNmZhOWRmMjJmODViZmVlNzdmYWJmOGM0Yjc5Yw==
-!binary "U0hBNTEy":
+    MDBiYTE4OTc3ZmUzYjNkNTg4ZTYxNzVhOTYwNDI0YTVhZmJjYTc0ZQ==
+SHA512:
   metadata.gz: !binary |-
-    ZWQ2YmIyOTcwZjY4NWQ2Y2EwZTI4N2JmN2NkMjU5YThlMmJhNTE4YzY5MWIz
-    N2FjMDViYmUyNjQ2ZWJkNjQyMzc0NWZkMmYzNTQ1NzNjZGIyNzZhZjMwNTli
-    ZDM4NWZiMjYwMDk4NTBlNGQ1NjE2MDQxZTQ1OTg5ZWJlZDdkZDM=
+    MzVkOTYzOTgyMTYzNTRkZmRlMDk1NzBmZTkxNTU1MGQ5MmFhNDFmM2E0NGYy
+    YTI0MjZkMjdkZmI2M2U1ZDUxNDBhZDc1MmM3YTZkNjViMWNhZDM2NGZjZDVi
+    N2U0N2EzMWUzYTcxMTJhMDNkNGIxMDkwMWEzMDEwZjZiZTAwNTE=
   data.tar.gz: !binary |-
-    ZGI0N2E4YWViNDAyNjFkMTZkNTBhNjdiYzI4ZTAyNmM4Y2Q4ZGNlYTI1YWNh
-    NmVkOWRmYzE5NDI1YjFkNzZlZWU4MTM4ODczMzNiZjk2MDdkZDA0MDA0MWEz
-    N2U2NmNlOWE0NzNmMTEzMDUwYzg4YTcwMTA1MmNhOTY2MjNkYmE=
+    YzAwOTYyNDdjYTg0YjY0M2I3ZWU2NzBiYWI4YTcwOGE5YjIwOTA0N2EzZTk5
+    MWMzOGFmOGFlNGY3ZWVhZjFmNDU3MzlmMjcwY2VjYjYzYWFiYzNhMGM0Zjgz
+    MzQ2MzAwMjM2NTc4YzNjOGY3OWQwM2FiZDExZDU5N2UzMzQwYzM=

data/lib/rbbt/entity/study.rb

@@ -103,11 +103,7 @@ module Study
   end
 
   def dir
-    if @dir.nil?
-      @dir = Path.setup(File.join(Study.study_dir, self))
-      @dir.resource = Study
-    end
-    @dir
+    @dir ||= Path === Study.study_dir ? Study.study_dir[self] : Path.setup(File.join(Study.study_dir, self), nil, Study)
   end
 
   def metadata

data/lib/rbbt/entity/study/samples.rb

@@ -1,3 +1,6 @@
+module Study
+end
+
 module Sample
   extend Entity
 
@@ -23,8 +26,12 @@ module Sample
 
   def study
     @study ||= begin
-                 this = Array === self ? self.flatten : [self]
-                 Study.studies.select{|study| Study.setup(study); (study.samples & this).any? }.first
+                 study = info[:study] 
+                 if study.nil?
+                   study = Study.identify_study(self)
+                   self.study = study
+                 end
+                 study
                end
   end
 
@@ -38,16 +45,18 @@ module Study
   end
 
   def samples
-    if @samples.nil?
-      if sample_info.nil?
-        @samples = self.cohort.collect{|g| g.jobname }
-      else
-        @samples = sample_info.keys
-      end
-      Sample.setup(@samples, self)
-      @samples.study = self
-    end
-    @samples
+    @samples ||= begin
+                   samples = local_persist("Sample", :array) do
+                     if sample_info.nil?
+                       self.cohort.collect{|g| g.jobname }
+                     else
+                       sample_info.keys
+                     end
+                   end
+                   Sample.setup(samples, self)
+                   samples.study = self
+                   samples
+                 end
   end
 
   def match_samples(list)
@@ -58,4 +67,13 @@ module Study
     end
     list
   end
+
+  def self.identify_study(samples)
+    samples = Array === samples ? samples.flatten : [samples]
+
+    studies = Study.studies.select{|study| Study.setup(study); (study.samples & samples).any? }
+    return nil if studies.length != 1
+
+    studies.first
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-study
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies: []
 description: This gem add the study entity with suport for NGS, Microarray and other
   types of data
@@ -19,6 +19,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- LICENSE.txt
+- README.rdoc
 - lib/rbbt/entity/study.rb
 - lib/rbbt/entity/study/cnv.rb
 - lib/rbbt/entity/study/cnv/genes.rb
@@ -40,8 +42,6 @@ files:
 - lib/rbbt/entity/study/plots.rb
 - lib/rbbt/entity/study/samples.rb
 - lib/rbbt/entity/study/snp.rb
-- LICENSE.txt
-- README.rdoc
 homepage: http://github.com/mikisvaz/rbbt-study
 licenses:
 - MIT
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Genomic study entity