stone 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.1 2008-04-16
+
+* Added result ordering to Resource.all
+
 == 0.1.0 2008-04-15
 
 * Initial release

data/config/hoe.rb

@@ -58,7 +58,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['english', '>= 0.2.0'], ['validatable', '>= 1.6.7'], ['facets', '>= 2.4.1'], ['fastercsv', '>= 1.2.3']]
+  p.extra_deps = [['english', '>= 0.2.0'], ['validatable', '>= 1.6.7'], ['facets', '>= 2.4.1']]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/stone/resource.rb

@@ -198,8 +198,18 @@ module Stone
           objs << o[1]
         end
       else
+        if conditions[:order]
+          order = conditions[:order].to_a.flatten
+          conditions.delete(:order)
+        end
         objs = find(conditions, self.to_s.make_key)
       end
+      if order
+        raise "Order should be passed with :asc or :desc, got #{order[1].inspect}" \
+          unless [:asc,:desc].include? order[1]
+        objs.sort! {|x,y| x.send(order[0]) <=> y.send(order[0])}
+        objs.reverse! if order[1] == :desc
+      end
       objs
     end
     

data/lib/stone/version.rb

@@ -2,7 +2,7 @@ module Stone #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/sandbox_for_specs/datastore/authors/1.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:Author 
-created_at: 2008-04-14T22:09:02-07:00
+created_at: 2008-04-16T10:16:10-07:00
 email: nick@cladby.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 27
+favorite_number: 2
 id: 1
 name: Nick DeMonner
 times_validated_hash: 

data/sandbox_for_specs/datastore/authors/2.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:Author 
-created_at: 2008-04-14T22:09:02-07:00
+created_at: 2008-04-16T10:16:10-07:00
 email: heyo@something.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 47
+favorite_number: 9
 id: 2
 name: Mike McMichaels
 times_validated_hash: 

data/sandbox_for_specs/datastore/authors/3.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:Author 
-created_at: 2008-04-14T22:09:02-07:00
+created_at: 2008-04-16T10:16:10-07:00
 email: weyo@something.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 30
+favorite_number: 33
 id: 3
 name: Mary Poppins
 times_validated_hash: 

data/sandbox_for_specs/datastore/authors/4.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:Author 
-created_at: 2008-04-14T22:09:02-07:00
+created_at: 2008-04-16T10:16:10-07:00
 email: nick@gmail.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 49
+favorite_number: 15
 id: 4
 name: Nick Hicklesby
 times_validated_hash: 

data/sandbox_for_specs/datastore/authors/5.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:Author 
-created_at: 2008-04-14T22:09:02-07:00
+created_at: 2008-04-16T10:16:10-07:00
 email: chariot_guy@hotmail.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 40
+favorite_number: 24
 id: 5
 name: Ben Hurr
 times_validated_hash: 

data/spec/resource_spec.rb

@@ -186,5 +186,14 @@ describe Stone::Resource do
     authors = Author.all(:name.matches => /o/, :created_at.lt => DateTime.now>>1)
     authors.size.should == 2
   end
+  
+  it "should allow for ordering of query results" do
+    authors = Author.all(:created_at.lt => DateTime.now>>1, :order => {:created_at => :desc})
+    authors.last.name.should == "Nick DeMonner"
+  end
+  
+  it "should only accept :asc or :desc for ordering" do
+    lambda {Author.all(:created_at.lt => DateTime.now>>1, :order => {:created_at => :cool})}.should raise_error
+  end
 
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Stone: Dead-Simple Data Persistence</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stone"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stone" class="numbers">0.1.0</a>
+      <a href="http://rubyforge.org/projects/stone" class="numbers">0.1.1</a>
     </div>
     <h1>&#x2192; &#8216;stone&#8217;</h1>
 
@@ -239,6 +239,10 @@ your data gets persisted to files within <code>myapp/datastore/</code>.</p>
   <span class="comment"># brings back all authors whose email contains &quot;gmail.com&quot;, and who </span>
   <span class="comment"># were created before today</span>
   <span class="constant">Author</span><span class="punct">.</span><span class="ident">all</span><span class="punct">(</span><span class="symbol">:email</span><span class="punct">.</span><span class="ident">includes</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">gmail.com</span><span class="punct">&quot;,</span> <span class="symbol">:created_at</span><span class="punct">.</span><span class="ident">lt</span> <span class="punct">=&gt;</span> <span class="constant">DateTime</span><span class="punct">.</span><span class="ident">now</span><span class="punct">)</span>
+  
+  <span class="comment"># brings back all Authors created before today, and orders them descending</span>
+  <span class="comment"># from most recent to least</span>
+  <span class="constant">Author</span><span class="punct">.</span><span class="ident">all</span><span class="punct">(</span><span class="symbol">:created_at</span><span class="punct">.</span><span class="ident">lt</span> <span class="punct">=&gt;</span> <span class="constant">DateTime</span><span class="punct">.</span><span class="ident">now</span><span class="punct">,</span> <span class="symbol">:order</span> <span class="punct">=&gt;</span> <span class="punct">{</span><span class="symbol">:created_at</span> <span class="punct">=&gt;</span> <span class="symbol">:desc</span><span class="punct">})</span>
 </pre></li>
 	</ul>
 
@@ -381,7 +385,7 @@ commit. =D</p>
 
 	<p>Comments are welcome. Join me in the <span class="caps">IRC</span> channel #stone on freenode.</p>
     <p class="coda">
-      Nick DeMonner, 14th April 2008<br>
+      Nick DeMonner, 16th April 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -148,6 +148,10 @@ h3(#gppd). Get, Post, Put, and Delete
   # brings back all authors whose email contains "gmail.com", and who 
   # were created before today
   Author.all(:email.includes => "gmail.com", :created_at.lt => DateTime.now)
+  
+  # brings back all Authors created before today, and orders them descending
+  # from most recent to least
+  Author.all(:created_at.lt => DateTime.now, :order => {:created_at => :desc})
 </pre>
 
 * Posting

data/website/stylesheets/screen.css

@@ -102,8 +102,9 @@ pre, code {
 .expr { color: #daefa3; }
 
 #version {
+  width:250px;
   float: right;
-  text-align: right;
+  text-align: center;
   font-family: sans-serif;
   font-weight: normal;
   background-color: #cb6b4e;
@@ -114,6 +115,7 @@ pre, code {
 }
 
 #version .numbers {
+  text-align:center;
   display: block;
   font-size: 4em;
   line-height: 0.8em;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stone
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nick DeMonner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 -07:00
+date: 2008-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,15 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.4.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
 description: Super-simple data persistence layer created for small applications.
 email: 
 - nick@cladby.com