cabi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 406c18b661c24a06904f1daeb757b3e0c053b822
-  data.tar.gz: a1eed6752e778fff1add1d785ab75134f719ca7d
+  metadata.gz: 2a56f6e6e8ee48ba38ba8f60099907e4c1d9c700
+  data.tar.gz: 484d80e55fc096a324dd0667b2f5d515e2b12af6
 SHA512:
-  metadata.gz: 73a054cca65bb89d43e28403292bb37c550edee56f7c9c11d576fe3ba29a03300bf089d7ee08b6a79bb812310159b1f1faac31c0e7122a27f52220aef90dc9eb
-  data.tar.gz: d0ebd8aa1069c374f66085ddec30dbb5d9aff2909f1274750b8198c21d7d12a4a54906d82922129d751fe076fd2382e7ee0600152861d7e54984ed9d3be78078
+  metadata.gz: 6eeedec5d3f8db0fdd66e428910225990acfda42f93f9281e29c732c5064da64b217b54c82bd67cf9d20d7c771959e011a6b2f83c3043786976e56833adfc911
+  data.tar.gz: 9ab42f192d38f94e8b4fd5c0e33e6d4f0b7f0505e839d3234158926c8963ae560ab64ad60c0bfaf87597dd9134e20f261717c7ac56ceca926a56a7cf50454519

data/cabi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'cabi'
-  s.version               = '0.1.3'
+  s.version               = '0.1.4'
   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/datafile.rb

@@ -4,8 +4,8 @@ module Cabi
 
     def self.contents(id)
       return self.bulk_selection(id)                        if self.bulk_selection?(id)
-      return File.read( self.file(id) )                     if self.file_exists?(id)
       return YAML.load(File.read( self.yaml_file(id) ))     if self.yaml_exists?(id)
+      return File.read( self.file(id) )                     if self.file_exists?(id)
       return File.read( self.non_extension_file(id) )       if self.non_extension_file(id)
       return self.sub_yaml(id)
       nil
@@ -27,8 +27,8 @@ module Cabi
 
     def self.file_yaml_or_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.file(id)                  if self.file_exists?(id)
       return self.non_extension_file(id)    if self.non_extension_file(id)
       nil
     end
@@ -38,7 +38,12 @@ module Cabi
     end
 
     def self.yaml_file(id)
-      File.join( self.file(id) + YAML_EXT )
+      path = self.has_yaml_ext?(id) ? self.file(id) : self.file(id) + YAML_EXT
+      File.join( path )
+    end
+
+    def self.has_yaml_ext?(id)
+      (id[-4..-1] == YAML_EXT)
     end
 
     def self.non_extension_file(id)
@@ -97,8 +102,9 @@ module Cabi
       id.each_with_index do |key, index|
         break if val
 
-        a                 =  [Cabi.data_dir] + id[0..index] 
-        a[ a.length - 1 ] =  a[a.length - 1 ] + YAML_EXT
+        a                 = [Cabi.data_dir] + id[0..index] 
+        last              = a[a.length - 1] 
+        a[ a.length - 1 ] = last + YAML_EXT if !self.has_yaml_ext?(last)
         f = File.join( *a )
 
         if File.exists? f

metadata

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