rocking_chair 0.0.3 → 0.0.4

data/LICENSE.txt

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2010 Jonathan Weiss <jw@innerewut.de>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */

data/README.md

@@ -45,4 +45,15 @@ Caveats
 =============
 
 At the moment the performance is not as good as it could be as there is a lot of serialization to and from JSON going on.
-This will be improved by storing not only the JSON tree but also the Ruby representation of the stored objects.
+This will be improved by storing not only the JSON tree but also the Ruby representation of the stored objects.
+
+License
+=============
+
+RockingChair is licensed under the OpenBSD / two-clause BSD license, modeled after the ISC license. See LICENSE.txt
+
+About
+=============
+
+RockingChair was written by [Jonathan Weiss](http://twitter.com/jweiss) to make [Mathias Meyer](http://twitter.com/roidrage) happy.
+

data/lib/rocking_chair/couch_rest_http_adapter.rb

@@ -2,10 +2,10 @@ module RockingChair
   module CouchRestHttpAdapter
     URL_PARAMETER = /[a-zA-Z0-9\-\_\%]+/
     
-    @_RockingChair_debug = true
+    @_rocking_chair_debug = true
     
     def get(uri, headers={})
-      puts "GET: #{uri.inspect}: #{headers.inspect}" if @_RockingChair_debug
+      puts "GET: #{uri.inspect}: #{headers.inspect}" if @_rocking_chair_debug
       url, parameters = RockingChair::Server.normalize_url(uri)
       if url == ''
         RockingChair::Server.info
@@ -29,7 +29,7 @@ module RockingChair
     end
   
     def post(uri, payload, headers={})
-      puts "POST: #{uri.inspect}: #{payload.inspect} #{headers.inspect}" if @_RockingChair_debug
+      puts "POST: #{uri.inspect}: #{payload.inspect} #{headers.inspect}" if @_rocking_chair_debug
       url, parameters = RockingChair::Server.normalize_url(uri)
       if url.match(/\A(#{URL_PARAMETER})\/?\Z/)
         RockingChair::Server.store($1, nil, payload, parameters)
@@ -41,7 +41,7 @@ module RockingChair
     end
   
     def put(uri, payload, headers={})
-      puts "PUT: #{uri.inspect}: #{payload.inspect} #{headers.inspect}" if @_RockingChair_debug
+      puts "PUT: #{uri.inspect}: #{payload.inspect} #{headers.inspect}" if @_rocking_chair_debug
       url, parameters = RockingChair::Server.normalize_url(uri)
       if url.match(/\A(#{URL_PARAMETER})\Z/)
         RockingChair::Server.create_db(url)
@@ -55,19 +55,21 @@ module RockingChair
     end
   
     def delete(uri, headers={})
-      puts "DELETE: #{uri.inspect}: #{headers.inspect}" if @_RockingChair_debug
+      puts "DELETE: #{uri.inspect}: #{headers.inspect}" if @_rocking_chair_debug
       url, parameters = RockingChair::Server.normalize_url(uri)
       if url.match(/\A(#{URL_PARAMETER})\Z/)
         RockingChair::Server.delete_db(url)
       elsif url.match(/\A(#{URL_PARAMETER})\/(#{URL_PARAMETER})\Z/)
         RockingChair::Server.delete($1, $2, parameters)
+      elsif url.match(/\A(#{URL_PARAMETER})\/_design\/(#{URL_PARAMETER})\Z/)
+        RockingChair::Server.delete($1, "_design/#{$2}", parameters)
       else
         raise "DELETE: Unknown url: #{uri.inspect}: #{headers.inspect}"
       end
     end
   
     def copy(uri, headers)
-      puts "COPY: #{uri.inspect}: #{headers.inspect}" if @_RockingChair_debug
+      puts "COPY: #{uri.inspect}: #{headers.inspect}" if @_rocking_chair_debug
       url, parameters = RockingChair::Server.normalize_url(uri)
       if url.match(/\A(#{URL_PARAMETER})\/(#{URL_PARAMETER})\Z/)
         RockingChair::Server.copy($1, $2, headers.merge(parameters))

data/lib/rocking_chair/view.rb

@@ -41,6 +41,7 @@ module RockingChair
       RockingChair::Helper.jsonfy_options(@options, 'key', 'startkey', 'endkey', 'startkey_docid', 'endkey_docid')
       
       normalize_view_name
+      normalize_descending_options
     end
     
     def find
@@ -80,8 +81,12 @@ module RockingChair
     end
     
     def render_for_all
-      offset = filter_by_startkey
-      filter_by_endkey
+      #key_size_before_startkey_filter = keys.size
+      #filter_items_not_in_range('_id', options['startkey'], nil) if options['startkey']
+      #filter_items_not_in_range('_id', options['startkey'], options['endkey']) if options['endkey']
+      offset = 0 #key_size_before_startkey_filter - keys.size
+      #offset = filter_by_startkey
+      #filter_by_endkey
       filter_by_limit
       
       rows = keys.map do |key|
@@ -99,18 +104,21 @@ module RockingChair
   protected
   
     def find_all
+      filter_items_by_key('_id')
       sort_by_attribute('_id')
     end
   
     def find_all_by_class
       filter_items_without_correct_ruby_class
       filter_deleted_items if options['without_deleted'].to_s == 'true'
+      sort_by_attribute('_id')
     end
   
-    def find_belongs_to(belongs_to)      
+    def find_belongs_to(belongs_to)
       filter_items_by_key([foreign_key_id(belongs_to)])
       filter_items_without_correct_ruby_class
       filter_deleted_items if options['without_deleted'].to_s == 'true'
+      sort_by_attribute('_id')
     end
     
     def find_by_attribute(attribute_string)
@@ -143,7 +151,7 @@ module RockingChair
     def filter_items_by_key(attributes)
       if options['startkey']
         filter_items_by_range(attributes)
-      else
+      elsif options['key']
         filter_items_by_exact_key(attributes)
       end
     end
@@ -158,7 +166,6 @@ module RockingChair
     def filter_items_by_range(attributes)
       start_keys = options['startkey'].is_a?(Array) ? options['startkey'] : [options['startkey']]
       end_keys = options['endkey'].is_a?(Array) ? options['endkey'] : [options['endkey']]
-      
       attributes.each_with_index do |attribute, index|
         filter_items_not_in_range(attribute, start_keys[index], end_keys[index])
       end
@@ -234,40 +241,7 @@ module RockingChair
         end
       end
     end
-    
-    def filter_by_startkey
-      offset = 0
-      if options['startkey']
-        startkey_found = false
-        @keys = keys.map do |key|
-          if startkey_found || key == options['startkey']
-            startkey_found = true
-            key
-          else
-            offset += 1
-            nil
-          end
-        end.compact
-      end
-      return offset
-    end
-    
-    def filter_by_endkey
-      if options['endkey']
-        endkey_found = false
-        @keys = keys.map do |key|
-          if key == options['endkey']
-            endkey_found = true
-            key
-          elsif endkey_found
-            nil
-          else
-            key
-          end
-        end.compact
-      end
-    end
-    
+        
     def foreign_key_id(name)
       name.underscore.gsub('/','__').gsub('::','__') + "_id"
     end
@@ -280,5 +254,11 @@ module RockingChair
       description
     end
     
+    def normalize_descending_options
+      if options['descending'].to_s == 'true' && (options['startkey'] || options['endkey'])
+        options['startkey'], options['endkey'] = options['endkey'], options['startkey']
+      end
+    end
+    
   end
 end

data/test/couch_rest_test.rb

@@ -105,7 +105,7 @@ class CouchRestTest < Test::Unit::TestCase
           @db.save_doc({'_id' => "A", 'a' => 'b'})
           
           assert_equal({
-            "total_rows" => 3, "offset" => 1, "rows" => [
+            "total_rows" => 3, "offset" => 0, "rows" => [
               {"id" => "B", "key" => "B", "value" => {"rev" => "the-revision"}},
               {"id" => "C", "key" => "C", "value" => {"rev" => "the-revision"}}
             ]
@@ -119,11 +119,11 @@ class CouchRestTest < Test::Unit::TestCase
           @db.save_doc({'_id' => "D", 'a' => 'b'})
           
           assert_equal({
-            "total_rows" => 4, "offset" => 1, "rows" => [
+            "total_rows" => 4, "offset" => 0, "rows" => [
               {"id" => "C", "key" => "C", "value" => {"rev" => "the-revision", '_rev' => 'the-revision', '_id' => 'C', 'a' => 'b'}},
               {"id" => "B", "key" => "B", "value" => {"rev" => "the-revision", '_rev' => 'the-revision', '_id' => 'B', 'a' => 'b'}}
             ]
-          }, @db.documents(:startkey => 'C', :limit => 2, :include_docs => true, :descending => true))
+          }, @db.documents(:startkey => "C\u999", :endkey => "B", :limit => 2, :include_docs => true, :descending => true))
         end
       end
       

data/test/database_test.rb

@@ -233,7 +233,7 @@ class DatabaseTest < Test::Unit::TestCase
         @db["B"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 3, "offset" => 1, "rows" => [
+          "total_rows" => 3, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}},
             {"id" => "C", "key" => "C", "value" => {"rev" => "rev"}}
           ]
@@ -247,7 +247,7 @@ class DatabaseTest < Test::Unit::TestCase
         @db["B"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 3, "offset" => 1, "rows" => [
+          "total_rows" => 3, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}},
             {"id" => "C", "key" => "C", "value" => {"rev" => "rev"}}
           ]
@@ -262,7 +262,7 @@ class DatabaseTest < Test::Unit::TestCase
         @db["D"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 4, "offset" => 1, "rows" => [
+          "total_rows" => 4, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}}
           ]
         }.to_json, @db.all_documents('startkey' => 'B', 'limit' => '1'))
@@ -276,11 +276,11 @@ class DatabaseTest < Test::Unit::TestCase
         @db["D"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 4, "offset" => 2, "rows" => [
+          "total_rows" => 4, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}},
             {"id" => "A", "key" => "A", "value" => {"rev" => "rev"}}
           ]
-        }.to_json, @db.all_documents('startkey' => 'B', 'descending' => 'true'))
+        }.to_json, @db.all_documents('startkey' => "B\u999", 'endkey' => "A", 'descending' => 'true'))
       end
       
       should "combine start, limit, and descending" do
@@ -291,10 +291,10 @@ class DatabaseTest < Test::Unit::TestCase
         @db["D"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 4, "offset" => 2, "rows" => [
+          "total_rows" => 4, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}}
           ]
-        }.to_json, @db.all_documents('startkey' => 'B', 'descending' => 'true', 'limit' => '1'))
+        }.to_json, @db.all_documents('startkey' => "B\u999", 'endkey' => "B", 'descending' => 'true', 'limit' => '1'))
       end
       
       should "end by the given key" do
@@ -308,7 +308,7 @@ class DatabaseTest < Test::Unit::TestCase
             {"id" => "A", "key" => "A", "value" => {"rev" => "rev"}},
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}}
           ]
-        }.to_json, @db.all_documents('endkey' => 'B'))
+        }.to_json, @db.all_documents('endkey' => 'B', 'startkey' => 'A'))
       end
       
       should "combine start and end key" do
@@ -319,7 +319,7 @@ class DatabaseTest < Test::Unit::TestCase
         @db["D"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 4, "offset" => 1, "rows" => [
+          "total_rows" => 4, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev"}},
             {"id" => "C", "key" => "C", "value" => {"rev" => "rev"}}
           ]
@@ -334,7 +334,7 @@ class DatabaseTest < Test::Unit::TestCase
         @db["D"] = {"data" => "Z"}.to_json
         
         assert_equal({
-          "total_rows" => 4, "offset" => 1, "rows" => [
+          "total_rows" => 4, "offset" => 0, "rows" => [
             {"id" => "B", "key" => "B", "value" => {"rev" => "rev", '_rev' => 'rev', 'data' => 'Z', '_id' => 'B'}},
             {"id" => "C", "key" => "C", "value" => {"rev" => "rev", '_rev' => 'rev', 'data' => 'Z', '_id' => 'C'}}
           ]

data/test/simply_stored_test.rb

@@ -106,6 +106,24 @@ class SimplyStoredTest < Test::Unit::TestCase
           assert user.save
           assert_equal [user.id], @project.users.map(&:id)
         end
+        
+        should "support counting associated" do
+          assert_equal 0, @project.user_count
+          user = User.create(:firstname => 'Michael', :project => @project)
+          assert_equal 1, @project.user_count(:force_reload => true)
+        end
+        
+        should "support limiting" do
+          3.times{ User.create!(:firstname => 'Michael', :project => @project) }
+          assert_equal 3, @project.users.size
+          assert_equal 2, @project.users(:limit => 2).size
+        end
+        
+        should "support order" do
+          3.times{|i| User.create!(:firstname => "user #{i}", :project => @project) }
+          assert_not_equal @project.users(:order => :asc).map(&:id), @project.users(:order => :desc).map(&:id)
+          assert_equal @project.users(:order => :asc).reverse, @project.users(:order => :desc)
+        end
       end
       
       context "when querying the all_documents view" do
@@ -124,6 +142,12 @@ class SimplyStoredTest < Test::Unit::TestCase
           assert_equal ['Peter', 'Michael Mann', 'Hulk'].sort, User.all.map(&:firstname).sort
         end
         
+        should "support order" do
+          3.times{|i| User.create!(:firstname => "user #{i}") }
+          assert_not_equal User.all(:order => :asc).map(&:id), User.all(:order => :desc).map(&:id)
+          assert_equal User.all(:order => :asc).reverse, User.all(:order => :desc)
+        end
+        
         should "load first" do
           User.create(:firstname => 'Michael Mann', :project => @project)
           User.create(:firstname => 'Peter', :project => @project)
@@ -209,6 +233,16 @@ class SimplyStoredTest < Test::Unit::TestCase
       end
       
     end
+    
+    context "when deleting all design docs" do
+      should "reset all design docs" do
+        User.find_all_by_firstname('a')
+        db = "http://127.0.0.1:5984/#{CouchPotato::Config.database_name}"
+        assert_nothing_raised do
+          assert_equal 1, SimplyStored::Couch.delete_all_design_documents(db)
+        end
+      end
+    end
      
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rocking_chair
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jonathan Weiss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE.txt
 - README.md
 files: 
+- LICENSE.txt
 - README.md
 - lib/rocking_chair.rb
 - lib/rocking_chair/couch_rest_http_adapter.rb