cabi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b09ee246dba02249981cbb0f0c42274da912aac
-  data.tar.gz: 17a4990844a94d7a72d0d929c26daba3c0c242b4
+  metadata.gz: ef8499690487070c9e95e0f172f87d60b6891c28
+  data.tar.gz: 6ff6984f617c702abe45ef66d06a714a5b9614b8
 SHA512:
-  metadata.gz: aa15f5e116ac640f3a90a7de36ca1bc732ea74b4dc0d4c2e758730255f9793291252f5cca4c923956c4f1c1be64483f2f86d1bef8a8e7ce16a22c317957819f3
-  data.tar.gz: 5d93f37b690435ab11f4eb1c1154f20b97edafc04096bbf6b1db02135e599fdfc63dd38926ee88fd7b892e8664ee95d73f4417459a64883033a031fda52bfcb0
+  metadata.gz: ca62a4ff0f7e567ec88228e2a827e82360ba431d65c74c8e09615b622b26f20e1b54521c3edc9a18461a50cba90f10c5ab5e30dee581b0e04d82e8fce3cc6236
+  data.tar.gz: 4f4b15e3f1c5d8b4d88551b8a1686942cab1b9aca2d554506ed05c54a314a07830c9d53a559230bb2d3f2fb63877c69a1bea5a0521ce462f860f985de13b0468

data/README.md

@@ -63,6 +63,10 @@ Cabi.read('pages:about:meta:foo:bar')         # contents of ['foo']['bar'] in pa
 Cabi.read('pages:about:meta.yml:foo:bar')     # same as above
 Cabi.read('info:foo:bar:baz')                 # contents of ['foo']['bar']['baz'] in info.yml hash
 Cabi.read('info.yml:foo:bar:baz')             # same as above
+
+# Return a file path for a Cabi ID.
+Cabi.file('pages:about:meta:foo:bar')         # path fo file at /pages/about/meta/foo/bar
+Cabi.path_to_id('/pages/about/meta/foo/bar')  # pages:about:meta:foo:bar
 ```
 
 ### Custom Data Directory

data/Rakefile

@@ -24,7 +24,6 @@ namespace :gem do
   desc "release"
   task :release do
     gems = Dir.glob("*.gem").length
-    puts gems
     raise "0 or > 1 gem in directory; aborting!" if gems != 1
     puts %x[gem push *.gem]
     puts %x[rm -rf *.gem]

data/cabi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'cabi'
-  s.version               = '0.1.7'
+  s.version               = '0.1.8'
   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

@@ -13,20 +13,31 @@ module Cabi
   CABI_DATA_ID   = '.cabi-data'
   CABI_DATA_DIR   = './cabi-data'
 
-  def self.read(id)
-    Data.read(id)
+  def self.read(id, opts={})
+    Data.read(id, opts)
   end
 
   def self.write(id, content)
     Data.write(id, content)
   end
 
+  def self.create(id, content='')
+    Data.write(id, content)
+  end
+
   def self.file(id, opts={})
     DataFile.file_yaml_or_non_extension_file(id)
   end
 
-  def self.list(id)
-     Cabi::List.list(id)
+  def self.list(id='*', opts={})
+     Cabi::List.list(id, opts)
+  end
+
+  def self.path_to_id(path)
+    path = path.split(Cabi.data_dir).last
+    path  = path[1..-1] if path[0] == '/' 
+    path  = path.gsub('/', DELIMITER)
+    path
   end
 
 end

data/lib/data.rb

@@ -2,14 +2,18 @@ module Cabi
 
   class Data
 
-      def self.read(id)
-        DataFile.contents(id) || nil
+      def self.read(id, opts={})
+        DataFile.contents(id, opts) || nil
       end
 
       def self.write(id, content)
         file = DataFile.write(id, content)
       end
 
+      def self.create(id, content)
+        file = DataFile.create(id, content)
+      end
+
       def self.user_data_dir
         dir = false
 

data/lib/datafile.rb

@@ -1,10 +1,12 @@
-module Cabi
 
+require 'FileUtils'
+
+module Cabi
   class DataFile
 
-    def self.contents(id)
+    def self.contents(id, opts={})
       return self.bulk_selection(id)                        if self.bulk_selection?(id)
-      return YAML.load(File.read( self.yaml_file(id) ))     if self.yaml_exists?(id)
+      return YAML.load(File.read( self.yaml_file(id) ))     if self.yaml_exists?(id) and !opts[:no_yaml]
       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)
@@ -25,6 +27,16 @@ module Cabi
       File.open( file, 'w') {|f| f.write(content) } 
     end
 
+    def self.create(id, content="")
+      file = self.file(id) 
+      raise "File exists." if self.file_exists?(id)
+      dir  = File.dirname(file)
+
+      FileUtils.mkdir_p(dir) unless File.exists?(dir)
+      FileUtils.touch(file)
+      Cabi.write(id, content)
+    end
+
     def self.file_yaml_or_non_extension_file(id, opts={})
       return self.bulk_selection(id, only_file: true)     if self.bulk_selection?(id)
       return self.yaml_file(id)                           if self.yaml_exists?(id)

data/lib/list.rb

@@ -2,13 +2,17 @@ module Cabi
   class List
 
     def self.list(id, opts={})
-      ls = []
+      ls    = []
+      path  = id.gsub( DELIMITER, '/')
 
-      Dir.glob( "#{Cabi.data_dir}/#{id}") do |item|
+      Dir.glob( "#{Cabi.data_dir}/#{path}") do |item|
         next if item == '.' or item == '..'
-        ls << [ item, File.directory?(item) ? "dir" : "file" ]
+
+        i = opts[:full_path] ? item : Cabi.path_to_id(item)
+        ls << [ i, File.directory?(item) ? "dir" : "file", File.basename(item) ]
       end
 
+      ls.sort_by!{ |f| f[1] } if opts[:dirs_first] # "dir" < "file" 
       ls
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cabi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor