gitmodel 0.0.2 → 0.0.3

data/.gitignore

@@ -5,3 +5,4 @@
 coverage
 pkg
 rdoc
+*.swp

data/Gemfile.lock

@@ -6,20 +6,19 @@ PATH
       activesupport (>= 3.0.1)
       grit (>= 2.3.0)
       lockfile (>= 1.4.3)
+      yajl-ruby (>= 0.8.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.4)
+      i18n (~> 0.5.0)
+    activesupport (3.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.4)
-      sys-uname
     builder (2.1.2)
     diff-lcs (1.1.2)
     grit (2.4.1)
@@ -28,15 +27,15 @@ GEM
     i18n (0.5.0)
     lockfile (1.4.3)
     mime-types (1.16)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    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)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sys-uname (0.8.5)
+    rspec-mocks (2.6.0)
+    yajl-ruby (0.8.2)
 
 PLATFORMS
   ruby
@@ -44,6 +43,5 @@ PLATFORMS
 DEPENDENCIES
   ZenTest (>= 4.4.0)
   autotest (>= 4.4.1)
-  autotest-fsevent (>= 0.2.3)
   gitmodel!
   rspec (>= 2.0.1)

data/README.md

@@ -17,13 +17,6 @@ machines, manipulated with standard Git client tools, can be branched and
 merged, and of course keeps the history of all changes.
 
 
-Status
-------
-
-_It is nowhere near production ready but I'm working on it. Please feel free to
-contribute tests and/or code to help!_
-
-
 Why it's awesome
 ----------------
 
@@ -38,6 +31,7 @@ Why it's awesome
   * Experiment on production data using branches, for example to test a
     migration
 * Distributed (synced using standard Git push/pull)
+* All ActiveModel 
 * Transactions
 * Metadata for all database changes (Git commit messages, date & time, etc.)
 * In order to be easily human-editable, the database is simply files and
@@ -48,6 +42,22 @@ Why it's awesome
 * Clean and easy-to-use API
 
 
+Status
+------
+
+_It is not yet production ready but I'm working on it. Please feel free to
+contribute tests and/or code to help!_
+
+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)
+
+This includes support for indexing all attributes so that queries don't need to
+load every object.
+
+
 Installation
 ------------
 
@@ -77,6 +87,8 @@ Usage
     p1.image = some_binary_data
     p1.save!
 
+    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
@@ -96,6 +108,7 @@ Usage
     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).
 
 
@@ -116,42 +129,64 @@ For example, the database for the example above would have a directory
 structure that looks like this:
 
 * db-root 
-  * comments 
-    * 2010-01-03-328
-      * _attributes.json_
-    * 2010-05-29-742
-      * _attributes.json_
-  * posts 
-    * hotdog-eating-contest
-      * _attributes.json_
-      * _hotdogs.jpg_
-      * _image_
-      * _the-aftermath.jpg_
-    * lessons-learned
-      * _attributes.json_
-      * _image_
-    * running-with-scissors
-      * _attributes.json_
-
-Contributors
+    * comments 
+        * 2010-01-03-328
+            * _attributes.json_
+        * 2010-05-29-742
+            * _attributes.json_
+    * posts 
+        * hotdog-eating-contest
+            * _attributes.json_
+            * _hotdogs.jpg_
+            * _image_
+            * _the-aftermath.jpg_
+        * lessons-learned
+            * _attributes.json_
+            * _image_
+        * running-with-scissors
+            * _attributes.json_
+
+
+Contributing
 ------------
 
-* [Paul Dowman](http://pauldowman.com/about) ([@pauldowman](http://twitter.com/pauldowman))
+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`.
+
+The main author is [Paul Dowman](http://pauldowman.com/about) ([@pauldowman](http://twitter.com/pauldowman)).
 
+Thanks to everyone who has contributed so far:
 
-To Do
+* [Alex Bartlow](https://github.com/alexbartlow)
+
+
+To do
 -----
 
+* Finish Query support
+    * Update index (efficiently) when Persistable objects are saved
+    * Add Rake task to generate index
+    * Update README
 * Add validations and other feature examples to sample code in README
-* Querying
-  * Use AREL?
 * Finish some pending specs
-* Associations
 * API documentation
 * Rails integration
-  * rake tasks
-  * generators
+    * Generators
+    * Rake tasks
 * Performance
-  * Haven't optimized for performance yet. 
+    * Haven't optimized for performance yet. 
+    * 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
+* Persistable.find/find_all/etc could be based on staged files so that queries reflect uncommitted changes
+* Better query support
+    * Associations
+    * Use AREL?
+
+
+Bugs
+------------
 
+* Grit 2.4.1 has [an issue with non-ASCII characters](https://github.com/mojombo/grit/commit/696761d8047ffd038dc2828e6a1998e3f7c3b419)
 

data/gitmodel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitmodel'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
   s.platform    = Gem::Platform::RUBY
 
   s.authors = ["Paul Dowman"]
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 3.0.1'
   s.add_dependency 'grit', '>= 2.3.0'
   s.add_dependency 'lockfile', '>= 1.4.3'
+  s.add_dependency 'yajl-ruby', '>= 0.8.2'
 
   s.add_development_dependency 'ZenTest', '>= 4.4.0'
   s.add_development_dependency 'autotest', '>= 4.4.1'
-  s.add_development_dependency 'autotest-fsevent', '>= 0.2.3' if RUBY_PLATFORM.downcase.include?("darwin") # OS X only
   s.add_development_dependency 'rspec', '>= 2.0.1'
 
   s.files         = `git ls-files`.split("\n")

data/lib/gitmodel/errors.rb

@@ -8,8 +8,8 @@ module GitModel
   class RecordNotFound < GitModelError
   end
   
-  # Raised by GitModel::Persistable.save! and GitModel::Persistable.create! methods when record cannot be
-  # saved because record is invalid.
+  # Raised by GitModel::Persistable.save! and GitModel::Persistable.create!
+  # methods when record cannot be saved because record is invalid.
   class RecordNotSaved < GitModelError
   end
   
@@ -22,4 +22,12 @@ module GitModel
   class NullId < GitModelError
   end
 
+  # Raised by GitModel::Persistable.find_all when query conditions are given
+  # but there is no index generated
+  class IndexRequired < GitModelError
+  end
+
+  class AttributeNotIndexed < GitModelError
+  end
+
 end

data/lib/gitmodel/index.rb

@@ -0,0 +1,79 @@
+module GitModel
+  class Index
+    def initialize(model_class)
+      @model_class = model_class
+    end
+
+    def generate!
+      GitModel.logger.debug "Generating indexes for #{@model_class}"
+      # TODO it sucks to load every instance here, optimize later
+      @indexes = {}
+      @model_class.find_all.each do |o|
+        o.attributes.each do |attr, value|
+          @indexes[attr] ||= {}
+          @indexes[attr][value] ||= SortedSet.new
+          @indexes[attr][value] << o.id
+        end
+      end
+    end
+
+    def attr_index(attr)
+      self.load unless @indexes
+      return nil unless @indexes # this is just so that we can stub self.load in tests
+
+      ret = @indexes[attr.to_s] 
+      raise GitModel::AttributeNotIndexed.new(attr.to_s) unless ret
+      return ret
+    end
+
+    def filename
+      File.join(@model_class.db_subdir, '_indexes.json')
+    end
+
+    def generated?
+      (GitModel.current_tree / filename) ? true : false
+    end
+
+    def save(options = {})
+      GitModel.logger.debug "Saving indexes for #{@model_class}..."
+      transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
+      result = transaction.execute do |t|
+        # convert to array because JSON hash keys must be strings
+        data = []
+        @indexes.each do |attr,values|
+          values_and_ids = []
+          values.each do |value, ids|
+            values_and_ids << [value, ids.to_a]
+          end
+          data << [attr,values_and_ids]
+        end
+        data = Yajl::Encoder.encode(data, nil, :pretty => true)
+        t.index.add(filename, data)
+      end
+    end
+
+    def load
+      unless generated?
+        GitModel.logger.debug "No index generated for #{@model_class}, not loading."
+        return
+      end
+
+      GitModel.logger.debug "Loading indexes for #{@model_class}..."
+      @indexes = {}
+      blob = GitModel.current_tree / filename
+      
+      data = Yajl::Parser.parse(blob.data)
+      data.each do |attr_and_values|
+        attr = attr_and_values[0]
+        values = {}
+        attr_and_values[1].each do |value_and_ids|
+          value = value_and_ids[0]
+          ids = SortedSet.new(value_and_ids[1])
+          values[value] = ids
+        end
+        @indexes[attr] = values
+      end
+    end
+
+  end
+end

data/lib/gitmodel/persistable.rb

@@ -13,6 +13,9 @@ module GitModel
 
         define_model_callbacks :initialize, :find, :touch, :only => :after
         define_model_callbacks :save, :create, :update, :destroy
+
+        cattr_accessor :index, true
+        self.index = GitModel::Index.new(self)
       end
 
       base.extend(ClassMethods)
@@ -84,31 +87,32 @@ module GitModel
     #   :commit_message
     # Returns false if validations failed, otherwise returns the SHA of the commit
     def save(options = {})
-      raise GitModel::NullId unless self.id
+      _run_save_callbacks do 
+        raise GitModel::NullId unless self.id
 
-      if new_record?
-        raise GitModel::RecordExists if self.class.exists?(self.id)
-      else
-        raise GitModel::RecordDoesntExist unless self.class.exists?(self.id)
-      end
+        if new_record?
+          raise GitModel::RecordExists if self.class.exists?(self.id)
+        else
+          raise GitModel::RecordDoesntExist unless self.class.exists?(self.id)
+        end
 
-      dir = File.join(self.class.db_subdir, self.id)
+        GitModel.logger.debug "Saving #{self.class.name} with id: #{id}"
 
-      transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
-      result = transaction.execute do |t|
-        # Write the attributes to the attributes file
-        # NOTE: using the redundant attributes.to_hash to work around a bug in
-        # active_support 3.0.4, remove when
-        # JSON.generate(HashWithIndifferentAccess.new) no longer fails.
-        t.index.add(File.join(dir, 'attributes.json'), JSON.pretty_generate(attributes.to_hash))
+        dir = File.join(self.class.db_subdir, self.id)
+
+        transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
+        result = transaction.execute do |t|
+          # Write the attributes to the attributes file
+          t.index.add(File.join(dir, 'attributes.json'), Yajl::Encoder.encode(attributes, nil, :pretty => true))
 
-        # Write the blob files
-        blobs.each do |name, data|
-          t.index.add(File.join(dir, name), data)
+          # Write the blob files
+          blobs.each do |name, data|
+            t.index.add(File.join(dir, name), data)
+          end
         end
-      end
 
-      return result
+        result
+      end
     end
 
     # Same as #save but raises an exception on error
@@ -139,11 +143,13 @@ module GitModel
         self.id = File.basename(dir)
         @new_record = false
         
+        GitModel.logger.debug "Loading #{self.class.name} with id: #{id}"
+
         # load the attributes
         object = GitModel.current_tree / File.join(dir, 'attributes.json')
         raise GitModel::RecordNotFound if object.nil?
 
-        self.attributes = JSON.parse(object.data, :max_nesting => false)
+        self.attributes = Yajl::Parser.parse(object.data)
 
         # load all other non-hidden files in the dir as blobs
         blobs = (GitModel.current_tree / dir).blobs.reject{|b| b.name[0] == '.' || b.name == 'attributes.json'}
@@ -184,25 +190,92 @@ module GitModel
       end
 
       def exists?(id)
+        GitModel.logger.debug "Checking existence of #{name} with id: #{id}"
         GitModel.repo.commits.any? && !(GitModel.current_tree / File.join(db_subdir, id, 'attributes.json')).nil?
       end
 
       def find_all(conditions = {})
+        # TODO Refactor this spaghetti
         GitModel.logger.debug "Finding all #{name.pluralize} with conditions: #{conditions.inspect}"
-        results = []
-        return results unless GitModel.current_tree
-        dirs = (GitModel.current_tree / db_subdir).trees
-        dirs.each do |dir|
-          if dir.blobs.any?
-            o = new
-            o.send :load, File.join(db_subdir, dir.name)
-            results << o
+        return [] unless GitModel.current_tree
+
+        order = conditions.delete(:order) || :asc
+        order_by = conditions.delete(:order_by) || :id
+        limit = conditions.delete(:limit)
+
+        matching_ids = []
+        if conditions.empty?  # load all objects
+          trees = (GitModel.current_tree / db_subdir).trees
+          trees.each do |t|
+            matching_ids << t.name if t.blobs.any?
           end
+        else # only load objects that match conditions
+          matching_ids_for_condition = {}
+          conditions.each do |k,v|
+            matching_ids_for_condition[k] = []
+            if k == :id # id isn't indexed
+              if v.is_a?(Proc)
+                trees = (GitModel.current_tree / db_subdir).trees
+                trees.each do |t|
+                  matching_ids_for_condition[k] << t.name if t.blobs.any? && v.call(t.name)
+                end
+              else
+                # an unlikely use case but supporting it for completeness
+                matching_ids_for_condition[k] << v if (GitModel.current_tree / db_subdir / v)
+              end
+            else
+              raise GitModel::IndexRequired unless index.generated?
+              attr_index = index.attr_index(k)
+              if v.is_a?(Proc)
+                attr_index.each do |value, ids|
+                  matching_ids_for_condition[k] += ids.to_a if v.call(value)
+                end
+              else
+                matching_ids_for_condition[k] += attr_index[v].to_a
+              end
+            end
+          end
+          matching_ids += matching_ids_for_condition.values.inject{|memo, obj| memo & obj}
+        end
+
+        results = nil
+        if order_by != :id
+          GitModel.logger.warn "Ordering by an attribute other than id requires loading all matching objects before applying limit, this will be slow" if limit
+          results = matching_ids.map{|k| find(k)}
+
+          if order == :asc
+            results = results.sort{|a,b| a.send(order_by) <=> b.send(order_by)}
+          elsif order == :desc
+            results = results.sort{|b,a| a.send(order_by) <=> b.send(order_by)}
+          else
+            raise GitModel::InvalidParams("invalid order: '#{order}'")
+          end
+
+          if limit
+            results = results[0, limit]
+          end
+        else
+          if limit
+            matching_ids = matching_ids[0, limit]
+          end
+          if order == :asc
+            matching_ids = matching_ids.sort{|a,b| a <=> b}
+          elsif order == :desc
+            matching_ids = matching_ids.sort{|b,a| a <=> b}
+          else
+            raise GitModel::InvalidParams("invalid order: '#{order}'")
+          end
+          results = matching_ids.map{|k| find(k)}
         end
 
         return results
       end
 
+      def all_values_for_attr(attr)
+        attr_index = index.attr_index(attr.to_s)
+        values = attr_index ? attr_index.keys : []
+      end
+
       def create(args)
         if args.is_a?(Array)
           args.map{|arg| create(arg)}
@@ -224,6 +297,7 @@ module GitModel
       end
 
       def delete(id, options = {})
+        GitModel.logger.debug "Deleting #{name} with id: #{id}"
         path = File.join(db_subdir, id)
         transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
         result = transaction.execute do |t|
@@ -232,12 +306,18 @@ module GitModel
       end
 
       def delete_all(options = {})
+        GitModel.logger.debug "Deleting all #{name.pluralize}"
         transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
         result = transaction.execute do |t|
           delete_tree(db_subdir, t.index, options)
         end
       end
 
+      def index!
+        index.generate!
+        index.save
+      end
+
 
       private
 

data/lib/gitmodel.rb

@@ -4,12 +4,13 @@ require 'bundler/setup'
 require 'active_model'
 require 'active_support/all' # TODO we don't really want all here, clean this up
 require 'grit'
-require 'json'
+require 'yajl'
 require 'lockfile'
 require 'pp'
 
 $:.unshift(File.dirname(__FILE__))
 require 'gitmodel/errors'
+require 'gitmodel/index'
 require 'gitmodel/persistable'
 require 'gitmodel/transaction'
 
@@ -73,4 +74,10 @@ module GitModel
     c ? c.tree : nil
   end
 
+  def self.index!
+    dirs = (GitModel.current_tree).trees
+    dirs.each do |dir|
+      dir.name.classify.constantize.index!
+    end
+  end
 end

data/spec/gitmodel/index_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe GitModel::Index do
+  before(:each) do
+    TestEntity.create!(:id => "foo", :attributes => {:x => 1, :y => 2})
+    TestEntity.create!(:id => "bar", :attributes => {:x => 1, :y => 3})
+    TestEntity.create!(:id => "baz", :attributes => {:x => 2, :y => 2})
+
+    @i = GitModel::Index.new(TestEntity)
+    @i.generate!
+  end
+
+  it "has a hash for each attribute of the model" do
+    @i.attr_index(:x).should be_a(Hash)
+  end
+
+  it "knows the id's of all instances with a given value for an attribute" do
+    @i.attr_index(:x)[1].should == SortedSet.new(["foo", "bar"])
+    @i.attr_index(:x)[2].should == SortedSet.new(["baz"])
+    @i.attr_index(:y)[2].should == SortedSet.new(["foo", "baz"])
+  end
+
+  it "can regenerate itself" do
+    @i.attr_index(:x).clear
+    @i.attr_index(:x).should be_empty
+    @i.generate!
+    @i.attr_index(:x).should == {1 => SortedSet.new(["foo", "bar"]), 2 => SortedSet.new(["baz"])}
+  end
+
+  it "knows it's filename" do
+    @i.filename.should == "test_entities/_indexes.json"
+  end
+
+  it "can save itself to a JSON file" do
+    @i.save
+    json = <<-END.strip
+[
+  [
+    "x",
+    [
+      [
+        1,
+        [
+          "bar",
+          "foo"
+        ]
+      ],
+      [
+        2,
+        [
+          "baz"
+        ]
+      ]
+    ]
+  ],
+  [
+    "y",
+    [
+      [
+        3,
+        [
+          "bar"
+        ]
+      ],
+      [
+        2,
+        [
+          "baz",
+          "foo"
+        ]
+      ]
+    ]
+  ]
+]
+END
+    repo = Grit::Repo.new(GitModel.db_root)
+    # We should be able to use just repo.commits.first here but
+    # this is a workaround for this bug: 
+    # http://github.com/mojombo/grit/issues/issue/38
+    (repo.commits("master^..master").first.tree / @i.filename).data.should == json
+  end
+
+  it "can save and load itself from a file" do
+    @i.save
+    @i.attr_index(:x).clear
+    @i.load
+    @i.attr_index(:x).should == {1 => SortedSet.new(["foo", "bar"]), 2 => SortedSet.new(["baz"])}
+  end
+
+  describe "#attr_index" do
+    it "loads itself" do
+      i = GitModel::Index.new(TestEntity)
+      i.should_receive(:load)
+      i.attr_index(:foo)
+    end
+
+    describe "with an index file already created" do
+      before(:each) { @i.save }
+
+      it "loads itself from file" do
+        i = GitModel::Index.new(TestEntity)
+        i.should_not_receive(:generate!)
+        i.attr_index(:x)
+      end
+    end
+  end
+
+end

data/spec/gitmodel/persistable_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-class TestEntity
-  include GitModel::Persistable
-end
-
 class LintTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
  
@@ -51,7 +47,7 @@ describe GitModel::Persistable do
 
       repo = Grit::Repo.new(GitModel.db_root)
       attrs = (repo.commits.first.tree / File.join(TestEntity.db_subdir, id, 'attributes.json')).data
-      r = JSON.parse(attrs)
+      r = Yajl::Parser.parse(attrs)
       r.size.should == 2
       r['one'].should == 1
       r['two'].should == 2
@@ -83,6 +79,10 @@ describe GitModel::Persistable do
     it 'returns the SHA of the commit if the save was successful'
 
     it 'deletes blobs that have been removed'
+
+    it 'updates the index' do
+      # TODO
+    end
   end
 
   describe '#save!' do
@@ -223,6 +223,7 @@ describe GitModel::Persistable do
       TestEntity.create!(:id => 'ape')
 
       TestEntity.delete_all
+      TestEntity.index!
       TestEntity.find_all.should be_empty
     end
 
@@ -246,7 +247,7 @@ describe GitModel::Persistable do
 
   end
 
-  describe '#find' do
+  describe '.find' do
 
     #it 'can load an object from an empty subdir of db_root' do
     #  id = "foo"
@@ -316,25 +317,158 @@ describe GitModel::Persistable do
 
   end
 
-  describe '#find_all' do
+  describe '.find_all' do
+    describe 'with no parameters' do
+      it 'returns an array of all objects' do
+        TestEntity.create!(:id => 'one')
+        TestEntity.create!(:id => 'two')
+        TestEntity.create!(:id => 'three')
 
-    it 'returns an array of all objects' do
-      TestEntity.create!(:id => 'one')
-      TestEntity.create!(:id => 'two')
-      TestEntity.create!(:id => 'three')
+        r = TestEntity.find_all
+        r.size.should == 3
+      end
+
+      it 'returns an empty array if there are no objects of the current type' do
+        r = TestEntity.find_all
+        r.should == []
+      end
+    end
+
+    describe 'with conditions but no index' do
+      it 'raises an exception' do
+        TestEntity.create!(:id => 'one')
+        lambda {TestEntity.find_all(:a => "b")}.should raise_error(GitModel::IndexRequired)
+      end
+    end
+
+    describe 'with one condition' do
+      describe 'with a literal value' do
+        it 'returns an array of all objects that match' do
+          TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 1})
+          TestEntity.create!(:id => 'two', :attributes => {:a => 2, :b => 2})
+          TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 3})
+          TestEntity.index!
+
+          r = TestEntity.find_all(:a => 1)
+          r.size.should == 2
+          r.first.id.should == 'one'
+          r.second.id.should == 'three'
+        end
+      end
+
+      describe 'with a lambda as the value' do
+        it 'returns an array of all objects that match' do
+          TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 1})
+          TestEntity.create!(:id => 'two', :attributes => {:a => 2, :b => 2})
+          TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 3})
+          TestEntity.index!
+
+          r = TestEntity.find_all(:b => lambda{|b| b > 1}, :order => :asc)
+          r.size.should == 2
+          r.first.id.should == 'three'
+          r.second.id.should == 'two'
+        end
+      end
+    end
+
+    describe 'with multiple conditions' do
+      describe 'with a literal value' do
+        it 'returns an array of all objects that match both (i.e. AND)' do
+          TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 2})
+          TestEntity.create!(:id => 'two', :attributes => {:a => 1, :b => 2})
+          TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 1})
+          TestEntity.index!
+
+          r = TestEntity.find_all(:a => 1, :b => 2, :order => :asc)
+          r.size.should == 2
+          r.first.id.should == 'one'
+          r.second.id.should == 'two'
+        end
+      end
+
+      describe 'with a lambda as the value' do
+        it 'returns an array of all objects that match both (i.e. AND)'  do
+          TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 3})
+          TestEntity.create!(:id => 'two', :attributes => {:a => 2, :b => 2})
+          TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 1})
+          TestEntity.create!(:id => 'four', :attributes => {:a => 3, :b => 3})
+          TestEntity.index!
+
+          r = TestEntity.find_all(:a => lambda{|a| a > 1}, :b => lambda{|b| b > 2}, :order => :asc)
+          r.size.should == 1
+          r.first.id.should == 'four'
+        end
+
+      end
+    end
+
+    describe 'with the id attribute in the conditions' do
+      describe 'with a literal value' do
+        it 'returns an array that includes the object with that id' do
+          TestEntity.create!(:id => 'one')
+          TestEntity.create!(:id => 'two')
+          TestEntity.create!(:id => 'three')
+
+          r = TestEntity.find_all(:id => 'one')
+          r.size.should == 1
+          r.first.id.should == 'one'
+        end
+      end
+
+      describe 'with a lambda as the value' do
+        it 'returns an array that includes the object with that id' do
+          TestEntity.create!(:id => 'one')
+          TestEntity.create!(:id => 'two')
+          TestEntity.create!(:id => 'three')
+
+          r = TestEntity.find_all(:id => lambda{|id| id =~ /o/})
+          r.size.should == 2
+          r.first.id.should == 'one'
+          r.second.id.should == 'two'
+        end
+
+      end
+    end
+
+    it 'can return results in ascending order' do
+      TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 1})
+      TestEntity.create!(:id => 'two', :attributes => {:a => 2, :b => 2})
+      TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 3})
+      TestEntity.index!
+
+      r = TestEntity.find_all(:a => 1, :order => :asc)
+      r.size.should == 2
+      r.first.id.should == 'one'
+      r.second.id.should == 'three'
+    end
+
+    it 'can return results in descending order' do
+      TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 1})
+      TestEntity.create!(:id => 'two', :attributes => {:a => 2, :b => 2})
+      TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 3})
+      TestEntity.index!
 
-      r = TestEntity.find_all
-      r.size.should == 3
+      r = TestEntity.find_all(:a => 1, :order => :desc)
+      r.size.should == 2
+      r.first.id.should == 'three'
+      r.second.id.should == 'one'
     end
 
-    it 'returns an empty array if there are no objects of the current type' do
-      r = TestEntity.find_all
-      r.should == []
+    it 'can limit the number of results returned' do
+      TestEntity.create!(:id => 'one', :attributes => {:a => 1, :b => 1})
+      TestEntity.create!(:id => 'two', :attributes => {:a => 1, :b => 2})
+      TestEntity.create!(:id => 'three', :attributes => {:a => 1, :b => 3})
+      TestEntity.index!
+
+      r = TestEntity.find_all(:a => 1, :limit => 2)
+      r.size.should == 2
+      r.first.id.should == 'one'
+      r.second.id.should == 'three'
     end
 
   end
 
-  describe '#exists?' do
+  describe '.exists?' do
 
     it 'returns true if the record exists' do
       TestEntity.create!(:id => 'one')
@@ -347,6 +481,23 @@ describe GitModel::Persistable do
 
   end
 
+  describe ".index!" do
+    it "generates and saves the index" do
+      TestEntity.index.should_receive(:generate!)
+      TestEntity.index.should_receive(:save)
+      TestEntity.index!
+    end
+  end
+
+  describe '.all_values_for_attr' do
+    it 'returns a list of all values that exist for a given attribute' do
+      o = TestEntity.create!(:id => 'first', :attributes => {"a" => 1, "b" => 2})
+      o = TestEntity.create!(:id => 'second', :attributes => {"a" => 3, "b" => 4})
+      TestEntity.index!
+      TestEntity.all_values_for_attr("a").should == [1, 3]
+    end
+  end
+
   describe '#attributes' do
     it 'accepts symbols or strings interchangeably as strings' do
       o = TestEntity.new(:id => 'lol', :attributes => {"one" => 1, :two => 2})

data/spec/gitmodel_spec.rb

@@ -2,8 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe GitModel do
 
-  describe "#last_commit" do
-
+  describe ".last_commit" do
     it "returns nil if there are no commits" do
       GitModel.last_commit.should == nil
     end
@@ -17,11 +16,9 @@ describe GitModel do
             
       GitModel.last_commit.to_s.should == sha
     end
-
   end
 
-  describe "#current_tree" do
-
+  describe ".current_tree" do
     it "returns nil if there are no commits" do
       GitModel.current_tree.should == nil
     end
@@ -32,7 +29,19 @@ describe GitModel do
       GitModel.should_receive(:last_commit).with('master').and_return(last_commit)
       GitModel.current_tree('master')
     end
+  end
 
+  describe ".index" do
+    before(:each) do
+      TestEntity.create!(:id => "foo")
+      TestEntity2.create!(:id => "bar")
+    end
+
+    it "calls index! on each Persistable model class" do
+      TestEntity.should_receive(:index!)
+      TestEntity2.should_receive(:index!)
+      GitModel.index!
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -6,7 +6,15 @@ require 'gitmodel'
 
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
 
-Rspec.configure do |c|
+RSpec.configure do |c|
   c.mock_with :rspec
 end
 
+class TestEntity
+  include GitModel::Persistable
+end
+class TestEntity2
+  include GitModel::Persistable
+end
+
+#GitModel.logger.level = ::Logger::DEBUG

metadata

@@ -2,7 +2,7 @@
 name: gitmodel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Paul Dowman
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 -05:00
-default_executable: 
+date: 2011-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -58,36 +57,36 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ZenTest
+  name: yajl-ruby
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.4.0
-  type: :development
+        version: 0.8.2
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: autotest
+  name: ZenTest
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.4.1
+        version: 4.4.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: autotest-fsevent
+  name: autotest
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: 4.4.1
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -122,14 +121,15 @@ files:
 - gitmodel.gemspec
 - lib/gitmodel.rb
 - lib/gitmodel/errors.rb
+- lib/gitmodel/index.rb
 - lib/gitmodel/persistable.rb
 - lib/gitmodel/transaction.rb
+- spec/gitmodel/index_spec.rb
 - spec/gitmodel/persistable_spec.rb
 - spec/gitmodel/transaction_spec.rb
 - spec/gitmodel_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup.rb
-has_rdoc: true
 homepage: http://github.com/pauldowman/gitmodel
 licenses: []
 
@@ -153,11 +153,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An ActiveModel-compliant persistence framework for Ruby that uses Git for versioning and remote syncing.
 test_files: 
+- spec/gitmodel/index_spec.rb
 - spec/gitmodel/persistable_spec.rb
 - spec/gitmodel/transaction_spec.rb
 - spec/gitmodel_spec.rb