zedkit 1.1.3 → 1.1.4

data/VERSION

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

data/lib/zedkit.rb

@@ -19,7 +19,7 @@ require 'rubygems'
 require 'json'
 require 'nestful'
 
-Dir["#{File.dirname(__FILE__)}/zedkit/ext/*.rb"].each {|ci| require ci }
+require 'zedkit/ext/hash.rb'
 
 module Zedkit
   class << self
@@ -60,12 +60,25 @@ module Zedkit
     attr_accessor :configuration
     def configure
       self.configuration ||= Configuration.new
-      yield(configuration)
+      yield configuration
     end
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/zedkit/client/*.rb"].each {|ci| require ci }
-Dir["#{File.dirname(__FILE__)}/zedkit/cli/*.rb"].each {|ci| require ci }
-Dir["#{File.dirname(__FILE__)}/zedkit/instances/*.rb"].each {|ci| require ci }
-Dir["#{File.dirname(__FILE__)}/zedkit/resources/*.rb"].each {|ci| require ci }
+require 'zedkit/client/configuration.rb'
+require 'zedkit/client/client.rb'
+require 'zedkit/client/exceptions.rb'
+
+require 'zedkit/cli/bottom.rb'
+require 'zedkit/cli/exceptions.rb'
+require 'zedkit/cli/projects.rb'
+require 'zedkit/cli/runner.rb'
+require 'zedkit/cli/text.rb'
+
+require 'zedkit/instances/instance.rb'
+require 'zedkit/instances/project.rb'
+
+require 'zedkit/resources/projects.rb'
+require 'zedkit/resources/users.rb'
+
+require 'zedkit/rails/sessions' if defined?(Rails::Railtie)

data/lib/zedkit/cli/bottom.rb

@@ -15,17 +15,19 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
-module Zedkit::CLI
-  class Bottom
-    class << self
-      def method_missing(*args)
-        raise Zedkit::CLI::UnknownCommand.new(:message => "#{Zedkit::CLI.ee(args[1][:locale], :general, :unknown)}" \
-                                                                                                  << " [#{args[0]}]")
-      end
+module Zedkit
+  module CLI
+    class Bottom
+      class << self
+        def method_missing(*args)
+          raise Zedkit::CLI::UnknownCommand.new(:message => "#{Zedkit::CLI.ee(args[1][:locale], :general, :unknown)}" \
+                                                                                                    << " [#{args[0]}]")
+        end
 
-      protected
-      def dashes(length = 128)
-        Array.new(length, '-').join << "\n"
+        protected
+        def dashes(length = 128)
+          Array.new(length, '-').join << "\n"
+        end
       end
     end
   end

data/lib/zedkit/cli/text.rb

@@ -15,68 +15,70 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
-module Zedkit::CLI
-  class << self
-    def tt(locale, key, item)
-      Zedkit::CLI.lookup_tt("Zedkit::CLI", locale, key, item)
+module Zedkit
+  module CLI
+    class << self
+      def tt(locale, key, item)
+        Zedkit::CLI.lookup_tt("Zedkit::CLI", locale, key, item)
+      end
+      def ee(locale, key, item)
+        Zedkit::CLI.lookup_ee("Zedkit::CLI", locale, key, item)
+      end
     end
-    def ee(locale, key, item)
-      Zedkit::CLI.lookup_ee("Zedkit::CLI", locale, key, item)
-    end
-  end
 
-  LOCALES = %w(en).freeze
-  CONTENT = {
-    :en => {
-      :commands => {
-        :projects => "Project Commands",
-        :projects_list => "List Zedkit projects",
-        :projects_show => "Show Zedkit project details",
-        :projects_create => "Create a new Zedkit project",
-        :projects_update => "Update an existing Zedkit project",
-        :projects_delete => "Delete an existing Zedkit project"
+    LOCALES = %w(en).freeze
+    CONTENT = {
+      :en => {
+        :commands => {
+          :projects => "Project Commands",
+          :projects_list => "List Zedkit projects",
+          :projects_show => "Show Zedkit project details",
+          :projects_create => "Create a new Zedkit project",
+          :projects_update => "Update an existing Zedkit project",
+          :projects_delete => "Delete an existing Zedkit project"
+        }
       }
     }
-  }
-  ERRORS = {
-    :en => {
-      :runner => {
-        :credentials => "Missing Zedkit Credentials",
-        :zedkit_file => "Missing Zedkit Credentials in ~/.zedkit"
-      },
-      :general => {
-        :error => "Zedkit CLI ERROR.",
-        :message => "Message",
-        :section => "Unknown Section",
-        :unknown => "Unknown Command",
-        :not_done => "This operation is not yet implemented."
-      },
-      :project => {
-        :nil => "Project UUID is nil"
+    ERRORS = {
+      :en => {
+        :runner => {
+          :credentials => "Missing Zedkit Credentials",
+          :zedkit_file => "Missing Zedkit Credentials in ~/.zedkit"
+        },
+        :general => {
+          :error => "Zedkit CLI ERROR.",
+          :message => "Message",
+          :section => "Unknown Section",
+          :unknown => "Unknown Command",
+          :not_done => "This operation is not yet implemented."
+        },
+        :project => {
+          :nil => "Project UUID is nil"
+        }
       }
-    }
-  }.freeze
+    }.freeze
 
-  class << self
-    def lookup_tt(ch, locale, key, item)
-      rs = lookup(eval("#{ch}::CONTENT"), locale, key, item)
-      rs = lookup(eval("Zedkit::CLI::CONTENT"), locale, key, item) if rs.nil?
-      rs
-    end
-    def lookup_ee(ch, locale, key, item)
-      rs = lookup(eval("#{ch}::ERRORS"), locale, key, item)
-      rs = lookup(eval("Zedkit::CLI::ERRORS"), locale, key, item) if rs.nil?
-      rs
-    end
+    class << self
+      def lookup_tt(ch, locale, key, item)
+        rs = lookup(eval("#{ch}::CONTENT"), locale, key, item)
+        rs = lookup(eval("Zedkit::CLI::CONTENT"), locale, key, item) if rs.nil?
+        rs
+      end
+      def lookup_ee(ch, locale, key, item)
+        rs = lookup(eval("#{ch}::ERRORS"), locale, key, item)
+        rs = lookup(eval("Zedkit::CLI::ERRORS"), locale, key, item) if rs.nil?
+        rs
+      end
 
-    protected
-    def lookup(set, locale, key, item)
-      if set.has_key?(locale) && set[locale].has_key?(key) && set[locale][key].has_key?(item)
-        set[locale][key][item]
-      elsif set[:en].has_key?(key) && set[:en][key].has_key?(item)
-        set[:en][key][item]
-      else
-        nil end
+      protected
+      def lookup(set, locale, key, item)
+        if set.has_key?(locale) && set[locale].has_key?(key) && set[locale][key].has_key?(item)
+          set[locale][key][item]
+        elsif set[:en].has_key?(key) && set[:en][key].has_key?(item)
+          set[:en][key][item]
+        else
+          nil end
+      end
     end
   end
 end

data/lib/zedkit/client/client.rb

@@ -45,14 +45,15 @@ module Zedkit
 
       protected
       def submit_request(method, rs, user_key = nil, params = {}, options = {})
-        rvss = nil
+        rh = nil
         begin
-          http = http_request(method, resource_url(rs), user_key, params.flatten_zedkit_params!, options)
-          rvss = JSON.parse(http)
-          if rvss.is_a?(Hash) && rvss.has_key?('status') && Zedkit.configuration.exceptions?
-            raise DataValidationError.new(:http_code => 200, :api_code => rvss['status']['code'],
-                                          :message => rvss['status']['message'] << " [#{method.upcase} #{resource_url(rs)}]",
-                                          :errors => rvss['errors'])
+          http_request(method, resource_url(rs), user_key, params.flatten_zedkit_params!, options) do |nh|
+            rh = JSON.parse(nh)
+            if rh.is_a?(Hash) && rh.has_key?('status') && Zedkit.configuration.exceptions?
+              raise DataValidationError.new(:http_code => 200, :api_code => rh['status']['code'],
+                                            :errors => rh['errors'],
+                                            :message => rh['status']['message'] << " [#{method.upcase} #{resource_url(rs)}]")
+            end
           end
         rescue Net::HTTPBadResponse
           ## TBD
@@ -72,25 +73,23 @@ module Zedkit
                                 :message => "Access Denied to the Resource Requested [#{method.upcase} #{resource_url(rs)}]")
           end
         end
-        rvss
+        rh
       end
 
       private
-      def http_request(method, rs_url, uk, params, options)
-        http = nil
+      def http_request(method, rs_url, uk, params, options, &block)
         case method
         when :verify
-          http = Nestful.get(rs_url, options.merge({ :params => merged_params(params) }))
+          yield Nestful.get(rs_url, options.merge({ :params => merged_params(params) }))
         when :get
-          http = Nestful.get(rs_url, options.merge({ :params => merged_params(params, uk) }))
+          yield Nestful.get(rs_url, options.merge({ :params => merged_params(params, uk) }))
         when :post
-          http = Nestful.post(rs_url, options.merge({ :format => :form, :params => merged_params(params, uk) }))
+          yield Nestful.post(rs_url, options.merge({ :format => :form, :params => merged_params(params, uk) }))
         when :put
-          http = Nestful.put(rs_url, options.merge({ :format => :form, :params => merged_params(params, uk) }))
+          yield Nestful.put(rs_url, options.merge({ :format => :form, :params => merged_params(params, uk) }))
         when :delete
-          http = Nestful.delete(rs_url, options.merge({ :params => merged_params(params, uk) }))
+          Nestful.delete(rs_url, options.merge({ :params => merged_params(params, uk) }))
         end
-        http
       end
       def resource_url(rs)
         "#{Zedkit.configuration.api_url}/#{rs}"

data/lib/zedkit/rails/sessions.rb

@@ -0,0 +1,90 @@
+##
+# 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
+  module Sessions
+    protected
+    def session_fresh?(options = {})
+      options[:idle_maximum_in_seconds] = 900 unless options.has_key? :idle_maximum_in_seconds
+      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]}]"
+      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]
+      false
+    end
+
+    def has_session?
+      return true if @user && @user.is_a?(Hash)
+      if session[:user_json] && session[:user_json].is_a?(Hash)
+        @user = session[:user_json]
+        return true
+      end
+      false
+    end
+    def has_session_with_redirect?(url = root_url)
+      return true if has_session?
+      redirect_to url
+      false
+    end
+
+    def has_had_a_session?
+      set_user_login unless @user_login && @user_login.is_a?(String)
+      return true if @user_login.present?
+      false
+    end
+    def has_user_login?
+      @user_login.present?
+    end
+
+    def start_session(login, password)
+      case request.method.downcase.to_sym
+      when :post
+
+        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 }
+          return true
+        end
+
+      else set_user_login end
+      false
+    end
+    def end_session
+      session[:user_json] = nil
+    end
+
+    def set_user_login
+      cookies[:user_login] ? @user_login = cookies[:user_login] : @user_login = nil
+      Rails.logger.info "User Login SET [#{@user_login}]"
+    end
+    def set_last_seen
+      session[:last_seen] = Time.new.to_i
+    end
+    def set_logout_method(method)
+      session[:logout_method] = method
+    end
+  end
+end

data/test/test_projects.rb

@@ -114,13 +114,13 @@ class TestProjects < Test::Unit::TestCase
     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'] })
-    assert_equal ud, {}
+    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|
-      assert_equal ud, {}
+      assert_nil ud
     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: 2010-12-20 00:00:00 -08:00
 default_executable: zedkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - lib/zedkit/ext/hash.rb
 - lib/zedkit/instances/instance.rb
 - lib/zedkit/instances/project.rb
+- lib/zedkit/rails/sessions.rb
 - lib/zedkit/resources/projects.rb
 - lib/zedkit/resources/users.rb
 - test/helper.rb