acts_as_kaltura 1.0.3 → 1.0.4

data/lib/acts_as_kaltura/annotation.rb

@@ -15,47 +15,44 @@ module ActsAsKaltura
       end
     end
 
-    module InstanceMethods
+    def create_kaltura_annotation
+      if self.cuepoint_key.nil?
+        @kaltura_annotation = self.class.kaltura_client.cuepoint_service.
+            add( self.as_annotation_cuepoint )
+        raise KalturaAnnotationAddFailure if @kaltura_annotation.nil?
 
-      def create_kaltura_annotation
-        if self.cuepoint_key.nil?
-          @kaltura_annotation = self.class.kaltura_client.cuepoint_service.
-              add( self.as_annotation_cuepoint )
-          raise KalturaAnnotationAddFailure if @kaltura_annotation.nil?
-
-          self.cuepoint_key = @kaltura_annotation.id.to_s
-        end
+        self.cuepoint_key = @kaltura_annotation.id.to_s
       end
+    end
 
-      def update_kaltura_annotation
-        if self.cuepoint_key.present?
-          @kaltura_annotation = self.class.kaltura_client.cuepoint_service.
-              update(self.cuepoint_key, self.as_annotation_cuepoint )
-          raise KalturaAnnotationUpdateFailure if @kaltura_annotation.nil?
-        end
+    def update_kaltura_annotation
+      if self.cuepoint_key.present?
+        @kaltura_annotation = self.class.kaltura_client.cuepoint_service.
+            update(self.cuepoint_key, self.as_annotation_cuepoint )
+        raise KalturaAnnotationUpdateFailure if @kaltura_annotation.nil?
       end
+    end
 
-      def delete_kaltura_annotation
-        if self.cuepoint_key.present?
-          self.class.kaltura_client.cuepoint_service.delete(self.cuepoint_key)
-          @kaltura_annotation = nil
-        end
+    def delete_kaltura_annotation
+      if self.cuepoint_key.present?
+        self.class.kaltura_client.cuepoint_service.delete(self.cuepoint_key)
+        @kaltura_annotation = nil
       end
+    end
 
-      def kaltura_annotation
-        @kaltura_annotation ||= find_kaltura_annotation
-      end
+    def kaltura_annotation
+      @kaltura_annotation ||= find_kaltura_annotation
+    end
 
-      def kaltura_annotation=(annotation)
-        @kaltura_annotation = annotation
-      end
+    def kaltura_annotation=(annotation)
+      @kaltura_annotation = annotation
+    end
 
-      private
-        def find_kaltura_annotation
-          if self.cuepoint_key.present?
-            self.class.kaltura_client.cuepoint_service.get(self.cuepoint_key)
-          end
+    private
+      def find_kaltura_annotation
+        if self.cuepoint_key.present?
+          self.class.kaltura_client.cuepoint_service.get(self.cuepoint_key)
         end
-    end
+      end
   end
 end

data/lib/acts_as_kaltura/delegator.rb

@@ -24,27 +24,25 @@ module ActsAsKaltura
       end
     end
 
-    module InstanceMethods
-      protected
-        def reset_kaltura_delegated_attributes
-          if self.class._kaltura_options.present?
-            self.class._kaltura_options[:delegate].each do |attr|
-              self.send(:"#{attr}=", nil)
-            end
+    protected
+      def reset_kaltura_delegated_attributes
+        if self.class._kaltura_options.present?
+          self.class._kaltura_options[:delegate].each do |attr|
+            self.send(:"#{attr}=", nil)
           end
         end
+      end
 
-        def _lookup_local_attribute(attr)
-          self.read_attribute attr
-        end
+      def _lookup_local_attribute(attr)
+        self.read_attribute attr
+      end
 
-        def _lookup_kaltura_attribute(attr)
-          if entry = self.kaltura_entry
-            value = entry.send(attr)
-            self.update_column(attr, value) if value
-            value
-          end
+      def _lookup_kaltura_attribute(attr)
+        if entry = self.kaltura_entry
+          value = entry.send(attr)
+          self.update_column(attr, value) if value
+          value
         end
-    end
+      end
   end
 end

data/lib/acts_as_kaltura/extension.rb

@@ -8,10 +8,8 @@ module ActsAsKaltura
   module Extension
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-      def cuepoint_service
-        @cuepoint_service ||= ActsAsKaltura::Extension::Service::CuePointService.new(self)
-      end
+    def cuepoint_service
+      @cuepoint_service ||= ActsAsKaltura::Extension::Service::CuePointService.new(self)
     end
   end
 end

data/lib/acts_as_kaltura/version.rb

@@ -2,7 +2,7 @@ module ActsAsKaltura
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/acts_as_kaltura/video.rb

@@ -13,7 +13,7 @@ module ActsAsKaltura
     end
 
     module ClassMethods
-      def acts_as_kaltura_video(options = {})
+      def acts_as_kaltura_video(options = { })
         # Set instance accessors
         attr_accessor :video_file, :uploaded_video_token
         self._kaltura_options = options
@@ -24,7 +24,7 @@ module ActsAsKaltura
         end
 
         # Set validators
-        validates :video_file, :presence => {:on => :create}
+        validates :video_file, :presence => { :on => :create }
 
         # Set filters
         before_save :process_uploaded_video_file
@@ -34,118 +34,115 @@ module ActsAsKaltura
       end
     end
 
-    module InstanceMethods
-
-      #
-      # Push user uploaded video file to kaltura server
-      # If successful set upload token with the object
-      #
-      def process_uploaded_video_file
-        if @video_file.present?
-          video_file_stream =  if @video_file.respond_to?(:path, true)
-            File.open(@video_file.path)
-          else
-            @video_file
-          end
-          @uploaded_video_token = self.class.kaltura_client.
-              media_service.upload( video_file_stream )
-          raise ActsAsKaltura::Video::NoUploadedTokenFound if @uploaded_video_token.nil?
+    #
+    # Push user uploaded video file to kaltura server
+    # If successful set upload token with the object
+    #
+    def process_uploaded_video_file
+      if @video_file.present?
+        video_file_stream     = if @video_file.respond_to?(:path, true)
+          File.open(@video_file.path)
+        else
+          @video_file
         end
+        @uploaded_video_token = self.class.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
-      #
-      def create_kaltura_video_entry
-        if @video_file.present?
-          # There must have uploaded token otherwise this should be invoked
-          raise NoUploadedTokenFound if @uploaded_video_token.nil?
+    #
+    # Create kaltura video entry based on current video data
+    # if successful set kaltura id
+    #
+    def create_kaltura_video_entry
+      if @video_file.present?
+        # There must have uploaded token otherwise this should be invoked
+        raise NoUploadedTokenFound if @uploaded_video_token.nil?
 
-          # Covert host model as kaltura entry
-          entry = as_kaltura_entry
+        # Covert host model as kaltura entry
+        entry        = as_kaltura_entry
 
-          # Request kaltura service to store video entry for the
-          # uploaded video file
-          stored_entry = add_kaltuar_video_file(entry)
+        # Request kaltura service to store video entry for the
+        # uploaded video file
+        stored_entry = add_kaltuar_video_file(entry)
 
-          # Nil return should throw exception
-          raise KalturaVideoAddFailure  if stored_entry.nil?
+        # Nil return should throw exception
+        raise KalturaVideoAddFailure if stored_entry.nil?
 
-          # Set kaltura_key from stored kaltura entry
-          self.kaltura_key = stored_entry.id.to_s
-          self.kaltura_syncd_at = Time.now
+        # Set kaltura_key from stored kaltura entry
+        self.kaltura_key      = stored_entry.id.to_s
+        self.kaltura_syncd_at = Time.now
 
-          self.class.run_kaltura_after_save_callbacks self
-        end
+        self.class.run_kaltura_after_save_callbacks self
       end
+    end
 
-      #
-      # Update kaltura existing video entry
-      # If successful update kaltura_syncd_at
-      #
-      def update_kaltura_video_entry
-        if kaltura_key.present?
-          entry = as_kaltura_entry
-          update_kaltura_entry(entry)
-
-          if @video_file.nil?
-            entry.id = kaltura_key
-            add_kaltuar_video_file(entry)
-          end
-
-          self.class.run_kaltura_after_save_callbacks self
+    #
+    # Update kaltura existing video entry
+    # If successful update kaltura_syncd_at
+    #
+    def update_kaltura_video_entry
+      if kaltura_key.present?
+        entry = as_kaltura_entry
+        update_kaltura_entry(entry)
+
+        if @video_file.nil?
+          entry.id = kaltura_key
+          add_kaltuar_video_file(entry)
         end
-      end
 
-      def kaltura_entry
-        find_kaltura_entry if @kaltura_entry.nil?
-        @kaltura_entry
+        self.class.run_kaltura_after_save_callbacks self
       end
+    end
 
-      def kaltura_entry=(entry)
-        @kaltura_entry = entry
+    def kaltura_entry
+      find_kaltura_entry if @kaltura_entry.nil?
+      @kaltura_entry
+    end
+
+    def kaltura_entry=(entry)
+      @kaltura_entry = entry
+    end
+
+    def destroy_kaltura_video_entry
+      if kaltura_key
+        destroy_kaltura_entry
       end
+    end
 
-      def destroy_kaltura_video_entry
-        if kaltura_key
-          destroy_kaltura_entry
-        end
+    private
+    def add_kaltuar_video_file(entry)
+      if @video_file && @uploaded_video_token
+        self.class.kaltura_client.media_service.
+            add_from_uploaded_file(entry, @uploaded_video_token)
       end
+    end
 
-      private
-        def add_kaltuar_video_file(entry)
-          if @video_file && @uploaded_video_token
-            self.class.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)
+        self.kaltura_syncd_at = Time.now
+      end
+    end
 
-        def update_kaltura_entry(entry)
-          if kaltura_key.present?
-            self.class.kaltura_client.media_service.update(kaltura_key, entry)
-            self.kaltura_syncd_at = Time.now
-          end
+    def find_kaltura_entry
+      if kaltura_key
+        if @kaltura_entry.nil?
+          @kaltura_entry = self.class.kaltura_client.media_service.get(kaltura_key)
         end
 
-        def find_kaltura_entry
-          if kaltura_key
-            if @kaltura_entry.nil?
-              @kaltura_entry = self.class.kaltura_client.media_service.get(kaltura_key)
-            end
-
-            @kaltura_entry
-          end
-        end
+        @kaltura_entry
+      end
+    end
 
-        def destroy_kaltura_entry
-          if kaltura_key
-            self.class.kaltura_client.media_service.delete(kaltura_key)
-            @kaltura_entry = nil
-          end
-        rescue
+    def destroy_kaltura_entry
+      if kaltura_key
+        self.class.kaltura_client.media_service.delete(kaltura_key)
+        @kaltura_entry = nil
+      end
+    rescue
 
-        end
     end
   end
 end

data/lib/acts_as_kaltura.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext'
 require 'acts_as_kaltura/version'
 require 'acts_as_kaltura/two_way_attr_accessor'
 require 'acts_as_kaltura/config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_kaltura
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152705160 !ruby/object:Gem::Requirement
+  requirement: &2152318060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,40 +21,40 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152705160
+  version_requirements: *2152318060
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2152703160 !ruby/object:Gem::Requirement
+  name: velir_kaltura-ruby
+  requirement: &2152315520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152703160
+  version_requirements: *2152315520
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2152726500 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &2152312960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152726500
+  version_requirements: *2152312960
 - !ruby/object:Gem::Dependency
-  name: velir_kaltura-ruby
-  requirement: &2152724920 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &2152310640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152724920
+  version_requirements: *2152310640
 description: Acts as kaltura
 email: hasan@somewherein.net
 executables: []