gitmodel 0.0.6 → 0.0.7

data/.gitignore

@@ -1,8 +1,9 @@
 *.gem
+*.swp
 .DS_Store
 .bundle
 .gitmodel-data
+.rvmrc
 coverage
 pkg
 rdoc
-*.swp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitmodel (0.0.5)
+    gitmodel (0.0.7)
       activemodel (>= 3.0.1)
       activesupport (>= 3.0.1)
       grit (>= 2.3.0)
@@ -12,32 +12,34 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    ZenTest (4.6.2)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    i18n (0.5.0)
-    lockfile (1.4.3)
+    i18n (0.6.0)
+    lockfile (2.1.0)
     memcache-client (1.8.5)
-    mime-types (1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    yajl-ruby (0.8.2)
+    rspec-mocks (2.7.0)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -56,7 +56,9 @@ See the "To do" section below for details, but the main thing that needs
 finishing is support for querying. Right now you can find an instance by it's
 id, but there is incomplete support (90% complete) for querying, e.g.:
 
-    Post.find(:category => 'ruby', :date => lambda{|d| d > 1.month.ago} :order_by => :date, :order => :asc, :limit => 5)
+```ruby
+Post.find(:category => 'ruby', :date => lambda{|d| d > 1.month.ago} :order_by => :date, :order => :asc, :limit => 5)
+```
 
 This includes support for indexing all attributes so that queries don't need to
 load every object.
@@ -73,44 +75,46 @@ It's available as a [RubyGem](https://rubygems.org/gems/gitmodel):
 Usage
 -----
 
-    GitModel.db_root = '/tmp/gitmodel-data'
-    GitModel.create_db!
+```ruby
+GitModel.db_root = '/tmp/gitmodel-data'
+GitModel.create_db!
 
-    class Post
-      include GitModel::Persistable
+class Post
+  include GitModel::Persistable
 
-      attribute :title
-      attribute :body
-      attribute :categories, :default => []
-      attribute :allow_comments, :default => true
+  attribute :title
+  attribute :body
+  attribute :categories, :default => []
+  attribute :allow_comments, :default => true
 
-      blob :image
-    end
+  blob :image
+end
 
-    p1 = Post.new(:id => 'lessons-learned', :title => 'Lessons learned', :body => '...')
-    p1.image = some_binary_data
-    p1.save!
+p1 = Post.new(:id => 'lessons-learned', :title => 'Lessons learned', :body => '...')
+p1.image = some_binary_data
+p1.save!
 
-    p = Post.find('lessons-learned')
+p = Post.find('lessons-learned')
 
-    p2 = Post.new(:id => 'hotdog-eating-contest', :title => 'I won!')
-    p2.body = 'This weekend I won a hotdog eating contest!'
-    p2.image = some_binary_data
-    p2.blobs['hotdogs.jpg'] = some_binary_data
-    p2.blobs['the-aftermath.jpg'] = some_binary_data
-    p2.save!
+p2 = Post.new(:id => 'hotdog-eating-contest', :title => 'I won!')
+p2.body = 'This weekend I won a hotdog eating contest!'
+p2.image = some_binary_data
+p2.blobs['hotdogs.jpg'] = some_binary_data
+p2.blobs['the-aftermath.jpg'] = some_binary_data
+p2.save!
 
-    p3 = Post.create!(:id => 'running-with-scissors', :title => 'Running with scissors', :body => '...')
+p3 = Post.create!(:id => 'running-with-scissors', :title => 'Running with scissors', :body => '...')
 
-    p4 = Post.find('running-with-scissors')
+p4 = Post.find('running-with-scissors')
 
-    class Comment
-      include GitModel::Persistable
-      attribute :text
-    end
+class Comment
+  include GitModel::Persistable
+  attribute :text
+end
 
-    c1 = Comment.create!(:id => '2010-01-03-328', :text => '...')
-    c2 = Comment.create!(:id => '2010-05-29-742', :text => '...')
+c1 = Comment.create!(:id => '2010-01-03-328', :text => '...')
+c2 = Comment.create!(:id => '2010-05-29-742', :text => '...')
+```
 
 
 An example of a project that uses GitModel is [Balisong](https://github.com/pauldowman/balisong), a blogging app for coders (but it doesn't save objects to the data store. It's read-only so far, assuming that posts will be edited with a text editor).
@@ -156,8 +160,10 @@ Performance
 
 GitModel supports memcached for query results. This is off by default, but can be configured like this:
 
-    GitModel.memcache_servers(['server_1', 'server_2', ...])
-    GitModel.memcache_namespace('optional_namespace')
+```ruby
+GitModel.memcache_servers(['server_1', 'server_2', ...])
+GitModel.memcache_namespace('optional_namespace')
+```
 
 The namespace is optional, and usually not necessary because GitModel will prepend the last segment of GitModel.db_root anyway.
 
@@ -165,9 +171,9 @@ A Git SHA is also prepended to every key, so that outdated versions will not be
 
 There is still a lot of work to be done to make it faster. First, some analysis is required, but some guesses about things that would help are:
 
-    * Use [Rugged](https://github.com/libgit2/rugged) instead of Grit
-    * Remove the transaction lock (see transaction.rb line 19)
-    * Ability to iterate over result set without eager loading of all instances
+* Use [Rugged](https://github.com/libgit2/rugged) instead of Grit
+* Remove the transaction lock (see transaction.rb line 19)
+* Ability to iterate over result set without eager loading of all instances
 
 
 Contributing
@@ -175,13 +181,14 @@ Contributing
 
 Do you have an improvement to make? Please submit a pull request on GitHub or a
 patch, including a test written with RSpec.  To run all tests simply run
-`autospec`.
+`autotest`.
 
 The main author is [Paul Dowman](http://pauldowman.com/about) ([@pauldowman](http://twitter.com/pauldowman)).
 
 Thanks to everyone who has contributed so far:
 
 * [Alex Bartlow](https://github.com/alexbartlow)
+* [Daniel Russo](https://github.com/drusso)
 
 
 To do

data/gitmodel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitmodel'
-  s.version = '0.0.6'
+  s.version = '0.0.7'
   s.platform    = Gem::Platform::RUBY
 
   s.authors = ["Paul Dowman"]

data/lib/gitmodel/index.rb

@@ -22,9 +22,7 @@ module GitModel
       unless @indexes # this is just so that we can stub self.load in tests
         nil
       else
-        ret = @indexes[attr.to_s] 
-        raise GitModel::AttributeNotIndexed.new(attr.to_s) unless ret
-        ret
+        @indexes[attr.to_s] || {}
       end
     end
 

data/lib/gitmodel/persistable.rb

@@ -54,6 +54,23 @@ module GitModel
       @id = string
     end
 
+    # Get the location of the record relative to the repository's root.
+    #
+    # It is determined by appending the name of the directory containing
+    # the record with the record's +id+.
+    def path
+      @path ||= File.join(self.class.db_subdir, self.id)
+    end
+
+    # Get the branch that the record was last loaded from or was last
+    # saved on.
+    #
+    # The branch specified in the +GitModel+ config is used by default.
+    # Typically, the branch is 'master'.
+    def branch
+      @branch ||= GitModel.default_branch
+    end
+
     def attributes
       @attributes
     end
@@ -115,6 +132,12 @@ module GitModel
           end
         end
 
+        if result
+          @path = dir
+          @branch = transaction.branch
+          @new_record = false
+        end
+
         result
       end
     end
@@ -124,6 +147,15 @@ module GitModel
       save(options) || raise(GitModel::RecordNotSaved)
     end
 
+    # Reloads a record and returns the model instance.
+    #
+    # The record is reloaded from the branch that the record
+    # was last loaded from or last saved to.
+    def reload
+      load(path, branch)
+      self
+    end
+
     def delete(options = {})
       freeze
       self.class.delete(id, options)
@@ -142,6 +174,9 @@ module GitModel
         # todo find a better way to ensure path is safe
         dir.gsub!(/\.\./, '')
 
+        @path = dir
+        @branch = branch
+
         raise GitModel::RecordNotFound if GitModel.current_tree(branch).nil?
 
         self.id = File.basename(dir)

data/spec/gitmodel/persistable_spec.rb

@@ -118,6 +118,34 @@ describe GitModel::Persistable do
     end
   end
 
+  describe'#reload' do
+
+    it 'reloads persisted attributes' do
+      o = TestEntity.new(:id => 'foo')
+      o.attributes['A'] = 'A'
+      o.save
+      o.attributes['B'] = 'B'
+
+      o.attributes['A'].should == 'A'
+      o.attributes['B'].should == 'B'
+      o.reload
+      o.attributes['A'].should == 'A'
+      o.attributes['B'].should == nil
+    end
+
+    it 'returns the reloaded instance' do
+      o = TestEntity.create(:id => 'foo')
+      p = o.reload
+      o.should == p
+    end
+
+    it 'raises an exception if the document is not found' do
+      lambda { TestEntity.new.reload }.should raise_error
+      lambda { TestEntity.new(:id => "foo").reload }.should raise_error
+    end
+
+  end
+
   describe '.create' do
     
     it 'creates a new instance with the given parameters and calls #save on it' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-12-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70250239614100 !ruby/object:Gem::Requirement
+  requirement: &70229033519260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70250239614100
+  version_requirements: *70229033519260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70250239613620 !ruby/object:Gem::Requirement
+  requirement: &70229033512340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70250239613620
+  version_requirements: *70229033512340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70250239639760 !ruby/object:Gem::Requirement
+  requirement: &70229033511660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250239639760
+  version_requirements: *70229033511660
 - !ruby/object:Gem::Dependency
   name: lockfile
-  requirement: &70250239639300 !ruby/object:Gem::Requirement
+  requirement: &70229033510920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70250239639300
+  version_requirements: *70229033510920
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &70250239638840 !ruby/object:Gem::Requirement
+  requirement: &70229033510380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70250239638840
+  version_requirements: *70229033510380
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70250239638380 !ruby/object:Gem::Requirement
+  requirement: &70229033509920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250239638380
+  version_requirements: *70229033509920
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70250239637920 !ruby/object:Gem::Requirement
+  requirement: &70229033509460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 4.4.0
   type: :development
   prerelease: false
-  version_requirements: *70250239637920
+  version_requirements: *70229033509460
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70250239637460 !ruby/object:Gem::Requirement
+  requirement: &70229033508980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 4.4.1
   type: :development
   prerelease: false
-  version_requirements: *70250239637460
+  version_requirements: *70229033508980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250239637000 !ruby/object:Gem::Requirement
+  requirement: &70229033508520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *70250239637000
+  version_requirements: *70229033508520
 description: GitModel persists Ruby objects using Git as a data storage engine. It's
   an ActiveModel implementation so it works stand-alone or in Rails 3 as a drop-in
   replacement for ActiveRecord or DataMapper.  Because the database is a Git repository
@@ -123,7 +123,6 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -161,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An ActiveModel-compliant persistence framework for Ruby that uses Git for

data/.rvmrc

@@ -1,3 +0,0 @@
-rvm use ruby-1.9.2@gitmodel
-echo "starting memcached..."
-memcached &