zedkit 1.1.5 → 1.2.0

data/lib/zedkit/resources/shortened_urls.rb

@@ -0,0 +1,38 @@
+#
+# Copyright (c) Zedkit.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module Zedkit
+  class ShortenedUrls
+    class << self
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "urls/#{zks[:uuid]}", zks, %(uuid), &block)
+      end
+
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, "urls", zks, [], &block)
+      end
+
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "urls/#{zks[:uuid]}", zks, %(uuid), &block)
+      end
+
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "urls/#{zks[:uuid]}", zks, %(uuid), &block)
+      end
+    end
+  end
+end

data/lib/zedkit/resources/shorteners.rb

@@ -0,0 +1,46 @@
+#
+# Copyright (c) Zedkit.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module Zedkit
+  class Shorteners
+    class << self
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "shorteners/#{zks[:uuid]}", zks, [], &block)
+      end
+
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, "shorteners", zks, [], &block)
+      end
+
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "shorteners/#{zks[:uuid]}", zks, %(uuid), &block)
+      end
+
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "shorteners/#{zks[:uuid]}", zks, %(uuid), &block)
+      end
+    end
+
+    class Urls
+      class << self
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "urls", zks, [], &block)
+        end
+      end
+    end
+  end
+end

data/lib/zedkit/resources/users.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,13 +13,13 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
 module Zedkit
   class Users
     class << self
       def verify(zks = {}, &block)
-        rs = Zedkit::Client.verify(zks[:username], zks[:password])
+        rs = Zedkit::Client.verify(zks[:login], zks[:password])
         yield(rs) if rs && block_given?
         rs
       end
@@ -29,7 +29,7 @@ module Zedkit
       end
 
       def create(zks = {}, &block)
-        Zedkit::Client.crud(:create, 'users', zks, [], &block)
+        Zedkit::Client.crud(:create, "users", zks, [], &block)
       end
 
       def update(zks = {}, &block)
@@ -39,7 +39,7 @@ module Zedkit
     class Projects
       class << self
         def get(zks = {}, &block)
-          Zedkit::Client.crud(:get, 'projects', zks, [], &block)
+          Zedkit::Client.crud(:get, "projects", zks, [], &block)
         end
       end
     end

data/test/helper.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,29 +13,29 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
-require 'test/unit'
-require 'rubygems'
-require 'zedkit'
+require "test/unit"
+require "rubygems"
+require "zedkit"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 class Test::Unit::TestCase
-  TEST_GEMS_PROJECT_KEY = 'BE1OZog8gJogtQTosh'
-  TEST_GEMS_LOCALES_KEY = '6yca7DsnBvaDVupKEZ'
-  TEST_GEMS_LOGIN = 'gems@zedkit.com'
-  TEST_GEMS_LACKY = 'gems_lacky@zedkit.com'
-  TEST_GEMS_TEMP  = 'temp@zedkit.com'
-  TEST_GEMS_PASSWORD = 'NGIaDhr5vDlXo1tDs6bW3Gd'
+  TEST_GEMS_PROJECT_KEY = "BE1OZog8gJogtQTosh"
+  TEST_GEMS_LOCALES_KEY = "6yca7DsnBvaDVupKEZ"
+  TEST_GEMS_LOGIN = "gems@zedkit.com"
+  TEST_GEMS_LACKY = "lacky@zedkit.com"
+  TEST_GEMS_TEMP  = "temp@zedkit.com"
+  TEST_GEMS_PASSWORD = "NGIaDhr5vDlXo1tDs6bW3Gd"
 
   def setup
     Zedkit.configure do |zk|
+      zk.api_host = "127.0.0.1"
+      zk.api_port = "3000"
       zk.project_key = TEST_GEMS_PROJECT_KEY
-      # zk.api_host = '0.0.0.0'
-      # zk.api_port = 5010
     end
-    @uu = Zedkit::Users.verify(:username => TEST_GEMS_LOGIN, :password => TEST_GEMS_PASSWORD)
+    @uu = Zedkit::Users.verify(:login => TEST_GEMS_LOGIN, :password => TEST_GEMS_PASSWORD)
   end
 end

data/test/test_blog_posts.rb

@@ -0,0 +1,38 @@
+#
+# Copyright (c) Zedkit.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require "helper"
+
+class TestBlogPosts < Test::Unit::TestCase
+  def test_get
+  end
+  def test_get_with_block
+  end
+
+  def test_create
+  end
+  def test_create_with_block
+  end
+
+  def test_update
+  end
+  def test_update_with_block
+  end
+
+  def test_delete
+  end
+end

data/test/test_blogs.rb

@@ -0,0 +1,41 @@
+#
+# Copyright (c) Zedkit.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require "helper"
+
+class TestBlogs < Test::Unit::TestCase
+  def test_get
+  end
+  def test_get_with_block
+  end
+
+  def test_create
+    bb = Zedkit::Blogs.create(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] },
+                              :blog => { :name => "whatever" })
+    assert_equal "whatever", bb["name"]
+  end
+  def test_create_with_block
+  end
+
+  def test_update
+  end
+  def test_update_with_block
+  end
+
+  def test_delete
+  end
+end

data/test/test_email_settings.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,9 +13,9 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
-require 'helper'
+require "helper"
 
 class TestEmailSettings < Test::Unit::TestCase
   def test_get

data/test/test_emails.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,9 +13,9 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
-require 'helper'
+require "helper"
 
 class TestEmails < Test::Unit::TestCase
   def test_get

data/test/test_entities.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,22 +13,22 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
-require 'helper'
+require "helper"
 
 class TestEntities < Test::Unit::TestCase
   def test_entities
     zkes = Zedkit.entities
-    assert_not_nil zkes['languages']
-    assert_not_nil zkes['locales']
-    assert_not_nil zkes['timezones']
+    assert_not_nil zkes["languages"]
+    assert_not_nil zkes["locales"]
+    assert_not_nil zkes["timezones"]
   end
   def test_entities_with_block
     Zedkit.entities do |zkes|
-      assert_not_nil zkes['languages']
-      assert_not_nil zkes['locales']
-      assert_not_nil zkes['timezones']
+      assert_not_nil zkes["languages"]
+      assert_not_nil zkes["locales"]
+      assert_not_nil zkes["timezones"]
     end
   end
 
@@ -39,32 +39,32 @@ class TestEntities < Test::Unit::TestCase
   end
   def test_countries_with_block
     Zedkit.countries do |cnts|
-      assert_not_nil cnts['code']
-      assert_not_nil cnts['name']
-      assert_not_nil cnts['locale']
+      assert_not_nil cnts["code"]
+      assert_not_nil cnts["name"]
+      assert_not_nil cnts["locale"]
     end
   end
 
   def test_regions
     rgss = Zedkit.regions
     assert rgss.is_a? Array
-    assert_not_nil rgss.detect {|region| region['code'] == 'WA' }
-    assert_not_nil rgss.detect {|region| region['code'] == 'BC' }
+    assert_not_nil rgss.detect {|region| region["code"] == "WA" }
+    assert_not_nil rgss.detect {|region| region["code"] == "BC" }
   end
   def test_regions_with_block
     Zedkit.regions do |rgss|
-      assert_not_nil rgss['code']
-      assert_not_nil rgss['name']
+      assert_not_nil rgss["code"]
+      assert_not_nil rgss["name"]
     end
   end
   def test_states_for_usa
-    rgss = Zedkit.regions(:country => { :code => 'US' })
+    rgss = Zedkit.regions(:country => { :code => "US" })
     assert rgss.is_a? Array
-    assert_nil rgss.detect {|region| region['code'] == 'BC' }
+    assert_nil rgss.detect {|region| region["code"] == "BC" }
   end
   def test_provinces_for_canada
-    rgss = Zedkit.regions(:country => { :code => 'CA' })
+    rgss = Zedkit.regions(:country => { :code => "CA" })
     assert rgss.is_a? Array
-    assert_nil rgss.detect {|region| region['code'] == 'WA' }
+    assert_nil rgss.detect {|region| region["code"] == "WA" }
   end
 end

data/test/test_projects.rb

@@ -1,4 +1,4 @@
-##
+#
 # Copyright (c) Zedkit.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -13,97 +13,107 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##
+#
 
-require 'helper'
+require "helper"
 
 class TestProjects < Test::Unit::TestCase
+  def test_snapshot
+    sn = Zedkit::Projects.snapshot(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    assert_not_nil sn["project"]
+  end
+  def test_snapshot_with_block
+    Zedkit::Projects.snapshot(:user_key => @uu["user_key"], :uuid => @uu["projects"][0]) do |sn|
+      assert_not_nil sn["project"]
+    end
+  end
+
   def test_does_not_verify_invalid_locales_key
-    assert_nil Zedkit::Projects.verify(:locales, 'not.a.valid.key')
+    assert_nil Zedkit::Projects.verify(:locales, "not.a.valid.key")
   end
   def test_verify_locales_key
     pp = Zedkit::Projects.verify(:locales, TEST_GEMS_LOCALES_KEY)
-    assert_equal 32, pp['uuid'].length
-    assert_equal 'Zedkit Gems', pp['name']
+    assert_equal 32, pp["uuid"].length
+    assert_equal "Zedkit Gems", pp["name"]
   end
   def test_verify_locales_key_with_block
     Zedkit::Projects.verify(:locales, TEST_GEMS_LOCALES_KEY) do |pp|
-      assert_equal 32, pp['uuid'].length
-      assert_equal 'Zedkit Gems', pp['name']
+      assert_equal 32, pp["uuid"].length
+      assert_equal "Zedkit Gems", pp["name"]
     end
   end
 
   def test_verify_project_key
     pp = Zedkit::Projects.verify(:project)
-    assert_equal 32, pp['uuid'].length
-    assert_equal 'Zedkit Gems', pp['name']
+    assert_equal 32, pp["uuid"].length
+    assert_equal "Zedkit Gems", pp["name"]
   end
   def test_verify_project_key_with_block
     Zedkit::Projects.verify(:project) do |pp|
-      assert_equal 32, pp['uuid'].length
-      assert_equal 'Zedkit Gems', pp['name']
+      assert_equal 32, pp["uuid"].length
+      assert_equal "Zedkit Gems", pp["name"]
     end
   end
 
 
   def test_get
-    pp = Zedkit::Projects.get(:user_key => @uu['user_key'], :uuid => @uu['projects'][0])
-    assert_equal 'Zedkit Gems', pp['name']
-    assert_not_nil pp['uuid']
-    assert_not_nil pp['locales']
-    assert_not_nil pp['location']
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    assert_equal "Zedkit Gems", pp["name"]
+    assert_not_nil pp["uuid"]
+    assert_not_nil pp["locales"]
+    assert_not_nil pp["location"]
   end
   def test_get_with_block
-    Zedkit::Projects.get(:user_key => @uu['user_key'], :uuid => @uu['projects'][0]) do |pp|
-      assert_equal 'Zedkit Gems', pp['name']
-      assert_not_nil pp['uuid']
+    Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0]) do |pp|
+      assert_equal "Zedkit Gems", pp["name"]
+      assert_not_nil pp["uuid"]
     end
   end
 
   def test_create
-    pp = Zedkit::Projects.create(:user_key => @uu['user_key'], :project => { :name => "new_project" })
-    assert_not_nil pp['location']
-    assert_equal 'new_project', pp['name']
+    pp = Zedkit::Projects.create(:user_key => @uu["user_key"], :project => { :name => "new_project" })
+    assert_not_nil pp["location"]
+    assert_equal "new_project", pp["name"]
   end
   def test_create_with_block
-    Zedkit::Projects.create(:user_key => @uu['user_key'], :project => { :name => "new_project" }) do |pp|
-      assert_not_nil pp['location']
-      assert_equal 'new_project', pp['name']
+    Zedkit::Projects.create(:user_key => @uu["user_key"], :project => { :name => "new_project" }) do |pp|
+      assert_not_nil pp["location"]
+      assert_equal "new_project", pp["name"]
     end
   end
 
   def test_update
-    pp = Zedkit::Projects.get(:user_key => @uu['user_key'], :uuid => @uu['projects'][0])
-    uu = Zedkit::Projects.update(:user_key => @uu['user_key'], :uuid => pp['uuid'],
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    uu = Zedkit::Projects.update(:user_key => @uu["user_key"], :uuid => pp["uuid"],
                                  :project => { :location => "new_location" })
-    assert_equal 'http://new_location.zedapi.com', uu['location']
-    assert_equal pp['uuid'], uu['uuid']
+    assert_equal "http://new_location.zedapi.com", uu["location"]
+    assert_equal pp["uuid"], uu["uuid"]
   end
   def test_update_with_block
-    Zedkit::Projects.get(:user_key => @uu['user_key'], :uuid => @uu['projects'][0]) do |pp|
-      Zedkit::Projects.update(:user_key => @uu['user_key'], :uuid => pp['uuid'],
+    Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0]) do |pp|
+      Zedkit::Projects.update(:user_key => @uu["user_key"], :uuid => pp["uuid"],
                               :project => { :location => "new_location" }) do |uu|
-        assert_equal 'http://new_location.zedapi.com', uu['location']
-        assert_equal pp['uuid'], uu['uuid']
+        assert_equal "http://new_location.zedapi.com", uu["location"]
+        assert_equal pp["uuid"], uu["uuid"]
       end
     end
   end
   
   def test_delete
-    assert_nil Zedkit::Projects.delete(:user_key => @uu['user_key'], :uuid => @uu['projects'][0])
+    assert_nil Zedkit::Projects.delete(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
   end
 
 
   def test_get_user_connections
-    us = Zedkit::Projects::Users.get(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] })
+    us = Zedkit::Projects::ProjectAdmins.get(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] })
     assert us.is_a? Array
-    assert_equal 3, us.length
-    assert us.detect {|pu| pu['user']['uuid'] == @uu['uuid'] }
+    assert_equal 2, us.length
+    assert us.detect {|pu| pu["user"]["uuid"] == @uu["uuid"] }
   end
   def test_get_user_connections_in_block
-    Zedkit::Projects::Users.get(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] }) do |pu|
-      assert_not_nil pu['user']['uuid']
-      assert_not_nil pu['role']
+    Zedkit::Projects::ProjectAdmins.get(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] }) do |pu|
+      assert_not_nil pu["user"]["uuid"]
+      assert_not_nil pu["role"]
     end
   end
 
@@ -113,45 +123,53 @@ class TestProjects < Test::Unit::TestCase
   end
 
   def test_update_user_connection
-    lk = Zedkit::Users.verify(:username => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
-    uu = Zedkit::Projects::Users.update(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
-                                                                      :user => { :uuid => lk['uuid'], :role => 'C' })
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    lk = Zedkit::Users.verify(:login => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
+    uu = Zedkit::ProjectAdmins.update(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] },
+                                                                    :admin => { :uuid => pp["admins"][1] },
+                                                                    :user => { :role => "P" })
     assert uu.is_a? Hash
-    assert_equal 'C', uu['role']['code']
+    assert_equal "P", uu["role"]["code"]
   end
   def test_update_user_connection_with_block
-    lk = Zedkit::Users.verify(:username => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
-    Zedkit::Projects::Users.update(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
-                                                                 :user => { :uuid => lk['uuid'], :role => 'C' }) do |uu|
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    lk = Zedkit::Users.verify(:login => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
+    Zedkit::ProjectAdmins.update(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] },
+                                                               :admin => { :uuid => pp["admins"][1] },
+                                                               :user => { :role => "P" }) do |uu|
       assert uu.is_a? Hash
-      assert_equal 'C', uu['role']['code']
+      assert_equal "P", uu["role"]["code"]
     end
   end
 
   def test_delete_user_connection
-    lk = Zedkit::Users.verify(:username => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
-    ud = Zedkit::Projects::Users.delete(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
-                                                                      :user => { :uuid => lk['uuid'] })
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    lk = Zedkit::Users.verify(:login => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
+    ud = Zedkit::ProjectAdmins.delete(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] },
+                                                                    :admin => { :uuid => pp["admins"][1] },
+                                                                    :user => { :uuid => lk["uuid"] })
     assert_nil ud
   end
   def test_delete_user_connection_with_block
-    lk = Zedkit::Users.verify(:username => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
-    Zedkit::Projects::Users.delete(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
-                                                                 :user => { :uuid => lk['uuid'] }) do |ud|
+    pp = Zedkit::Projects.get(:user_key => @uu["user_key"], :uuid => @uu["projects"][0])
+    lk = Zedkit::Users.verify(:login => TEST_GEMS_LACKY, :password => TEST_GEMS_PASSWORD)
+    Zedkit::ProjectAdmins.delete(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] },
+                                                               :admin => { :uuid => pp["admins"][1] },
+                                                               :user => { :uuid => lk["uuid"] }) do |ud|
       assert_nil ud
     end
   end
 
 
   def test_get_emails
-    ee = Zedkit::Projects::Emails.get(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] })
-    assert_not_nil ee
-    assert ee.is_a? Array
+    # ee = Zedkit::Projects::Emails.get(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] })
+    # assert_not_nil ee
+    # assert ee.is_a? Array
   end
   def test_get_emails_with_block
-    Zedkit::Projects::Emails.get(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] }) do |ee|
-      assert_not_nil ee
-      assert ee.is_a? Array
-    end
+    # Zedkit::Projects::Emails.get(:user_key => @uu["user_key"], :project => { :uuid => @uu["projects"][0] }) do |ee|
+    #   assert_not_nil ee
+    #   assert ee.is_a? Array
+    # end
   end
 end