couch_rest_adapter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e7938a0be83ff4164281d505b5d390c9aaa8c5
-  data.tar.gz: 7fbc6b79a8c57daa074c63fa587e89a77777e851
+  metadata.gz: e7b96cd3e242f65785013feb23396a745182ba30
+  data.tar.gz: 557bf704b3d52af56e3978b8d645ac9ee8bd6530
 SHA512:
-  metadata.gz: 073bead5da7207675919c12a47a4e69e7b7c7717f24eed043cece1b771b8916319a26447b3bfcf9adf13307145d418ef2c732ecb1555c2f4dedc3039af21e5af
-  data.tar.gz: 1fa69ac85f78e035b2bf87a10e86806bd0c823eca93ca53359b68c015044fa3b80a9b752cba4904b160fcf7e4e5acd21c942abe5d6b0e366d1be13f5b64cbe5d
+  metadata.gz: 6d166a2f936e01cf0bf6772693328c7b99676c3cd39194a61a6756f82db4c4fe6a3b4f004648b1ab6e9f9b0670c1f51c2cbd1f76e3260498da3cde69992bbf2e
+  data.tar.gz: dd4816b8a31ad8acf54ea95ac72d46907b9f0bad9fdaf1e10d3f6557179a7446345d49b4dd8cd3fb745feed1cac7909615bd27747fa0c383b94955a25850adee

data/lib/couch_rest_adapter/attribute_method.rb

@@ -32,6 +32,9 @@ module CouchRestAdapter
       _attributes.keys.map{ |attr| [attr, "#{attr}="] }.flatten
     end
 
+    def base_id
+      File.basename self['_id']
+    end
   end
 end
 

data/lib/couch_rest_adapter/document_management.rb

@@ -1,9 +1,31 @@
+using CouchRestAdapter::Helpers
+
+#TODO write some tests for this module
 module CouchRestAdapter
   module DocumentManagement
+    module ClassMethods
+      def namespace=(namespace)
+        @@_namespace = namespace
+      end
+
+      def namespace
+        @@_namespace ||= object_name
+      end
+
+      def object_name
+        model_name.singular
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
     UUID_DOC = '_uuids/?'
 
-    def next_id
-      File.join self.class.object_name, uuids.first
+    #override this method if you want to set your own id
+    def set_id
+      uuids.first
     end
 
     def uuids opts = {}
@@ -16,6 +38,11 @@ module CouchRestAdapter
       CGI.unescape(opts.to_query)
     end
 
+    def _set_id_and_namespace
+      self['_id'] = set_id if self['_id'].blank?
+      self['_id'] = self['_id'].namespace_me self.class.namespace
+    end
+
   end
 end
 

data/lib/couch_rest_adapter/query_views.rb

@@ -10,8 +10,8 @@ module CouchRestAdapter
     end
 
     module ClassMethods
-      #TODO: We can get this from Rails.application.class.name
-      DEFAULT_DESIGN = 'amcoid'
+      
+      DEFAULT_DESIGN = Rails.application.class.to_s.split("::").first.downcase
 
       def find_by_attribute attr_name, value, doc_name = nil
         document_name = 'by_attribute'

data/lib/couch_rest_adapter/version.rb

@@ -1,3 +1,3 @@
 module CouchRestAdapter
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/couch_rest_adapter.rb

@@ -26,9 +26,6 @@ module CouchRestAdapter
     #TODO: add custom callback calls.
     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 attributes = {}
       raise NotImplementedError if abstract?
       super attributes
@@ -65,6 +62,7 @@ module CouchRestAdapter
     def save
       return false if invalid?
       return false unless run_callbacks(:save)
+      _set_id_and_namespace
       super
     end
 
@@ -88,13 +86,5 @@ module CouchRestAdapter
       def abstract?
         self.class.to_s == 'CouchRestAdapter::Base'
       end
-
-      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/attribute_method_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CouchRestAdapter::AttributeMethodTest < ActiveSupport::TestCase
+
+  def setup
+    @foo = FooBar.new
+  end
+
+  test 'base_id' do
+    @foo['_id'] = 'some_namespace/value_desired'
+    assert_equal @foo.base_id, 'value_desired'
+  end
+
+end
+
+class FooBar < CouchRestAdapter::Base
+  use_default_database
+end

data/test/couch_rest_adapter/document_management_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class CouchRestAdapter::DocumentManagementTest < ActiveSupport::TestCase
+
+  def setup
+    @foo = FooBar.new
+    @klass = @foo.class
+  end
+
+  test 'class_method object_name returns model_name in singular form' do
+    assert_equal @klass.object_name, @klass.model_name.singular
+  end
+
+  test 'class_method namespace defaults to object_name' do
+    assert_equal @klass.namespace, @klass.object_name
+  end
+
+  test 'class_method namespace= allows override of namespace' do
+    @klass.namespace = 'something'
+    assert_equal @klass.namespace, 'something'
+    @klass.namespace = @klass.object_name
+  end
+
+  test '_set_id_and_namespace will set the _id variable with an id and namespace' do
+    @foo._set_id_and_namespace
+    assert @foo['_id'].start_with?("foo_bar/")
+  end
+end
+
+class FooBar < CouchRestAdapter::Base
+  use_default_database
+end
+