git-ds 0.9.5.1 → 0.9.5.2

data/ChangeLog

@@ -1,6 +1,10 @@
 2011-04-18 :	mkfs <mkfs@thoughtgang.org>
+	*	Bumped gem version to 0.9.5
 	*	Added ModelItem.exist? class member
 	*	Added convenience property  method aliases to ModelItem
+	*	Changed default branch from 'master' to Repo#current_branch
+	*	Added a BinaryPropertyDefinition class
+	*	Added a binary_property class method to ModelItem
 
 2011-04-15 :	mkfs <mkfs@thoughtgang.org>
 	*	Removed newline from Repo.top_level

data/lib/git-ds/index.rb

@@ -129,7 +129,7 @@ Index object for the Git staging index.
 
 =begin rdoc
 =end
-    def initialize(repo,treeish=nil)
+    def initialize(repo, treeish=nil)
       super(repo)
       @parent_commit = repo.commits(repo.current_branch, 1).first
       treeish = (@parent_commit ? @parent_commit.tree.id : 'master') if \

data/lib/git-ds/model/item.rb

@@ -249,6 +249,17 @@ This can be overridden to change how properties are stored.
       define_db_property(name, default, &block)
     end
 
+=begin rdoc
+Define a BinaryProperty for this ModelItem class. The property will be on-FS
+unless on_fs is set to false. 
+
+Note: Properties that store raw binary data have no default value and no
+validation function. They are assumed to be on-disk by default.
+=end
+    def binary_property(name, on_fs=true)
+      add_property BinaryPropertyDefinition.new(name, nil, on_fs)
+    end
+
 =begin rdoc
 Define a property that is a link to a ModelItem object.
 

data/lib/git-ds/model/property.rb

@@ -97,8 +97,8 @@ Property BLOB.
         val = value.inspect
       end
 
-      on_fs ? model.add_fs_item(path(parent_path), val + "\n") \
-            : model.add_item(path(parent_path), val + "\n")
+      write(model, path(parent_path), val + "\n")
+
       val
     end
 
@@ -113,6 +113,47 @@ valid. Otherwise, return true.
 
     alias :default :default_value
 
+    protected
+
+=begin rdoc
+Write 
+=end
+    def write(model, path, value)
+      on_fs ? model.add_fs_item(path, value) : model.add_item(path, value)
+    end
+
+  end
+
+=begin rdoc
+A definition of a ModelItem property that stores binary data.
+=end
+  class BinaryPropertyDefinition < PropertyDefinition
+
+=begin rdoc
+Read value from ModelItem at path in Model.
+
+This just returns the raw binary value of the property file contents.
+=end
+    def get(model, parent_path)
+      model.get_item(path(parent_path))
+    end
+
+=begin rdoc
+Write a raw binary value to ModelItem at path in Model.
+
+Note: this returns the raw binary data as written to the Property BLOB.
+=end
+    def set(model, parent_path, value)
+      write(model, path(parent_path), value)
+      value
+    end
+
+=begin rdoc
+Raw binary property values are always valid if they are not nil
+=end
+    def valid?(val)
+      val != nil
+    end
   end
 
 =begin rdoc

data/lib/git-ds/repo.rb

@@ -261,8 +261,9 @@ Returns SHA of commit.
 =end
     def stage_and_commit(msg, actor=nil, &block)
       stage(&block)
-      self.staging.commit(msg, actor)
+      sha = self.staging.commit(msg, actor)
       unstage
+      sha
     end
 
 # ----------------------------------------------------------------------
@@ -347,7 +348,7 @@ the staging index.
 # ----------------------------------------------------------------------
 =begin rdoc
 The Tree object for the given treeish reference 
-  +treeish+ is the reference (default 'master')
+  +treeish+ is the reference (default Repo#current_branch)
   +paths+ is an optional Array of directory paths to restrict the tree (default [])
 
 Uses staging index if present and provides wrapper for nil treeish.
@@ -363,7 +364,7 @@ Uses staging index if present and provides wrapper for nil treeish.
           @staging_index.sync
           super(@staging_index.current_tree.id, paths)
         else
-          treeish = 'master' if not treeish
+          treeish = @current_branch if not treeish
           super
         end
       rescue Grit::GitRuby::Repository::NoSuchPath
@@ -419,7 +420,7 @@ tree_contents.
     def list(path=nil)
       sha = path_to_sha(path)
       # ensure correct operation even if path doesn't exist in repo
-      t = sha ? tree(sha) : tree('master', (path ? [path] : []))
+      t = sha ? tree(sha) : tree(@current_branch, (path ? [path] : []))
       t ? tree_contents( t ) : {}
     end
 
@@ -452,12 +453,12 @@ Returns the raw (git cat-file) representation of a tree.
 Fetch an object from the repo based on its path.
 
 If a staging index exists, its tree will be used; otherwise, the tree
-'master' will be used.
+Repo#current_branch will be used.
 
 The object returned will be a Grit::Blob, a Grit::Tree, or nil.
 =end
     def path_to_object(path)
-      treeish = (@staging_index ? staging.sha : 'master')
+      treeish = (@staging_index ? staging.sha : @current_branch)
       tree = self.tree(treeish, [path])
       return tree.blobs.first if tree && (not tree.blobs.empty?)
       return tree.trees.first if tree && (not tree.trees.empty?)

data/tests/ut_repo.rb

@@ -173,6 +173,7 @@ class TC_GitRepoTest < Test::Unit::TestCase
 
     # switch to new branch and change data
     @repo.set_branch(new_branch)
+    assert_equal('v01', @repo.current_branch, 'V01 is not current branch')
     path, data = 'class c/instance a/prop b', '~~~~~~~~~~'
     @repo.stage_and_commit('test commit for merge') { |idx|
       idx.add( path, data )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ds
 version: !ruby/object:Gem::Version
-  version: 0.9.5.1
+  version: 0.9.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &19161300 !ruby/object:Gem::Requirement
+  requirement: &20831860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19161300
+  version_requirements: *20831860
 description: A hierarchical datastore based on Git.
 email: community@thoughtgang.org
 executables: []