couch_potato 0.2.30 → 0.2.31

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+### 0.2.31
+* Removed requirement for validatable gem. Allows for using more uptodate versions of the library, or doesn't install it when you're using ActiveModel. (mattmatt)
+* fixed callbacks of super classes were not run (langalex)
+
 ### 0.2.30
 * pass in multiple keys when querying a view (langalex)
 

data/README.md

@@ -269,14 +269,15 @@ If you need access to the database in a callback: Couch Potato automatically ass
 
 #### Attachments
 
-There is basic attachment support: if you want to store any attachments set that _attachments attribute of a model before saving like this:
+There is basic attachment support: if you want to store any attachments set the _attachments attribute of a model before saving like this:
 
     class User
       include CouchPotato::Persistence
     end
     
+    data = File.read('some_file.text') # or from upload
     user = User.new
-    user._attachments = {'photo' => {'data' => '[image byte data]', 'content_type' => 'image/png'}}
+    user._attachments = {'photo' => {'data' => data, 'content_type' => 'image/png'}}
     
 When saving this object an attachment with the name _photo_ will be uploaded into CouchDB. It will be available under the url of the user object + _/photo_. When loading the user at a later time you still have access to the _content_type_ and additionally to the _length_ of the attachment:
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 30
+:patch: 31
 :build: 

data/lib/core_ext/string.rb

@@ -5,15 +5,4 @@ module ActiveSupportMethods
     end
   end
 end
-String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)
-
-class String
-  # inspired by http://github.com/rails/rails/blob/b600bf2cd728c90d50cc34456c944b2dfefe8c8d/activesupport/lib/active_support/inflector.rb
-  def snake_case(seperator = '/')
-    string = seperator == '::' ? dup : gsub(/::/, '/')
-    string.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-    string.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    string.tr!("-", "_")
-    string.downcase
-  end
-end
+String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)

data/lib/couch_potato/persistence/callbacks.rb

@@ -6,9 +6,8 @@ module CouchPotato
 
         base.class_eval do
           attr_accessor :skip_callbacks
-          def self.callbacks
-            @callbacks ||= {}
-            @callbacks[self.name] ||= {:before_validation => [], :before_validation_on_create => [], 
+          def self.callbacks #:nodoc:
+            @callbacks ||= {:before_validation => [], :before_validation_on_create => [], 
               :before_validation_on_update => [], :before_validation_on_save => [], :before_create => [], 
               :after_create => [], :before_update => [], :after_update => [],
               :before_save => [], :after_save => [],
@@ -17,12 +16,17 @@ module CouchPotato
         end
       end
 
-      # Runs all callbacks on a model with the given name, i.g. :after_create.
+      # Runs all callbacks on a model with the given name, e.g. :after_create.
       # 
       # This method is called by the CouchPotato::Database object when saving/destroying an object 
       def run_callbacks(name)
         return if skip_callbacks
-        self.class.callbacks[name].uniq.each do |callback|
+        
+        callbacks = self.class.ancestors.map do |clazz|
+          clazz.callbacks[name] if clazz.respond_to?(:callbacks)
+        end.flatten.compact.uniq
+        
+        callbacks.each do |callback|
           if callback.is_a?(Symbol)
             send callback
           elsif callback.is_a?(Proc)

data/lib/couch_potato/persistence/simple_property.rb

@@ -23,6 +23,7 @@ module CouchPotato
       def serialize(json, object)
         json[name] = object.send name
       end
+      alias :value :serialize
       
       private
       

data/lib/couch_potato/persistence.rb

@@ -73,7 +73,7 @@ module CouchPotato
     #   book.attributes # => {:title => nil, :year => 2009}
     def attributes
       self.class.properties.inject({}) do |res, property|
-        property.serialize(res, self)
+        property.value(res, self)
         res
       end
     end
@@ -96,8 +96,8 @@ module CouchPotato
     end
    
     def inspect
-      attributes_as_string = attributes.map {|attribute, value| "#{attribute}: '#{value}'"}.join(", ")
-      "#<#{self.class} _id: '#{_id}', _rev: '#{_rev}', #{attributes_as_string}>"
+      attributes_as_string = attributes.map {|attribute, value| "#{attribute}: #{value.inspect}"}.join(", ")
+      %Q{#<#{self.class} _id: "#{_id}", _rev: "#{_rev}", #{attributes_as_string}>}
     end
   end    
 end

data/lib/couch_potato/railtie.rb

@@ -6,10 +6,8 @@ module CouchPotato
     CouchPotato::Config.database_name = YAML::load(File.read(Rails.root.join('config/couchdb.yml')))[Rails.env]
   end
 
-  if Rails.version >= '3'
-    class Railtie < Rails::Railtie
-      railtie_name :couch_potato
-
+  if defined?(::Rails::Railtie)
+    class Railtie < ::Rails::Railtie
       config.after_initialize do |app|
         CouchPotato.rails_init
       end

data/lib/couch_potato/validation/with_validatable.rb

@@ -2,7 +2,12 @@ module CouchPotato
   module Validation
     module WithValidatable
       def self.included(base)
-        require 'validatable'
+        begin
+          require 'validatable'
+        rescue LoadError
+          puts "Please install the gem validatable using 'gem install validatable'"
+          raise
+        end
         base.send :include, ::Validatable
         base.class_eval do
           # Override the validate method to first run before_validation callback

data/lib/couch_potato/view/base_view_spec.rb

@@ -8,7 +8,7 @@ module CouchPotato
         normalized_view_parameters = normalize_view_parameters view_parameters
         assert_valid_view_parameters normalized_view_parameters
         @klass = klass
-        @design_document = klass.to_s.snake_case('::')
+        @design_document = translate_to_design_doc_name(klass.to_s)
         @view_name = view_name
         @options = options
         @view_parameters = {}
@@ -56,6 +56,14 @@ module CouchPotato
       def valid_view_parameters
         %w(key keys startkey startkey_docid endkey endkey_docid limit stale descending skip group group_level reduce include_docs inclusive_end)
       end
+      
+      def translate_to_design_doc_name(klass_name)
+        klass_name = klass_name.dup
+        klass_name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+        klass_name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        klass_name.tr!("-", "_")
+        klass_name.downcase
+      end
     end
   end
 end

data/spec/callbacks_spec.rb

@@ -55,9 +55,10 @@ describe "multiple callbacks at once" do
       self.eaten_apple = true
     end
   end
+  
   it "should run all callback methods given to the callback method call" do
     monkey = Monkey.new
-    CouchPotato.database.save_document! monkey
+    monkey.run_callbacks :before_create
     monkey.eaten_banana.should be_true
     monkey.eaten_apple.should be_true
   end

data/spec/property_spec.rb

@@ -287,21 +287,29 @@ describe 'properties' do
     end
     
     it "should include the normal persistent variables" do
-      comment.inspect.should include("title: 'title'")
+      comment.inspect.should include('title: "title"')
     end
     
     it "should include the id" do
-      comment.inspect.should include("_id: '123456abcdef',")
+      comment.inspect.should include(%Q{_id: "123456abcdef",})
     end
     
     it "should include the revision" do
-      comment.inspect.should include("_rev: '1-654321fedcba',")
+      comment.inspect.should include(%Q{_rev: "1-654321fedcba",})
     end
     
     it "should return a complete string" do
       # stub to work around (un)sorted hash on different rubies
       comment.stub!(:attributes).and_return([['created_at', ''], ['updated_at', ''], ['title', 'title']])
-      comment.inspect.should == "#<Comment _id: '123456abcdef', _rev: '1-654321fedcba', created_at: '', updated_at: '', title: 'title'>"
+      comment.inspect.should == %Q{#<Comment _id: "123456abcdef", _rev: "1-654321fedcba", created_at: "", updated_at: "", title: "title">}
+    end
+    
+    it "should include complex datatypes fully inspected" do
+      comment.title = {'en' => 'Blog post'}
+      comment.inspect.should include('title: {"en"=>"Blog post"}')
+      
+      comment.title = nil
+      comment.inspect.should include('title: nil')
     end
   end
 end

data/spec/unit/callbacks_spec.rb

@@ -1,32 +1,58 @@
 require 'spec_helper'
 
-describe 'before_validation callback' do
-  before(:each) do
-    @tree = Tree.new(:leaf_count => 1, :root_count => 1)
-  end
-
+describe 'callbacks' do
   class Tree
     include CouchPotato::Persistence
 
-    before_validation :water!, lambda {|tree| tree.root_count += 1 }
+    before_validation :grow_leaf, lambda {|tree| tree.root_count ||= 0; tree.root_count += 1 }
 
     property :leaf_count
     property :root_count
 
-    def water!
+    def grow_leaf
+      self.leaf_count ||= 0
       self.leaf_count += 1
     end
   end
+  
+  class AppleTree < Tree
+    attr_accessor :watered
+    
+    before_validation :water
+    
+    def water
+      self.watered = true
+    end
+    
+    def watered?
+      watered
+    end
+  end
 
-  it "should call water! when validated" do
-    @tree.leaf_count.should == 1
-    @tree.should be_valid
-    @tree.leaf_count.should == 2
+  it "should call a method when validated" do
+    tree = Tree.new(:leaf_count => 1, :root_count => 1)
+    tree.valid?
+    tree.leaf_count.should == 2
   end
 
-  it "should call lambda when validated" do
-    @tree.root_count.should == 1
-    @tree.should be_valid
-    @tree.root_count.should == 2
+  it "should call a lambda when validated" do
+    tree = Tree.new(:leaf_count => 1, :root_count => 1)
+    tree.valid?
+    tree.root_count.should == 2
+  end
+  
+  context 'inheritance' do
+    it "should call the callbacks of the super class" do
+      tree = AppleTree.new :leaf_count => 1
+      tree.valid?
+      tree.leaf_count.should == 2
+    end
+    
+    it "should call the callbacks of the child class" do
+      tree = AppleTree.new :leaf_count => 1
+      tree.valid?
+      tree.should be_watered
+    end
   end
+  
 end

data/spec/unit/string_spec.rb

@@ -5,13 +5,3 @@ describe String, 'camelize' do
     'my_string'.camelize.should == 'MyString'
   end
 end
-
-describe String, 'snake_case' do
-  it "should snake_case a string" do
-    'MyString'.snake_case.should == 'my_string'
-  end
-
-  it "should snake_case a string using a custom separator" do
-    'My::String'.snake_case('::').should == 'my::string'
-  end
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 30
-  version: 0.2.30
+  - 31
+  version: 0.2.31
 platform: ruby
 authors: 
 - Alexander Lang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,22 +29,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: validatable
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: couchrest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -53,7 +41,7 @@ dependencies:
         - 24
         version: "0.24"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 description: Ruby persistence layer for CouchDB
 email: alex@upstream-berlin.com
 executables: []