langalex-couch_potato 0.1.1 → 0.2.0

data/spec/{dirty_attributes_spec.rb → unit/dirty_attributes_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 class Plate
   include CouchPotato::Persistence
@@ -7,24 +7,25 @@ class Plate
 end
 
 describe 'dirty attribute tracking' do
-  before(:all) do
-    CouchPotato::Persistence.Db!
+  before(:each) do
+    @couchrest_db = stub('database', :save_doc => {'id' => '1', 'rev' => '2'})
+    @db = CouchPotato::Database.new(@couchrest_db)
   end
   
   describe "save" do
     it "should not save when nothing dirty" do
-      plate = Plate.create! :food => 'sushi'
-      old_rev = plate._rev
-      plate.save
-      plate._rev.should == old_rev
+      plate = Plate.new :food => 'sushi'
+      @db.save_document!(plate)
+      @couchrest_db.should_not_receive(:save_doc)
+      @db.save_document(plate)
     end
     
     it "should save when there are dirty attributes" do
-      plate = Plate.create! :food => 'sushi'
-      old_rev = plate._rev
+      plate = Plate.new :food => 'sushi'
+      @db.save_document!(plate)
       plate.food = 'burger'
-      plate.save
-      plate._rev.should_not == old_rev
+      @couchrest_db.should_receive(:save_doc)
+      @db.save_document(plate)
     end
   end
   
@@ -50,13 +51,19 @@ describe 'dirty attribute tracking' do
       it "should return false if attribute not changed" do
         @plate.should_not be_food_changed
       end
+      
+      it "should return false if attribute forced not changed" do
+        @plate.food = 'burger'
+        @plate.food_not_changed
+        @plate.should_not be_food_changed
+      end
     end
   end
   
   describe "object loaded from database" do
     before(:each) do
-      @plate = Plate.create! :food => 'sushi'
-      @plate = Plate.get @plate._id
+      couchrest_db = stub('database', :get => {'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'})
+      @plate = CouchPotato::Database.new(couchrest_db).load_document '1'
     end
     
     describe "access old values" do
@@ -79,4 +86,15 @@ describe 'dirty attribute tracking' do
   end
   
   
+  describe "after save" do
+    it "should reset all attributes to not dirty" do
+      couchrest_db = stub('database', :get => {'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'}, :save_doc => {})
+      db = CouchPotato::Database.new(couchrest_db)
+      @plate = db.load_document '1'
+      @plate.food = 'burger'
+      db.save! @plate
+      @plate.should_not be_food_changed
+    end
+  end
+  
 end

data/spec/unit/string_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe String, 'camelize' do
+  it "should camelize a string" do
+    'my_string'.camelize.should == 'MyString'
+  end
+end
+
+describe String, 'underscore' do
+  it "should underscore a string" do
+    'MyString'.underscore.should == 'my_string'
+  end
+end

data/spec/unit/view_query_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe CouchPotato::Persistence::ViewQuery, 'query_view' do
+describe CouchPotato::View::ViewQuery, 'query_view' do
   it "should not pass a key if conditions are empty" do
     db = mock 'db'
     db.should_receive(:view).with(anything, {})
-    ::CouchPotato::Persistence.stub!(:Db).and_return(db)
-    CouchPotato::Persistence::ViewQuery.new('', '', '', '', {}).query_view!
+    CouchPotato::View::ViewQuery.new(db, '', '', '', '').query_view!
   end
 end

data/spec/update_spec.rb

@@ -2,38 +2,39 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "create" do
   before(:all) do
-    CouchPotato::Persistence.Db!
+    recreate_db
   end
   
   before(:each) do
     @comment = Comment.new :title => 'my_title'
-    @comment.save!
+    CouchPotato.database.save_document! @comment
   end
   
   it "should update the revision" do
     old_rev = @comment._rev
     @comment.title = 'xyz'
-    @comment.save!
+    CouchPotato.database.save_document! @comment
     @comment._rev.should_not == old_rev
     @comment._rev.should_not be_nil
   end
   
   it "should not update created at" do
     old_created_at = @comment.created_at
-    @comment.save!
+    @comment.title = 'xyz'
+    CouchPotato.database.save_document! @comment
     @comment.created_at.should == old_created_at
   end
   
   it "should update updated at" do
     old_updated_at = @comment.updated_at
     @comment.title = 'xyz'
-    @comment.save!
+    CouchPotato.database.save_document! @comment
     @comment.updated_at.should > old_updated_at
   end
   
   it "should update the attributes" do
     @comment.title = 'new title'
-    @comment.save!
-    CouchPotato::Persistence.Db.get("#{@comment.id}")['title'].should == 'new title'
+    CouchPotato.database.save_document! @comment
+    CouchPotato.couchrest_database.get("#{@comment.id}")['title'].should == 'new title'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: langalex-couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,71 +9,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 -08:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: validatable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jchris-couchrest
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.12
+    version: 
 description: Ruby persistence layer for CouchDB
 email: alex@upstream-berlin.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.md
 files: 
 - MIT-LICENSE.txt
-- README.textile
+- README.md
 - VERSION.yml
 - lib/core_ext
+- lib/core_ext/date.rb
 - lib/core_ext/object.rb
+- lib/core_ext/string.rb
 - lib/core_ext/time.rb
 - lib/couch_potato
-- lib/couch_potato/active_record
-- lib/couch_potato/active_record/compatibility.rb
-- lib/couch_potato/ordering.rb
+- lib/couch_potato/database.rb
 - lib/couch_potato/persistence
 - lib/couch_potato/persistence/belongs_to_property.rb
-- lib/couch_potato/persistence/bulk_save_queue.rb
 - lib/couch_potato/persistence/callbacks.rb
-- lib/couch_potato/persistence/collection.rb
-- lib/couch_potato/persistence/custom_view.rb
 - lib/couch_potato/persistence/dirty_attributes.rb
-- lib/couch_potato/persistence/external_collection.rb
-- lib/couch_potato/persistence/external_has_many_property.rb
-- lib/couch_potato/persistence/find.rb
-- lib/couch_potato/persistence/finder.rb
 - lib/couch_potato/persistence/inline_collection.rb
-- lib/couch_potato/persistence/inline_has_many_property.rb
 - lib/couch_potato/persistence/json.rb
+- lib/couch_potato/persistence/magic_timestamps.rb
 - lib/couch_potato/persistence/properties.rb
 - lib/couch_potato/persistence/simple_property.rb
-- lib/couch_potato/persistence/view_query.rb
 - lib/couch_potato/persistence.rb
-- lib/couch_potato/versioning.rb
+- lib/couch_potato/view
+- lib/couch_potato/view/base_view_spec.rb
+- lib/couch_potato/view/custom_view_spec.rb
+- lib/couch_potato/view/custom_views.rb
+- lib/couch_potato/view/model_view_spec.rb
+- lib/couch_potato/view/properties_view_spec.rb
+- lib/couch_potato/view/raw_view_spec.rb
+- lib/couch_potato/view/view_query.rb
 - lib/couch_potato.rb
-- spec/attributes_spec.rb
-- spec/belongs_to_spec.rb
 - spec/callbacks_spec.rb
 - spec/create_spec.rb
 - spec/custom_view_spec.rb
 - spec/destroy_spec.rb
-- spec/dirty_attributes_spec.rb
-- spec/find_spec.rb
-- spec/finder_spec.rb
-- spec/has_many_spec.rb
-- spec/inline_collection_spec.rb
-- spec/ordering_spec.rb
 - spec/property_spec.rb
-- spec/reload_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit
-- spec/unit/external_collection_spec.rb
-- spec/unit/finder_spec.rb
+- spec/unit/attributes_spec.rb
+- spec/unit/create_spec.rb
+- spec/unit/dirty_attributes_spec.rb
+- spec/unit/string_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
-- spec/versioning_spec.rb
+- rails/init.rb
+- init.rb
 has_rdoc: true
 homepage: http://github.com/langalex/couch_potato
 post_install_message: 

data/README.textile

@@ -1,340 +0,0 @@
-h2. Couch Potato
-
-... is a persistence layer written in ruby for CouchDB.
-
-h3. Mission
-
-The goal of Couch Potato is to create a migration path for users of ActiveRecord and other object relational mappers to port their applications to CouchDB. It therefore offers a basic set of the functionality provided by most ORMs and adds functionality unique to CouchDB on top.
-
-h3. Core Features
-
-Couch Potato is a work in progress so this list will hopefully grow over time.
-
-* persisting objects by including the CouchPotato::Persistence module
-* has_many/belongs_to relationships between persistant objects
-* atomic write operations spanning multiple objects using bulk save queues
-* extensive spec suite
-* included versioning support via the CouchPotato::Versioning module
-* included ordered lists support via the CouchPotato::Ordering module
-
-h3. Installation
-
-Couch Potato is hosted as a gem on github which you can install like this:
-
-  sudo gem source --add http://gems.github.com # if you haven't alread
-  sudo gem install langalex-couch_potato
-  
-h4. Using with your ruby application:
-
-  require 'rubygems'
-  gem 'couch_potato'
-  require 'couch_potato'
-  CouchPotato::Config.database_name = 'name of the db'
-  
-Alternatively you can download or clone the source repository and then require lib/couhc_potato.rb. 
-
-h4. Using with Rails
-
-Add to your config/environment.rb:
-
-  config.gem 'langalex-couch_potato', :lib => 'couch_potato', :source => 'http://gems.github.com'
-
-Then create a config/couchdb.yml:
-
-  development: development_db_name
-  test: test_db_name
-  production: production_db_name
-
-Alternatively you can also install Couch Potato directly as a plugin. 
- 
-h3. Introduction
-
-This is a basic tutorial on how to use Couch Potato. If you want to know all the details feel free to read the specs.
-
-h4. Save, load objects
-
-First you need a class.
-
-  class User
-  end
-
-To make instances of this class persistent include the persistence module:
-
-  class User
-    include CouchPotato::Persistence
-  end
-
-If you want to store any properties you have to declare them:
-
-  class User
-    include CouchPotato::Persistence
-    
-    property :name
-  end
-
-Now you can save your objects:
-
-  user = User.new :name => 'joe'
-  user.save # or save!
-
-Properties:
-
-  user.name # => 'joe'
-  user.name = {:first => ['joe', 'joey'], :last => 'doe', :middle => 'J'} # you can set any ruby object that responds_to :to_json (includes all core objects)
-  user._id # => "02097f33a0046123f1ebc0ebb6937269"
-  user._rev # => "2769180384"
-  user.created_at # => Fri Oct 24 19:05:54 +0200 2008
-  user.updated_at # => Fri Oct 24 19:05:54 +0200 2008
-  user.new_document? # => false, for compatibility new_record? will work as well
-
-You can of course also retrieve your instance:
-
-  User.get "02097f33a0046123f1ebc0ebb6937269" # => <#User 0x3075>
-
-h4. Object validations
-
-Couch Potato uses the validatable library for vaidation (http://validatable.rubyforge.org/)\
-
-  class User
-    property :name
-    validates_presence_of :name
-  end
-
-  user = User.new
-  user.valid? # => false
-  user.errors.on(:name) # => [:name, 'can't be blank']
-
-h4. Finding stuff
-
-For running basic finds (e.g. creating/querying views) you can either use the CouchPotato::Persistence::Finder class:
-
-  joe = User.create! :first_name => 'joe', :position => 1
-  jane = User.create! :first_name => 'jane', :position => 2
-  Finder.new.find User, :first_name => 'joe' # => [joe]
-  Finder.new.find User, :first_name => ['joe', 'jane'] # => [joe, jane]
-  Finder.new.find User, :position => 1..2 # => [joe, jane]
-  
-You can also count:
-
-  user = User.create! :first_name => 'joe'
-  Finder.new.count User, :first_name => 'joe' # => 1
-  
-Or you can call first/all/count on a class persistent class which will call the Finder.find, e.g.:
-
-  User.first :login => 'alex'
-  User.all
-  User.count :activated => true
-
-Be warned though that executing these finder methods will generate a new view for every new combination of class and attribute names it gets called with, so you really don't want to use this in a console on a production system.
-
-Support for more sophisticated views will be added later.
-
-h4. Associations
-
-As of now has_many and belongs_to are supported. By default the associated objects are stored in separate documents linked via foreign keys just like in relational databases.
-
-  class User
-    has_many :addresses, :dependent => :destroy
-  end
-  
-  class Address
-    belongs_to :user
-    property :street
-  end
-  
-   user = User.new
-  user.addresses.build :street => 'potato way'
-  user.addresses.first # => <#Address 0x987>
-  user.addresses.create! # raises an exception as street is blank
-  user.addresses.first.user == user # => true
-
-As CouchDB can not only store flat structures you also store associations inline:
-
-  class User
-    has_many :addresses, :stored => :inline
-  end
-
-This will store the addresses of the user as an array within your CouchDB document.
-
-You can also find stuff on associations (not the :stored => :inline):
-
-  user.addresses.all :street => 'potato way'
-  
-... returns only adresses belonging to this user instance and also matching the given conditions. You can call #count a well, #first and #last are not implemented here since those collide with the methods in Enumerable.
-
-h4. callbacks
-
-Couch Potato supports the usual lifecycle callbacks known from ActiveRecord:
-
-  class User
-    include CouchPotato::Persistence
-    
-    before_create :do_something_before_create
-    after_update :do_something_else
-  end
-
-This will call the method do_something_before_create before creating an object and do_something_else after updating one. Supported callbacks are: :before_validation_on_create, :before_validation_on_update, :before_validation_on_save, :before_create, :after_create, :before_update, :after_update, :before_save, :after_save, :before_destroy, :after_destroy
-
-If you want to do any CouchDB update/create/delete operation in your callback methods...
-
-  class User
-    include CouchPotato::Persistence
-    has_many :comments
-    
-    before_update :create_a_comment
-    
-    private    
-    def create_a_comment
-      comments.create :body => 'i was updated'
-    end
-  end
-
-... and you want the entire operation including its hooks to be atomic you can do this:
-
-  class User
-    include CouchPotato::Persistence
-    has_many :comments
-    
-    before_update :create_a_comment
-    
-    private    
-    def create_a_comment
-      bulk_save_queue << Comment.new(:body => 'i was updated')
-    end
-  end
-  
-h4. Custom Views
-
-*This is still in very early in development and of limited use*
-
-This is useful if you have a set of documents that has not been created with Couch Potato, for example doesn't have a ruby_class attribute but you still want to be able to load those documents as instances of a Couch Potato class.
-
-Example: Assuming you have a document like this:
-
-{name: "joe"}
-
-And a class:
-
-  class User
-    include CouchPotato::Persistence
-    property :name
-  end
-
-To be able to load that user all you have to do is this:
-  
-  class User
-    ...
-    
-    view :everyone
-  end
-  
-  User.everyone
-
-This will load all documents in your database as instances of User and assign their _id and name attributes.
-
-If you have larger structures and you only want to load some attributes you can customize the view:
-
-  {name: "joe", bio: "52 pages of text ...."}
-
-  class User
-    property :name
-    property :bio
-    
-    view :everyone, :properties => [:name]
-  end
-  
-  User.everyone.first.name # => "joe"
-  User.everyone.first.bio # => nil
-
-
-h4. Versioning
-
-Couch Potato supports versioning your objects, very similar to the popular acts_as_versioned plugin for ActiveRecord. To use it include the module:
-
-  class Document
-    include CouchPotato::Persistence
-    include CouchPotato::Versioning
-  end
-
-After that your object will have a version that gets incremented on each save.
-
-  doc = Document.create
-  doc.version # => 1
-  doc.save
-  doc.version # => 2
-
-You can access the older versions via the versions method.
-
-  doc.versions.first.version # => 1
-
-When passing a version number the version method will only return that version:
-
-  doc.versions(1).version # => 1
-
-You can set a condition for when to create a new version:
-
-  class Document
-    attr_accessor :update_version
-    include CouchPotato::Persistence
-    include CouchPotato::Versioning
-    
-    set_version_condition lambda {|doc| doc.update_version}
-  end
-
-  doc = Document.create
-  doc.update_version = false
-  doc.version # => 1
-  doc.save
-  doc.version # => 1
-  doc.update_version = true
-  doc.save
-  doc.version # => 2
-  
-h4. Ordered Lists
-
-Couch Potato supports ordered lists for has_many relationships (with the :stored => :separately option only), very similar to the popular acts_as_list plugin for ActiveRecord. To use it include the module:
-
-  class PersistenArray
-    include CouchPotato::Persistence
-    has_many :items
-  end
-  
-  class Item
-    include CouchPotato::Ordering
-    belongs_to :persistent_array
-    set_ordering_scope :persistent_array_id
-  end
-  
-  array = PersistenArray.new
-  item1 = array.items.create!
-  item1.position # => 1
-  item2 = array.items.create!
-  item2.position # => 2
-  
-You can move items up and down simply by changing the position:
-
-  item2.position = 1
-  item2.save!
-  item1.position # => 2
-  
-And you can insert new items at any position you want:
-
-  item3 = array.items.create! :position => 2
-  item1.position # => 3
-  
-And remove:
-
-  item3.destroy
-  item1.position # => 2
-
-h3. Helping out
-
-Please fix bugs, add more specs, implement new features by forking the github repo at http://github.com/langalex/couch_potato.
-
-You can run all the specs by calling 'rake spec_unit' and 'rake spec_functional' in the root folder of Couch Potato. The specs require a running CouchDB instance at http://localhost:5984
-
-I will only accept patches that are covered by specs - sorry.
-
-h3. Contact
-
-If you have any questions/suggestions etc. please contact me at alex at upstream-berlin.com or @langalex on twitter.

data/lib/couch_potato/active_record/compatibility.rb

@@ -1,9 +0,0 @@
-module CouchPotato
-  module Persistence
-    alias_method :new_record?, :new_document?
-    
-    module ClassMethods
-      alias_method :find, :get
-    end
-  end
-end