acts_as_kaltura 1.2.1 → 1.3.0

data/lib/acts_as_kaltura.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext'
 require 'acts_as_kaltura/version'
 require 'acts_as_kaltura/two_way_attr_accessor'
 require 'acts_as_kaltura/config'
+require 'acts_as_kaltura/client'
 require 'acts_as_kaltura/callbacks'
 require 'acts_as_kaltura/delegator'
 require 'acts_as_kaltura/extension'
@@ -15,6 +16,7 @@ end
 module ActiveRecord
   class Base
     include ActsAsKaltura::Config
+    include ActsAsKaltura::Client
     include ActsAsKaltura::Callbacks
     include ActsAsKaltura::Delegator
     include ActsAsKaltura::Video

data/lib/acts_as_kaltura/category.rb

@@ -5,7 +5,9 @@ module ActsAsKaltura
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def acts_as_kaltura_category
+      def acts_as_kaltura_category(options = {})
+        self._kaltura_options = options
+
         before_create :create_kaltura_category
         before_update :update_kaltura_category
         before_destroy :destroy_kaltura_category
@@ -20,6 +22,12 @@ module ActsAsKaltura
       end
     end
 
+    def kaltura_parent_categories
+      filter = Kaltura::Filter::CategoryFilter.new
+      filter.parent_id_equal = 0
+      local_or_global_kaltura_client.category_service.list(filter)
+    end
+
     def kaltura_category
       if @kaltura_category.nil? && self.kaltura_category_key.present?
         @kaltura_category = self.class.kaltura_client.
@@ -48,7 +56,7 @@ module ActsAsKaltura
     private
       def create_kaltura_category
         if kaltura_reference_found?
-          @kaltura_category = self.class.kaltura_client.
+          @kaltura_category = local_or_global_kaltura_client.
               category_service.add self.as_kaltura_category
           self.kaltura_category_key = @kaltura_category.id
         end
@@ -56,14 +64,14 @@ module ActsAsKaltura
 
       def update_kaltura_category
         if self.kaltura_category_key.present?
-          @kaltura_category = self.class.kaltura_client.category_service.
+          @kaltura_category = local_or_global_kaltura_client.category_service.
               update(self.kaltura_category_key, self.as_kaltura_category)
         end
       end
 
       def destroy_kaltura_category
         if self.kaltura_category_key.present?
-          self.class.kaltura_client.category_service.
+          local_or_global_kaltura_client.category_service.
               delete(self.kaltura_category_key)
           @kaltura_category = nil
         end

data/lib/acts_as_kaltura/client.rb

@@ -0,0 +1,107 @@
+require 'active_support/concern'
+
+module ActsAsKaltura
+  module Client
+    extend ActiveSupport::Concern
+
+    class Logger
+      def log(*args)
+        puts args
+      end
+    end
+
+    included do
+      class_eval <<-CODE
+        attr_accessor :_instance_kaltura_client
+        cattr_accessor :_kaltura_client
+      CODE
+    end
+
+    # Find an existing client instance or create one based on :setting_scope
+    # configuration.
+    # Returns kaltura client instance.
+    def kaltura_client
+      @kaltura_client ||= _create_kaltura_client
+    end
+
+    # Find local kaltura client instance if overrode over :setting_scope
+    # otherwise return the global client instance
+    def local_or_global_kaltura_client
+      if self.class.overrode_kaltura_client?
+        self.kaltura_client
+      else
+        self.class.kaltura_client
+      end
+    end
+
+    def _create_kaltura_client
+      @@_kaltura_clients ||= {}
+      config_callback = self._kaltura_options[:setting_scope]
+
+      unless config_callback.present?
+        raise "acts_as_kaltura_... :setting_scope => ... is not defined."
+      end
+
+      configs = config_callback.call(self)
+      @@_kaltura_clients[configs] ||= self.class.create_kaltura_client(configs)
+    end
+
+    module ClassMethods
+
+      # Create or return an existing kaltura client instance for the given
+      # environment. If configuration is based on instance. Create or return
+      # kaltura client instance for the given configuration and set it on
+      # +_instance_kaltura_client+ .
+      def kaltura_client(env = Rails.env.to_s)
+        if self._kaltura_client.nil?
+          self._kaltura_client = create_kaltura_client(kaltura_configs(env))
+        end
+
+        self._kaltura_client
+      end
+
+      def reload_kaltura_client(env = Rails.env.to_s)
+        self._kaltura_client = nil
+        self.kaltura_client(env)
+      end
+
+      def create_kaltura_client(configs)
+        config = _create_kaltura_config(configs)
+
+        Kaltura::Client.new(config).tap do |client|
+          session   = client.session_service.start(
+              configs[:admin_secret], '',
+              Kaltura::Constants::SessionType::ADMIN
+          )
+          client.ks = session
+        end
+      end
+
+    private
+
+      def _create_kaltura_config(configs)
+        Kaltura::Configuration.new(configs[:partner_id]).tap do |config|
+          if configs[:timeout].present?
+            config.timeout = configs[:timeout]
+          end
+
+          if configs[:debug]
+            config.logger = ActsAsKaltura::Client::Logger.new
+            _debug_response
+          end
+        end
+      end
+
+      def _debug_response
+        if %w(test development).include?(Rails.env)
+          Kaltura::ClientBase.class_eval <<-CODE
+            def parse_to_objects(data)
+              puts data
+              parse_xml_to_objects(data)
+            end
+          CODE
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_kaltura/config.rb

@@ -12,80 +12,39 @@ module ActsAsKaltura
     end
 
     included do
-      @@_kaltura_config_file = nil
-
-      class << self
-        def _kaltura_config_file=(file)
-          @@_kaltura_config_file = file
-        end
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        class_attribute :_kaltura_config_file, :_kaltura_configs
+        class_attribute :_kaltura_options, :instance_writer => false
 
         def _kaltura_config_file
           if @@_kaltura_config_file.nil?
-            @@_kaltura_config_file = Rails.root.join('config', 'kaltura.yml').to_s
+            @@_kaltura_config_file = (defined?(Rails) ? Rails.root : File).join('config', 'kaltura.yml').to_s
           end
 
           @@_kaltura_config_file
         end
-      end
-
-      cattr_accessor :_kaltura_client
-      cattr_accessor :_company_setting
+      CODE
     end
 
     module ClassMethods
-      def kaltura_configs(env = Rails.env.to_s)
-        if !defined?(@@_kaltura_configs)
-          @@_kaltura_configs = YAML.load(File.read(_kaltura_config_file)).with_indifferent_access
-        end
 
-        @@_kaltura_configs[env]
+      def overrode_kaltura_client?
+        _kaltura_options.include?(:setting_scope)
       end
 
-      def kaltura_client(env = Rails.env.to_s)
-        if _kaltura_client.nil?
-          if _company_setting.present?
-             configs = _company_setting
-          else
-            configs = kaltura_configs(env)
-          end
-
-          config  = Kaltura::Configuration.new(configs[:partner_id])
-
-          # Set timeout if mentioned in configuration
-          if configs[:timeout].present?
-            config.timeout = configs[:timeout]
-          end
-
-          # Set debug logger if mentioned in configuration
-          if configs[:debug]
-            config.logger = ActsAsKaltura::Config::Logger.new
-            _debug_response
-          end
-
-          client          = Kaltura::Client.new(config)
-          session         = client.session_service.start(
-              configs[:admin_secret], '', Kaltura::Constants::SessionType::ADMIN)
-          client.ks       = session
-          _kaltura_client = client
+      # Read kaltura YAML file and retrieve configuration for the given
+      # environment. Returns a hash of kaltura configuration.
+      #
+      #   kaltura_config('production')
+      #
+      def kaltura_configs(env = Rails.env.to_s)
+        if self._kaltura_configs.nil?
+          self._kaltura_configs =
+              YAML.load(File.read(self._kaltura_config_file)).
+                  with_indifferent_access
         end
 
-        _kaltura_client
-      end
-
-      def reload_kaltura_client(env = Rails.env.to_s)
-        _kaltura_client = nil
-        kaltura_client
-      end
-
-      def _debug_response
-        if ['test', 'development'].include?(Rails.env)
-          Kaltura::ClientBase.class_eval do
-            def parse_to_objects(data)
-              puts data
-              parse_xml_to_objects(data)
-            end
-          end
-        end
+        self._kaltura_configs[env]
       end
     end
   end

data/lib/acts_as_kaltura/video.rb

@@ -8,10 +8,6 @@ module ActsAsKaltura
     class NoUploadedTokenFound < ::StandardError; end
     class KalturaVideoAddFailure < ::StandardError; end
 
-    included do
-      class_attribute :_kaltura_options, :instance_writer => false
-    end
-
     module ClassMethods
       def acts_as_kaltura_video(options = { })
         # Set instance accessors
@@ -27,7 +23,6 @@ module ActsAsKaltura
         validates :video_file, :presence => { :on => :create }
 
         # Set filters
-        after_validation :init_setting_scope
         before_save :process_uploaded_video_file
         before_create :create_kaltura_video_entry
         before_update :update_kaltura_video_entry
@@ -39,14 +34,6 @@ module ActsAsKaltura
     # Push user uploaded video file to kaltura server
     # If successful set upload token with the object
     #
-
-    def init_setting_scope
-      if self._kaltura_options[:setting_scope].present?
-        setting = self._kaltura_options[:setting_scope]
-        self.class._company_setting = setting.call(self)
-      end
-    end
-
     def process_uploaded_video_file
       if @video_file.present?
         video_file_stream     = if @video_file.respond_to?(:path, true)
@@ -54,12 +41,13 @@ module ActsAsKaltura
         else
           @video_file
         end
-        @uploaded_video_token = self.class.kaltura_client.
+        @uploaded_video_token = local_or_global_kaltura_client.
             media_service.upload(video_file_stream)
         raise ActsAsKaltura::Video::NoUploadedTokenFound if @uploaded_video_token.nil?
       end
     end
 
+    #
     # Create kaltura video entry based on current video data
     # if successful set kaltura id
     #
@@ -122,14 +110,14 @@ module ActsAsKaltura
     private
     def add_kaltuar_video_file(entry)
       if @video_file && @uploaded_video_token
-        self.class.kaltura_client.media_service.
+        local_or_global_kaltura_client.media_service.
             add_from_uploaded_file(entry, @uploaded_video_token)
       end
     end
 
     def update_kaltura_entry(entry)
       if kaltura_key.present?
-        self.class.kaltura_client.media_service.update(kaltura_key, entry)
+        local_or_global_kaltura_client.media_service.update(kaltura_key, entry)
         self.kaltura_syncd_at = Time.now
       end
     end
@@ -137,7 +125,7 @@ module ActsAsKaltura
     def find_kaltura_entry
       if kaltura_key
         if @kaltura_entry.nil?
-          @kaltura_entry = self.class.kaltura_client.media_service.get(kaltura_key)
+          @kaltura_entry = local_or_global_kaltura_client.media_service.get(kaltura_key)
         end
 
         @kaltura_entry
@@ -146,7 +134,7 @@ module ActsAsKaltura
 
     def destroy_kaltura_entry
       if kaltura_key
-        self.class.kaltura_client.media_service.delete(kaltura_key)
+        local_or_global_kaltura_client.media_service.delete(kaltura_key)
         @kaltura_entry = nil
       end
     rescue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_kaltura
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154510640 !ruby/object:Gem::Requirement
+  requirement: &2152378260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154510640
+  version_requirements: *2152378260
 - !ruby/object:Gem::Dependency
   name: velir_kaltura-ruby
-  requirement: &2154510120 !ruby/object:Gem::Requirement
+  requirement: &2152376220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154510120
+  version_requirements: *2152376220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154509620 !ruby/object:Gem::Requirement
+  requirement: &2152395540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154509620
+  version_requirements: *2152395540
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2154509100 !ruby/object:Gem::Requirement
+  requirement: &2152394240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154509100
+  version_requirements: *2152394240
 description: Acts as kaltura
 email:
 - hasan@somewherein.net
@@ -69,6 +69,7 @@ files:
 - lib/acts_as_kaltura/annotation.rb
 - lib/acts_as_kaltura/callbacks.rb
 - lib/acts_as_kaltura/category.rb
+- lib/acts_as_kaltura/client.rb
 - lib/acts_as_kaltura/config.rb
 - lib/acts_as_kaltura/delegator.rb
 - lib/acts_as_kaltura/extension.rb