zeddb 1.1.3 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/zeddb.rb

@@ -20,8 +20,8 @@ require 'zedkit'
 
 module ZedDB
   class << self
-    def entities(user_key)
-      rs = Zedkit::Client.get('entities/zeddb', user_key)
+    def entities
+      rs = Zedkit::Client.get('entities/zeddb')
       if rs && block_given?
         rs.is_a?(Array) ? rs.each {|i| yield(i) } : yield(rs)
       end
@@ -30,5 +30,15 @@ module ZedDB
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/zeddb/instances/*.rb"].each {|ci| require ci }
-Dir["#{File.dirname(__FILE__)}/zeddb/resources/*.rb"].each {|ci| require ci }
+require 'zeddb/instances/model.rb'
+require 'zeddb/instances/model_item.rb'
+require 'zeddb/instances/model_transformer.rb'
+require 'zeddb/instances/model_validation.rb'
+require 'zeddb/instances/project.rb'
+
+require 'zeddb/resources/models.rb'
+require 'zeddb/resources/model_associations.rb'
+require 'zeddb/resources/model_items.rb'
+require 'zeddb/resources/model_transformers.rb'
+require 'zeddb/resources/model_validations.rb'
+require 'zeddb/resources/projects.rb'

data/test/test_associations.rb

@@ -53,12 +53,12 @@ class TestAssociations < Test::Unit::TestCase
   def test_delete
     ma = ZedDB::ModelAssociations.delete(:user_key => @uu['user_key'],
                                          :uuid => pmodels.find {|i| i['name'] == 'bucket' }['associations'][0]['uuid'])
-    assert_equal ma, {}
+    assert_nil ma
   end
   def test_delete_with_block
     ZedDB::ModelAssociations.delete(:user_key => @uu['user_key'],
                                     :uuid => pmodels.find {|i| i['name'] == 'bucket' }['associations'][0]['uuid']) do |ma|
-      assert_equal ma, {}
+      assert_nil ma
     end
   end
 end

data/test/test_entities.rb

@@ -19,14 +19,14 @@ require 'helper'
 
 class TestEntities < Test::Unit::TestCase
   def test_get_entities
-    dbes = ZedDB.entities(@uu['user_key'])
+    dbes = ZedDB.entities
     assert_not_nil dbes['data_types']
     assert_not_nil dbes['validations']
     assert_not_nil dbes['transformers']
     assert_not_nil dbes['associations']
   end
   def test_entities_with_block
-    ZedDB.entities(@uu['user_key']) do |dbes|
+    ZedDB.entities do |dbes|
       assert_not_nil dbes['data_types']
       assert_not_nil dbes['validations']
       assert_not_nil dbes['transformers']

data/test/test_model_items.rb

@@ -22,14 +22,13 @@ class TestModelItems < Test::Unit::TestCase
     md = ZedDB::Models.get(:user_key => @uu['user_key'], :uuid => pmodels.find {|i| i['name'] == 'item' }['uuid'])
     mi = ZedDB::ModelItems.get(:user_key => @uu['user_key'], :uuid => md['items'][0]['uuid'])
     assert_equal 32, mi['uuid'].length
-    assert_equal 'cool', mi['name']
     assert_equal 'STRING', mi['type']['code']
   end
   def test_get_with_block
     md = ZedDB::Models.get(:user_key => @uu['user_key'], :uuid => pmodels.find {|i| i['name'] == 'item' }['uuid'])
     ZedDB::ModelItems.get(:user_key => @uu['user_key'], :uuid => md['items'][0]['uuid']) do |mi|
       assert_equal 32, mi['uuid'].length
-      assert_equal 'cool', mi['name']
+      assert_equal 'STRING', mi['type']['code']
     end
   end
 
@@ -68,12 +67,12 @@ class TestModelItems < Test::Unit::TestCase
   def test_delete
     md = ZedDB::Models.get(:user_key => @uu['user_key'], :uuid => pmodels.find {|i| i['name'] == 'item' }['uuid'])
     mi = ZedDB::ModelItems.delete(:user_key => @uu['user_key'], :uuid => md['items'][0]['uuid'])
-    assert_equal mi, {}
+    assert_nil mi
   end
   def test_delete_with_block
     md = ZedDB::Models.get(:user_key => @uu['user_key'], :uuid => pmodels.find {|i| i['name'] == 'item' }['uuid'])
     ZedDB::ModelItems.delete(:user_key => @uu['user_key'], :uuid => md['items'][0]['uuid']) do |mi|
-      assert_equal mi, {}
+      assert_nil mi
     end
   end
 end

data/test/test_models.rb

@@ -62,11 +62,11 @@ class TestModels < Test::Unit::TestCase
 
   def test_delete
     md = ZedDB::Models.delete(:user_key => @uu['user_key'], :uuid => pmodels.find {|m| m['name'] == 'bucket' }['uuid'])
-    assert_equal md, {}
+    assert_nil md
   end
   def test_delete_with_block
     ZedDB::Models.delete(:user_key => @uu['user_key'], :uuid => pmodels.find {|m| m['name'] == 'bucket' }['uuid']) do |md|
-      assert_equal md, {}
+      assert_nil md
     end
   end
 end

data/test/test_transformers.rb

@@ -49,12 +49,12 @@ class TestTransformers < Test::Unit::TestCase
   def test_delete
     mt = ZedDB::ModelTransformers.delete(:user_key => @uu['user_key'], :item => { :uuid => item_model['items'][0]['uuid'] },
                                          :uuid => item_model['items'][0]['transformers'][0]['uuid'])
-    assert_equal mt, {}
+    assert_nil mt
   end
   def test_delete_with_block
     ZedDB::ModelTransformers.delete(:user_key => @uu['user_key'], :item => { :uuid => item_model['items'][0]['uuid'] },
                                     :uuid => item_model['items'][0]['transformers'][0]['uuid']) do |mt|
-      assert_equal mt, {}
+      assert_nil mt
     end
   end
 end

data/test/test_validations.rb

@@ -62,12 +62,12 @@ class TestValidations < Test::Unit::TestCase
   def test_delete
     mv = ZedDB::ModelValidations.delete(:user_key => @uu['user_key'], :item => { :uuid => item_model['items'][0]['uuid'] },
                                         :uuid => item_model['items'][0]['validations'][0]['uuid'])
-    assert_equal mv, {}
+    assert_nil mv
   end
   def test_delete_with_block
     ZedDB::ModelValidations.delete(:user_key => @uu['user_key'], :item => { :uuid => item_model['items'][0]['uuid'] },
                                    :uuid => item_model['items'][0]['validations'][0]['uuid']) do |mv|
-      assert_equal mv, {}
+      assert_nil mv
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Zedkit
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: zeddb
 dependencies: 
 - !ruby/object:Gem::Dependency