zedkit 1.1.4 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/zedkit/client/client.rb

@@ -39,7 +39,7 @@ module Zedkit
       def verify(username, password)
         submit_request(:verify, 'users/verify', nil, {}, { :user => username, :password => password })
       end
-      def get(resource, user_key, params = {})
+      def get(resource, user_key = nil, params = {})
         submit_request(:get, resource, user_key, params)
       end
 

data/lib/zedkit/rails/sessions.rb

@@ -23,14 +23,15 @@ module Zedkit
       set_last_seen if session[:last_seen].nil?
       return true   if session[:last_seen] > (Time.now.to_i - options[:idle_maximum_in_seconds])
       Rails.logger.info "Session has EXPIRED [#{options[:idle_maximum_in_seconds]}]"
+      end_session
       false
     end
     def session_fresh_with_redirect?(options = {})
       options[:idle_maximum_in_seconds] = 900 unless options.has_key? :idle_maximum_in_seconds
       options[:url] = new_session_url unless options.has_key? :url
       return true if session_fresh?(options)
-      end_session
       redirect_to options[:url]
+      end_session
       false
     end
 
@@ -63,15 +64,19 @@ module Zedkit
 
         Rails.logger.info "User Verification Request via Zedkit [#{login.downcase}]"
         Zedkit::Users.verify(:username => login.downcase, :password => password) do |json|
-          @user = json
-          session[:user_json] = @user          ## This does not contain the user's password.
-          cookies[:user_login] = { :value => login.downcase, :expires => 365.days.from_now }
+          Rails.logger.info "User VERIFIED [#{json['uuid']}]"
+          set_session(json, login.downcase)
           return true
         end
 
       else set_user_login end
       false
     end
+    def set_session(json, login)
+      @user = json
+      session[:user_json] = @user          ## This does not contain the user's password.
+      cookies[:user_login] = { :value => login.downcase, :expires => 365.days.from_now }
+    end
     def end_session
       session[:user_json] = nil
     end

data/lib/zedkit/resources/email_settings.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 EmailSettings
+    class << self
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "emails/settings/#{zks[:uuid]}", zks, [], &block)
+      end
+
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'emails/settings', zks, [], &block)
+      end
+
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "emails/settings/#{zks[:uuid]}", zks, [], &block)
+      end
+      
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "emails/settings/#{zks[:uuid]}", zks, [], &block)
+      end
+    end
+  end
+end

data/lib/zedkit/resources/emails.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 Emails
+    class << self
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "emails/#{zks[:uuid]}", zks, [], &block)
+      end
+
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'emails', zks, [], &block)
+      end
+
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "emails/#{zks[:uuid]}", zks, [], &block)
+      end
+      
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "emails/#{zks[:uuid]}", zks, [], &block)
+      end
+    end
+  end
+end

data/lib/zedkit/resources/projects.rb

@@ -36,12 +36,15 @@ module Zedkit
       end
 
       def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'projects', zks, [], &block)
       end
 
       def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "projects/#{zks[:uuid]}", zks, [], &block)
       end
       
       def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "projects/#{zks[:uuid]}", zks, [], &block)
       end
     end
 
@@ -73,5 +76,12 @@ module Zedkit
         end
       end
     end
+    class EmailSettings
+      class << self
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, 'emails/settings', zks, [], &block)
+        end
+      end
+    end
   end
 end

data/lib/zedkit/resources/users.rb

@@ -31,6 +31,9 @@ module Zedkit
       def create(zks = {}, &block)
         Zedkit::Client.crud(:create, 'users', zks, [], &block)
       end
+
+      def update(zks = {}, &block)
+      end
     end
 
     class Projects

data/lib/zedkit.rb

@@ -23,23 +23,23 @@ require 'zedkit/ext/hash.rb'
 
 module Zedkit
   class << self
-    def countries(user_key)
-      rs = Zedkit::Client.get('entities/countries', user_key)
+    def countries
+      rs = Zedkit::Client.get('entities/countries')
       if rs && block_given?
         rs.is_a?(Array) ? rs.each {|i| yield(i) } : yield(rs)
       end
       rs
     end
-    def regions(user_key, zks = {})
-      rs = Zedkit::Client.get('entities/regions', user_key, zks)
+    def regions(zks = {})
+      rs = Zedkit::Client.get('entities/regions', nil, zks)
       if rs && block_given?
         rs.is_a?(Array) ? rs.each {|i| yield(i) } : yield(rs)
       end
       rs
     end
 
-    def entities(user_key)
-      rs = Zedkit::Client.get('entities/zedkit', user_key)
+    def entities
+      rs = Zedkit::Client.get('entities/zedkit')
       if rs && block_given?
         rs.is_a?(Array) ? rs.each {|i| yield(i) } : yield(rs)
       end
@@ -80,5 +80,7 @@ require 'zedkit/instances/project.rb'
 
 require 'zedkit/resources/projects.rb'
 require 'zedkit/resources/users.rb'
+require 'zedkit/resources/emails.rb'
+require 'zedkit/resources/email_settings.rb'
 
 require 'zedkit/rails/sessions' if defined?(Rails::Railtie)

data/test/test_email_settings.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 TestEmailSettings < 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_emails.rb

@@ -18,4 +18,21 @@
 require 'helper'
 
 class TestEmails < 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_entities.rb

@@ -19,20 +19,26 @@ require 'helper'
 
 class TestEntities < Test::Unit::TestCase
   def test_entities
-    zkes = Zedkit.entities(@uu['user_key'])
+    zkes = Zedkit.entities
+    assert_not_nil zkes['languages']
+    assert_not_nil zkes['locales']
+    assert_not_nil zkes['timezones']
   end
   def test_entities_with_block
-    Zedkit.entities(@uu['user_key']) do |zkes|
+    Zedkit.entities do |zkes|
+      assert_not_nil zkes['languages']
+      assert_not_nil zkes['locales']
+      assert_not_nil zkes['timezones']
     end
   end
 
   def test_countries
-    cnts = Zedkit.countries(@uu['user_key'])
+    cnts = Zedkit.countries
     assert cnts.is_a? Array
     assert cnts.length >= 2
   end
   def test_countries_with_block
-    Zedkit.countries(@uu['user_key']) do |cnts|
+    Zedkit.countries do |cnts|
       assert_not_nil cnts['code']
       assert_not_nil cnts['name']
       assert_not_nil cnts['locale']
@@ -40,24 +46,24 @@ class TestEntities < Test::Unit::TestCase
   end
 
   def test_regions
-    rgss = Zedkit.regions(@uu['user_key'])
+    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' }
   end
   def test_regions_with_block
-    Zedkit.regions(@uu['user_key']) do |rgss|
+    Zedkit.regions do |rgss|
       assert_not_nil rgss['code']
       assert_not_nil rgss['name']
     end
   end
   def test_states_for_usa
-    rgss = Zedkit.regions(@uu['user_key'], :country => { :code => 'US' })
+    rgss = Zedkit.regions(:country => { :code => 'US' })
     assert rgss.is_a? Array
     assert_nil rgss.detect {|region| region['code'] == 'BC' }
   end
   def test_provinces_for_canada
-    rgss = Zedkit.regions(@uu['user_key'], :country => { :code => 'CA' })
+    rgss = Zedkit.regions(:country => { :code => 'CA' })
     assert rgss.is_a? Array
     assert_nil rgss.detect {|region| region['code'] == 'WA' }
   end

data/test/test_projects.rb

@@ -61,18 +61,36 @@ class TestProjects < Test::Unit::TestCase
   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']
   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']
+    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'],
+                                 :project => { :location => "new_location" })
+    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'],
+                              :project => { :location => "new_location" }) do |uu|
+        assert_equal 'http://new_location.zedapi.com', uu['location']
+        assert_equal pp['uuid'], uu['uuid']
+      end
+    end
   end
   
   def test_delete
-  end
-  def test_delete_with_block
+    assert_nil Zedkit::Projects.delete(:user_key => @uu['user_key'], :uuid => @uu['projects'][0])
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Zedkit
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: zedkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,9 +74,12 @@ files:
 - lib/zedkit/instances/instance.rb
 - lib/zedkit/instances/project.rb
 - lib/zedkit/rails/sessions.rb
+- lib/zedkit/resources/email_settings.rb
+- lib/zedkit/resources/emails.rb
 - lib/zedkit/resources/projects.rb
 - lib/zedkit/resources/users.rb
 - test/helper.rb
+- test/test_email_settings.rb
 - test/test_emails.rb
 - test/test_entities.rb
 - test/test_projects.rb
@@ -115,6 +118,7 @@ specification_version: 3
 summary: gem for Zedkit
 test_files: 
 - test/helper.rb
+- test/test_email_settings.rb
 - test/test_emails.rb
 - test/test_entities.rb
 - test/test_projects.rb