cabi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec2656830ddd4ae65fba64c3821363be983765b
-  data.tar.gz: 25638dce3ba1f2f014f2629e190cf9ca9a7af450
+  metadata.gz: 406c18b661c24a06904f1daeb757b3e0c053b822
+  data.tar.gz: a1eed6752e778fff1add1d785ab75134f719ca7d
 SHA512:
-  metadata.gz: 5ebf6f96dd020f6ac2149ce3b6a2c47a584270d0a3e031d5b239ddbe197b1be4c1401884c9c75841ecb7f37269ebe7fc415d880ff1c27ac754c157992f4a3f28
-  data.tar.gz: ba777a2f2eaa0f25048341d9c72ef93fbe360782b015c51954f6add362bc3667e66232aae71cb8dcf9d1bf368003df2b570b29ba049276db36304ceb46090c9a
+  metadata.gz: 73a054cca65bb89d43e28403292bb37c550edee56f7c9c11d576fe3ba29a03300bf089d7ee08b6a79bb812310159b1f1faac31c0e7122a27f52220aef90dc9eb
+  data.tar.gz: d0ebd8aa1069c374f66085ddec30dbb5d9aff2909f1274750b8198c21d7d12a4a54906d82922129d751fe076fd2382e7ee0600152861d7e54984ed9d3be78078

data/README.md

@@ -56,6 +56,7 @@ Cabi.read('posts:some-article:index.html')    # contents of posts/some-article/i
 Cabi.read('pages:about:*')                    # an array of body.html and meta.yml contents
 Cabi.read('pages:about:person-*')             # an array of all person-* html files
 Cabi.read('**/*')                             # an array of all files in data
+Cabi.read('**/*').length                      # 9
 
 # Selection within YAML files
 Cabi.read('pages:about:meta:foo:bar')         # contents of ['foo']['bar'] in page/about/meta.yml hash

data/cabi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'cabi'
-  s.version               = '0.1.2'
+  s.version               = '0.1.3'
   s.summary               = "A simple, flat-file datastore for Ruby."
           
   s.description           = "Cabi is a flat-file datastore where data is stored by directory stucture and accessed by colon-delimited strings."

data/lib/cabi.rb

@@ -21,4 +21,8 @@ module Cabi
     Data.write(id, content)
   end
 
+  def self.file(id)
+    DataFile.file_yaml_or_non_extension_file(id)
+  end
+
 end

data/lib/data.rb

@@ -10,6 +10,10 @@ module Cabi
         file = DataFile.write(id, content)
       end
 
+      def self.file(id)
+        file = DataFile.write(id, content)
+      end
+
       def self.user_data_dir
         dir = false
 

data/lib/datafile.rb

@@ -8,6 +8,7 @@ module Cabi
       return YAML.load(File.read( self.yaml_file(id) ))     if self.yaml_exists?(id)
       return File.read( self.non_extension_file(id) )       if self.non_extension_file(id)
       return self.sub_yaml(id)
+      nil
     end
 
     def self.write(id, content)
@@ -25,9 +26,10 @@ module Cabi
     end
 
     def self.file_yaml_or_non_extension_file(id)
-      return self.file(id)                if self.file_exists?(id)
-      return self.yaml_file(id)           if self.yaml_exists?(id)
-      return self.non_extension_file(id)  if self.non_extension_file(id)
+      return self.bulk_selection(id, true)  if self.bulk_selection?(id)
+      return self.file(id)                  if self.file_exists?(id)
+      return self.yaml_file(id)             if self.yaml_exists?(id)
+      return self.non_extension_file(id)    if self.non_extension_file(id)
       nil
     end
 
@@ -51,12 +53,13 @@ module Cabi
       file
     end
 
-    def self.bulk_selection(id)
+    def self.bulk_selection(id, only_file=false)
       contents  = []
 
       Dir.glob( File.join( *self.id_array(id) ) ).each do |f|
         next if f == '.' or f == '..' or File.directory?(f)
-        contents << File.read(f) if File.exists?(f)
+
+        contents << (only_file ? f : File.read(f)) if File.exists?(f)
       end
 
       contents

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cabi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor