couch_rest_adapter 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf012dec6d067d4a5144daceaf14bfc26382c80
-  data.tar.gz: 8677857029defad6d38982ff2ecb439e0afb39ce
+  metadata.gz: ce2435af2159efb62cb05eb28a983283e637549e
+  data.tar.gz: 73da822c0f41cbe0a25f0b36427ffca9c4138664
 SHA512:
-  metadata.gz: 133ec2836ad03f0a93c1fceb60b2129f40150e3ae282f2c8d324859e944ba030e89a34e44272980ce94a694d2220a93aed96909fef35378ef5bc0b3ae9fe3626
-  data.tar.gz: 2ddb54433b4c43631eb511470adbe1e76db88835bcdec02d61f52389f435d63382d2c4c28b3038cac2ae7cf85a66f3bc5bebb8aa3940ab6e81fcb04a300213f7
+  metadata.gz: b3d2ea59b7a6f3e4d82fad656758a52f5e1b909a984afb39a584fb80d36fc55756a0614d6dc2314c1ef6d588b6e9a3cd8111bcf0fba005af7a7d5731421d9500
+  data.tar.gz: 38e677ac00092705b26001b5cc52e6c99a7ad7d4d23e6e1d45f261a7b7202bc2c4ab32763b2b2ee2b58deb9c3fefcf2f4bb6fc6f668ec32ad060b96bf78a8941

data/README.rdoc

@@ -1,5 +1,7 @@
 = CouchRestAdapter
 
+This is a realy early version.
+
 This project rocks and uses MIT-LICENSE.
 
 == Requirements
@@ -13,7 +15,34 @@ This project rocks and uses MIT-LICENSE.
 
 === In Gemfile
 
-    gem 'couch_rest_adapter', git: 'git://github.com/amco/couch_rest_adapter.git'
+    gem 'couch_rest_adapter'
+    
+=== Sample config/database.yml
+
+    defaults: &defaults
+      host: localhost
+      port: 5984
+      protocol: http
+
+    development:
+      <<: *defaults
+      name: db
+
+    test:
+      <<: *defaults
+      name: db_test
+
+
+=== CouchViews
+
+In order for ```Model.all``` to workyou need to add a view like (code in cs):
+
+    (d) ->
+      split_id = d._id.split('/')
+      t = split_id[0]
+      emit t, d
+      
+We are planning to add a rake task that setup this view on install.
 
 === Model Declaration
 
@@ -27,3 +56,4 @@ This project rocks and uses MIT-LICENSE.
 * Allow setting new attributes with ```model.attribute = value```
 * More test coverage
 * Add tasks for pushing design documents
+* Add support for basic database http auth.

data/lib/couch_rest_adapter/db_config.rb

@@ -24,6 +24,10 @@ module CouchRestAdapter
         root = Rails.env == 'test' ? File.expand_path("../../../test/dummy/",  __FILE__) : Rails.root
         File.join(root, 'config', 'database.yml')
       end
+
+      def default_design_doc
+        parse_config[Rails.env]['design_doc']
+      end
     end
   end
 end

data/lib/couch_rest_adapter/document_management.rb

@@ -3,7 +3,7 @@ module CouchRestAdapter
     UUID_DOC = '_uuids/?'
 
     def next_id
-      File.join self.class.model_name, uuids.first
+      File.join self.class.object_name, uuids.first
     end
 
     def uuids opts = {}

data/lib/couch_rest_adapter/query_views.rb

@@ -13,9 +13,9 @@ module CouchRestAdapter
       #TODO: We can get this from Rails.application.class.name
       DEFAULT_DESIGN = 'amcoid'
 
-      def query_view name
-        doc = name.namespace_me DEFAULT_DESIGN
-        view(doc, {key: model_name})['rows'].map{ |res| new res['doc'] }
+      def query_view name, doc_name = nil
+        doc = name.namespace_me(doc_name || DEFAULT_DESIGN)
+        view(doc, {key: object_name})['rows'].map{ |res| new res['doc'] }
       end
 
       #TODO: method for reduce, and filters

data/lib/couch_rest_adapter/version.rb

@@ -1,3 +1,3 @@
 module CouchRestAdapter
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/couch_rest_adapter.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'couchrest'
 require 'couch_rest_adapter/attribute_method'
 require 'couch_rest_adapter/query_views'
@@ -10,30 +11,38 @@ using CouchRestAdapter::Helpers
 
 module CouchRestAdapter
   class Base < CouchRest::Document
+    extend ActiveModel::Naming
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
     include ActiveSupport::Callbacks
     include AttributeMethod
-    include QueryViews
+    include DbConfig
     include DocumentManagement
     include DbConfig
+    include QueryViews
 
     #TODO: add custom callback calls.
-    define_callbacks :before_save
+    define_model_callbacks :save
+
+    #TODO set_id not be a callback. Need a better way to do this, possibilty using class methods
+    before_save :set_id
 
-    def initialize attrs = nil
+    def initialize attributes = {}
+      @attributes = attributes
       raise NotImplementedError if abstract?
-      super attrs
+      super attributes
     end
 
     def self.all
-      query_view('all')
+      query_view('all', default_design_doc)
     end
 
     def self.all_by_type
-      query_view('by_type')
+      query_view('by_type', default_design_doc)
     end
 
     def self.find doc_id
-      new database.get( doc_id.namespace_me(model_name) ).to_hash
+      new database.get( doc_id.namespace_me(object_name) ).to_hash
     end
 
     def self.use_default_database
@@ -41,10 +50,9 @@ module CouchRestAdapter
     end
 
     def save
-      run_callbacks :before_save do
-        self['_id'] = next_id if self['_id'].blank?
-        super
-      end
+      return false if invalid?
+      return false unless run_callbacks(:save)
+      super
     end
 
     def method_missing method, *args, &block
@@ -55,14 +63,25 @@ module CouchRestAdapter
       end
     end
 
+    def persisted?
+      true
+    end
+
+    def read_attribute_for_validation(key)
+      @attributes[key]
+    end
+
     protected
       def abstract?
         self.class.to_s == 'CouchRestAdapter::Base'
       end
 
-      def self.model_name
-        name.underscore
+      def self.object_name
+        self.model_name.singular
       end
 
+      def set_id
+        self['_id'] = next_id if self['_id'].blank?
+      end
   end
 end

data/test/couch_rest_adapter_test.rb

@@ -98,3 +98,10 @@ class CouchRestAdapterTest < ActiveSupport::TestCase
 
 end
 
+class LintTest < ActiveModel::TestCase
+  include ActiveModel::Lint::Tests
+
+  def setup
+    @model = FooBar.new
+  end
+end

data/test/dummy/config/database.yml

@@ -2,6 +2,7 @@ defaults: &defaults
   host: localhost
   port: 5984
   protocol: http
+  design_doc: 'my_app'
 
 development:
   <<: *defaults

data/test/dummy/log/test.log

@@ -1312,3 +1312,183 @@ CouchRestAdapterTest: test_update_to_attr=_will_persist
 --------------------------------------------------------------
 CouchRestAdapterTest: test_will_add_class_underscorename_to_id
 --------------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------
+LintTest: test_errors_aref
+--------------------------
+---------------------------
+LintTest: test_model_naming
+---------------------------
+-------------------------
+LintTest: test_persisted?
+-------------------------
+---------------------
+LintTest: test_to_key
+---------------------
+-----------------------
+LintTest: test_to_param
+-----------------------
+------------------------------
+LintTest: test_to_partial_path
+------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_attributes_are_available_as_methods
+--------------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_can_not_instantiate_base_class
+---------------------------------------------------------
+---------------------------------------------------------
+CouchRestAdapterTest: test_find_will_work_with_partial_id
+---------------------------------------------------------
+-------------------------------------------------------------
+CouchRestAdapterTest: test_one_can_update_existing_attributes
+-------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_by_type_will_return_array_of_docs_with_type_set_to_model_name
+--------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------
+CouchRestAdapterTest: test_query_all_will_bring_array_of_Foo_instances
+----------------------------------------------------------------------
+-------------------------------------------------------
+CouchRestAdapterTest: test_update_to_attr=_will_persist
+-------------------------------------------------------
+--------------------------------------------------------------
+CouchRestAdapterTest: test_will_add_class_underscorename_to_id
+--------------------------------------------------------------
+--------------------------
+LintTest: test_errors_aref
+--------------------------
+---------------------------
+LintTest: test_model_naming
+---------------------------
+-------------------------
+LintTest: test_persisted?
+-------------------------
+---------------------
+LintTest: test_to_key
+---------------------
+-----------------------
+LintTest: test_to_param
+-----------------------
+------------------------------
+LintTest: test_to_partial_path
+------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_rest_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Javier Guerra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails