simply_stored 0.5.4 → 0.6.0

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =============
 
+0.6.0
+
+- Ruby 1.9.2 compatible
+
+- compatible with CouchPotato > 0.5 where the attributes are lazy loaded
+
+- Depends on ActiveSupport/ActiveModel 3.x
+  --> Does not longer work with Rails 2.x !
+
 0.5.4
 
 - Add Rake task to compact all views in a given database: 

data/Gemfile.lock

@@ -1,13 +1,21 @@
 GEM
+  remote: http://rubygems.org/
   specs:
-    activesupport (2.3.11)
-    couch_potato (0.2.31.2)
-      couchrest (>= 0.24)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.9)
+    builder (2.1.2)
+    couch_potato (0.5.0)
+      activemodel
+      couchrest (>= 1.0.1)
       json
     couchrest (1.0.1)
       json (>= 1.4.6)
       mime-types (>= 1.15)
       rest-client (>= 1.5.1)
+    i18n (0.5.0)
     json (1.4.6)
     mattmatt-validatable (1.8.4)
     mime-types (1.16)
@@ -27,8 +35,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (= 2.3.11)
-  couch_potato (= 0.2.31.2)
+  activesupport (~> 3.0.0)
+  couch_potato (= 0.5.0)
   couchrest (= 1.0.1)
   mattmatt-validatable (= 1.8.4)
   mocha

data/README.md

@@ -17,6 +17,47 @@ Installation
 
     gem install simply_stored
 
+
+#### Using with Rails
+
+Create a config/couchdb.yml:
+
+    default: &default
+      validation_framework: :active_model # optional
+      split_design_documents_per_view: true # optional
+
+    development:
+      <<: *default
+      database: http://localhost:5984/development_db
+    test:
+      <<: *default
+      database: http://localhost:5984/test_db
+    production:
+      <<: *default
+      database: <%= ENV['DB_NAME'] %>
+
+#### Rails 2.x
+
+In config/environment.rb:
+
+    config.gem 'simply_stored', :source => 'http://gemcutter.org'
+    config.frameworks -= [:active_record] # if you do not need ActiveRecord any more
+
+Please note that if you use Rails 2.x, you can only use SimplyStored until version 0.5.4. SimplyStored 0.6 and above require Rails 3.x.
+
+#### Rails 3.x
+
+Add to your Gemfile:
+
+    # gem 'rails' # we don't want to load activerecord so we can't require rails
+    gem 'railties'
+    gem 'actionpack'
+    gem 'actionmailer'
+    gem 'activemodel'
+    gem 'simply_stored', :require => 'simply_stored/couch'
+
+Please also see the installation info of [CouchPotato](https://github.com/langalex/couch_potato)
+
 Usage
 =============
 

data/lib/simply_stored/couch/belongs_to.rb

@@ -56,7 +56,6 @@ module SimplyStored
           @options.assert_valid_keys(:class_name)
 
           owner_clazz.class_eval do
-            attr_reader "#{name}_id"
             attr_accessor "#{name}_id_was"
             property "#{name}_id"
             
@@ -74,17 +73,16 @@ module SimplyStored
               klass = self.class.get_class_from_name(self.class._find_property(name).options[:class_name])
               raise ArgumentError, "expected #{klass} got #{value.class}" unless value.nil? || value.is_a?(klass)
 
+              new_foreign_id = value.nil? ? nil : value.id
+
+              send("#{name}_id=", new_foreign_id)
               instance_variable_set("@#{name}", value)
-              if value.nil?
-                instance_variable_set("@#{name}_id", nil)
-              else
-                instance_variable_set("@#{name}_id", value.id)
-              end
             end
 
-            define_method "#{name}_id=" do |id|
+            define_method "#{name}_id=" do |new_foreign_id|
+              super
+              value = instance_variable_get("@#{name}")
               remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
-              instance_variable_set("@#{name}_id", id)
             end
             
             define_method "#{name}_changed?" do

data/lib/simply_stored/couch/ext/couch_potato.rb

@@ -4,6 +4,12 @@ module CouchPotato
       private
       
       def reset_dirty_attributes
+        # active mode reset
+        @previously_changed = changes
+        @changed_attributes.clear
+        @forced_dirty = nil
+
+        # belongs_to properties reset
         self.class.properties.each do |property|
           if !property.respond_to?(:supports_dirty?) || property.supports_dirty?
             property.respond_to?(:reset_dirty_attribute) ? property.reset_dirty_attribute(self) :
@@ -13,4 +19,24 @@ module CouchPotato
       end
     end
   end
+end
+
+module CouchPotato
+  class Database
+
+    # the original implementation does not delete if callbacks are skipped
+    def destroy_document(document, run_callbacks = true)
+      if run_callbacks
+        document.run_callbacks :destroy do
+          document._deleted = true
+          database.delete_doc document.to_hash
+        end
+      else
+        document._deleted = true
+        database.delete_doc document.to_hash
+      end
+      document._id = nil
+      document._rev = nil
+    end
+  end
 end

data/lib/simply_stored/couch/has_many.rb

@@ -81,7 +81,7 @@ module SimplyStored
           elsif options[:dependent] == :ignore
             # skip
           else # nullify
-            value.send("#{self.class.foreign_key}=", nil) 
+            value.send("#{self.class.foreign_key}=", nil)
             value.save(false)
           end
           

data/lib/simply_stored/couch.rb

@@ -19,6 +19,8 @@ require 'simply_stored/couch/has_one'
 require 'simply_stored/couch/ext/couch_potato'
 require 'simply_stored/couch/views'
 
+CouchPotato::Config.validation_framework = :validatable
+
 module SimplyStored
   module Couch
     def self.included(clazz)
@@ -30,8 +32,6 @@ module SimplyStored
       
       clazz.instance_eval do
         attr_accessor :_accessible_attributes, :_protected_attributes
-        alias :simpledb_array :simpledb_string
-        alias :simpledb_integer :simpledb_string
         
         view :all_documents, :key => :created_at
       end
@@ -84,34 +84,6 @@ module SimplyStored
         @auto_conflict_resolution_on_save = val
       end
       
-      def simpledb_string(*names)
-        names.each do |name|
-          property name
-        end
-      end
-      
-      def simpledb_timestamp(*names)
-        names.each do |name|
-          property name, :type => Time
-        end
-      end
-      
-      def require_attributes(*names)
-        names.each do |name|
-          validates_presence_of name
-        end
-      end
-
-      def require_inclusion_of(name, valid_set, options = {})
-        options.update(:in => valid_set)
-        validates_inclusion_of(name, options)
-      end
-      
-      def require_format_of(attr, valid_regex, options = {})
-        options.update(:with => valid_regex)
-        validates_format_of(attr, options)
-      end
-
       def method_missing(name, *args)
         if name.to_s =~ /^find_by/
           _define_find_by(name, *args)

data/lib/simply_stored/instance_methods.rb

@@ -29,12 +29,18 @@ module SimplyStored
     def destroy(override_soft_delete=false)
       check_and_destroy_dependents
       if self.class.soft_deleting_enabled? && !override_soft_delete
+        # soft-delete
         _mark_as_deleted
       else
-        self.skip_callbacks = true if self.class.soft_deleting_enabled? && deleted?
-        CouchPotato.database.destroy_document(self)
+        if self.class.soft_deleting_enabled? && deleted?
+          # really deleting a previously soft-deleted object - skipping callbacks
+          CouchPotato.database.destroy_document(self, false)
+        else # deleting a normal object or a soft-deletable object that was not soft-deleted before
+          CouchPotato.database.destroy_document(self, true)
+        end
         freeze
       end
+      self
     end
     alias :delete :destroy
 
@@ -65,8 +71,8 @@ module SimplyStored
         false
       end
     end
-    
-    protected
+
+  protected
     
     def retry_on_conflict(max_retries = 2, &blk)
       retry_count = 0
@@ -255,10 +261,10 @@ module SimplyStored
     end
 
     def _mark_as_deleted
-      run_callbacks(:before_destroy)
-      send("#{self.class.soft_delete_attribute}=", Time.now)
-      save(false)
-      run_callbacks(:after_destroy)
+      _run_destroy_callbacks do
+        send("#{self.class.soft_delete_attribute}=", Time.now)
+        save(false)
+      end
     end
     
   end

data/lib/simply_stored.rb

@@ -1,12 +1,14 @@
-$:<<(File.expand_path(File.dirname(__FILE__) + "/lib"))
-require File.expand_path(File.dirname(__FILE__) + '/simply_stored/instance_methods')
-require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
-require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
+unless defined?(SimplyStored)
+  $:<<(File.expand_path(File.dirname(__FILE__) + "/lib"))
+  require File.expand_path(File.dirname(__FILE__) + '/simply_stored/instance_methods')
+  require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
+  require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
-module SimplyStored
-  VERSION = '0.5.4'
-  class Error < RuntimeError; end
-  class RecordNotFound < RuntimeError; end
-end
+  module SimplyStored
+    VERSION = '0.6.0'
+    class Error < RuntimeError; end
+    class RecordNotFound < RuntimeError; end
+  end
 
-require File.expand_path(File.dirname(__FILE__) + '/simply_stored/couch')
+  require File.expand_path(File.dirname(__FILE__) + '/simply_stored/couch')
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -15,13 +15,160 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +02:00
-default_executable: 
+date: 2011-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: uuidtools
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 1
+        - 8
+        - 4
+        version: 1.8.4
+  name: mattmatt-validatable
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
   name: rest-client
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  name: couchrest
+  prerelease: false
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  name: couch_potato
+  prerelease: false
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  prerelease: false
+  type: :runtime
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda-addons
+  prerelease: false
+  type: :runtime
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mocha
+  prerelease: false
+  type: :runtime
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  name: activesupport
+  prerelease: false
+  type: :runtime
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: right_aws
+  prerelease: false
+  type: :runtime
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +179,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
+  name: rest-client
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: couch_potato
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +195,12 @@ dependencies:
         - 2
         - 15
         version: 0.2.15
+  name: couch_potato
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +209,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: activesupport
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: mattmatt-validatable
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,8 +223,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: mattmatt-validatable
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  requirement: *id014
 description: Convenience layer for CouchDB on top of CouchPotato.
 email: info@peritor.com
 executables: []
@@ -111,28 +260,12 @@ files:
 - lib/simply_stored/instance_methods.rb
 - lib/simply_stored/rake.rb
 - lib/simply_stored/storage.rb
-- test/active_model_compatibility_test.rb
-- test/belongs_to_test.rb
-- test/conflict_handling_test.rb
-- test/finder_test.rb
-- test/fixtures/couch.rb
-- test/has_and_belongs_to_many_test.rb
-- test/has_many_test.rb
-- test/has_one_test.rb
-- test/instance_lifecycle_test.rb
-- test/mass_assignment_protection_test.rb
-- test/s3_test.rb
-- test/soft_deletable_test.rb
-- test/test_helper.rb
-- test/validations_test.rb
-- test/views_test.rb
-has_rdoc: true
 homepage: http://github.com/peritor/simply_stored
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -156,23 +289,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Convenience layer for CouchDB
-test_files: 
-- test/active_model_compatibility_test.rb
-- test/belongs_to_test.rb
-- test/conflict_handling_test.rb
-- test/finder_test.rb
-- test/fixtures/couch.rb
-- test/has_and_belongs_to_many_test.rb
-- test/has_many_test.rb
-- test/has_one_test.rb
-- test/instance_lifecycle_test.rb
-- test/mass_assignment_protection_test.rb
-- test/s3_test.rb
-- test/soft_deletable_test.rb
-- test/test_helper.rb
-- test/validations_test.rb
-- test/views_test.rb
+test_files: []
+

data/test/active_model_compatibility_test.rb

@@ -1,23 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-begin
-  require 'active_model'
-
-  class CouchModel
-    include SimplyStored::Couch
-    property :name
-    validates_presence_of :name
-  end
-
-  class ActiveModelCompatibilityTest < Test::Unit::TestCase
-    def setup
-      @model = CouchModel.new
-    end
-    include ActiveModel::Lint::Tests
-  end
-
-rescue LoadError
-  puts "ActiveModel not installed, skipping lint tests."
-end
-
-