dolly 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607619b07d08f6c860815258fe030b39cd0a09f8
-  data.tar.gz: 5dac80a4623dbb5e02bcb5a658e27c68c79f7b07
+  metadata.gz: 754dab90c1532d18893458b0b7301b38b319e5a1
+  data.tar.gz: ff8a35e0bdbfe7af08a62e3c42042024d8c1af2c
 SHA512:
-  metadata.gz: 8f702a1d9f7772ee6f846840ad01929552efdd149c91d62a47ab0987fb133949dbdd1960e7f09d27045aba1c3499419aaa85f5f55c2128aeb64bd520a707a242
-  data.tar.gz: 911733d3bbe11688ac8783009b2500e76d21fc9b0ed1cea9a8e222635c1ee578cd8890fbbace7dba3daee31aabaf01ed9bdfbbd54058f0b49ba72c10975e7ffb
+  metadata.gz: b517028df8a2946914bd15d56c04a279d6c67392de905bb31160753b31366be2ca6dce9e23bbda648882404e01ccdb908f32553c32265c373e866401e0cdbf26
+  data.tar.gz: 0964bd2b62f61ac822fe10da422cc055eb25ce8eb2b8d97302632577ff3eba438072f09318cceddce89dc6789773d07af0a5820b2753750609a8a7cf16ec8ce5

data/lib/dolly/document.rb

@@ -5,12 +5,12 @@ module Dolly
   class Document
     extend Dolly::Connection
     include Dolly::Query
-    include Dolly::NameSpace
 
     attr_accessor :rows, :doc, :key
     class_attribute :properties
 
     def initialize options = {}
+      options = options.with_indifferent_access
       init_properties options
     end
 

data/lib/dolly/name_space.rb

@@ -1,12 +1,8 @@
-require "active_model/naming"
-
-#TODO: remove this module to be part of Dolly::Document
 module Dolly
   module NameSpace
-    include ActiveModel::Naming
 
     def name_paramitized
-      model_name.element
+      underscore name.split("::").last
     end
 
     def base_id id
@@ -18,5 +14,15 @@ module Dolly
       return id if id =~ %r~^#{name_paramitized}/~
       "#{name_paramitized}/#{id}"
     end
+
+    #FROM ActiveModel::Name
+    def underscore(camel_cased_word)
+      camel_cased_word.to_s.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+
   end
 end

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/test/document_test.rb

@@ -218,9 +218,24 @@ class DocumentTest < ActiveSupport::TestCase
     assert_equal "foo_bar/b", bar.id
   end
 
+  test 'new document will have id from _id or id strings' do
+    foo = FooBar.new 'id' => 'a'
+    bar = FooBar.new '_id' => 'b'
+    assert_equal "foo_bar/a", foo.id
+    assert_equal "foo_bar/b", bar.id
+  end
+
   test 'new document with no id' do
     foo = FooBar.new
-    assert foo.id.match(%r{foo_bar/[a-f0-1]+}).present?
+    uuid = %r{
+      \A
+      foo_bar /
+      \h{8}    # 8 hex chars
+      (?: - \h{4} ){3}  # 3 groups of 4 hex chars (hyphen sep)
+      - \h{12}  # 12 hex chars (hyphen sep again)
+      \Z
+    }x
+    assert foo.id.match(uuid)
   end
 
   private