stone 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 2008-04-17
+
+* Fixed number of bugs which prohibited result ordering in some cases
+
 == 0.1.1 2008-04-16
 
 * Added result ordering to Resource.all

data/lib/stone/resource.rb

@@ -193,21 +193,25 @@ module Stone
     #   A hash representing one or more Ruby expressions
     def all(conditions = nil)
       objs = []
+      if conditions && conditions[:order]
+        order = conditions[:order].to_a.flatten
+        conditions.delete(:order)
+        conditions = nil if conditions.empty?
+      end
       unless conditions
         @@store.resources[self.to_s.make_key].each do |o|
           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])}
+        begin
+          objs.sort! {|x,y| x.send(order[0]) <=> y.send(order[0])}
+        rescue
+        end
         objs.reverse! if order[1] == :desc
       end
       objs

data/lib/stone/version.rb

@@ -2,7 +2,7 @@ module Stone #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     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-16T10:16:10-07:00
+created_at: 2008-04-17T23:08:39-07:00
 email: nick@cladby.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 2
+favorite_number: 21
 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-16T10:16:10-07:00
+created_at: 2008-04-17T23:08:39-07:00
 email: heyo@something.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 9
+favorite_number: 26
 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-16T10:16:10-07:00
+created_at: 2008-04-17T23:08:39-07:00
 email: weyo@something.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 33
+favorite_number: 13
 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-16T10:16:10-07:00
+created_at: 2008-04-17T23:08:39-07:00
 email: nick@gmail.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 15
+favorite_number: 7
 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-16T10:16:10-07:00
+created_at: 2008-04-17T23:08:39-07:00
 email: chariot_guy@hotmail.com
 errors: !ruby/object:Validatable::Errors 
   errors: {}
 
-favorite_number: 24
+favorite_number: 7
 id: 5
 name: Ben Hurr
 times_validated_hash: 

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.1</a>
+      <a href="http://rubyforge.org/projects/stone" class="numbers">0.1.2</a>
     </div>
     <h1>&#x2192; &#8216;stone&#8217;</h1>
 
@@ -84,6 +84,12 @@ organized manner. Therefore, Stone was built to provide plug-and-play data persi
 any application or framework. It is fast, and it is easy&#8230; therefore it is good.</p>
 
 
+	<p>You can check out an application that uses Merb+Stone <a href="http://theprestigio.us">here.</a></p>
+
+
+	<p>The source for that blog is <a href="http://github.com/ndemonner/written_in_stone/tree/master">here.</a></p>
+
+
 	<h2 id="installing">Installing</h2>
 
 
@@ -385,12 +391,20 @@ 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, 16th April 2008<br>
+      <a href="http://theprestigio.us">Nick DeMonner</a>, 17th April 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
 
 <!-- insert site tracking codes here, like Google Urchin -->
-
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-2831521-3");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
 </body>
 </html>

data/website/index.txt

@@ -33,6 +33,10 @@ For small applications, a database can be overkill for storing your data in a co
 organized manner. Therefore, Stone was built to provide plug-and-play data persistence for 
 any application or framework. It is fast, and it is easy... therefore it is good.
 
+You can check out an application that uses Merb+Stone "here.":http://theprestigio.us
+
+The source for that blog is "here.":http://github.com/ndemonner/written_in_stone/tree/master
+
 h2(#installing). Installing
 
 <pre>sudo gem install stone</pre>

data/website/template.html.erb

@@ -37,12 +37,20 @@
     </div>
     <%= body %>
     <p class="coda">
-      Nick DeMonner, <%= modified.pretty %><br>
+      <a href="http://theprestigio.us">Nick DeMonner</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
 
 <!-- insert site tracking codes here, like Google Urchin -->
-
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-2831521-3");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stone
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nick DeMonner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-16 00:00:00 -07:00
+date: 2008-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency