gitmodel 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitmodel (0.0.2)
+    gitmodel (0.0.4)
       activemodel (>= 3.0.1)
       activesupport (>= 3.0.1)
       grit (>= 2.3.0)

data/README.md

@@ -48,6 +48,10 @@ Status
 _It is not yet production ready but I'm working on it. Please feel free to
 contribute tests and/or code to help!_
 
+I will attempt to follow [Semantic Versioning](http://semver.org/) so 1.0.0
+will be considered the first stable release, until then the API may change at
+any time.
+
 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.:

data/gitmodel.gemspec

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

data/lib/gitmodel/persistable.rb

@@ -255,9 +255,6 @@ module GitModel
             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
@@ -265,6 +262,10 @@ module GitModel
           else
             raise GitModel::InvalidParams("invalid order: '#{order}'")
           end
+          if limit
+
+            matching_ids = matching_ids[0, limit]
+          end
           results = matching_ids.map{|k| find(k)}
         end
 

data/spec/gitmodel/persistable_spec.rb

@@ -454,18 +454,30 @@ describe GitModel::Persistable do
       r.second.id.should == 'one'
     end
 
-    it 'can limit the number of results returned' do
+    it 'can limit the number of results returned with ascending order' 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 = TestEntity.find_all(:a => 1, :order => :asc, :limit => 2)
       r.size.should == 2
       r.first.id.should == 'one'
       r.second.id.should == 'three'
     end
 
+    it 'can limit the number of results returned with descending order' 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, :order => :desc, :limit => 2)
+      r.size.should == 2
+      r.first.id.should == 'two'
+      r.second.id.should == 'three'
+    end
+
   end
 
   describe '.exists?' do

metadata

@@ -2,7 +2,7 @@
 name: gitmodel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Paul Dowman