naranya_ecm-sdk 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebafc5d4f40d88b45a99cea2b04dd3a1b6731194
-  data.tar.gz: 435aac8f54e0dbd45e673af840a108e70c0853af
+  metadata.gz: fb9d2934d262d1b2756004bb52d806d06ba23cbe
+  data.tar.gz: 685cc13008257d3a91cae01515b58428dfe7d3e8
 SHA512:
-  metadata.gz: e8d58cc2b57220b85d98bf859be73771c0c630489c03daa5be6abd35629aa212d03b867606d756cbe116e3d663bb6c5d755fbe07a59e9254b17171753c3fdbd9
-  data.tar.gz: ac438bcbfe33d990f3ae4152a48c1db0e33c468d34190ef5bf8ad3cb758af6660a47140134ea6eb5489e2164e68affa972829645dfe136570ee57acade41bf35
+  metadata.gz: c85654045b5dc54105ef010f5c0f1c729a47a8b3832ffed1e782efa3b8d463e3a1bf3885aea1d058197358ab7c5e1112454d225b02fd38290dddffc24563a1eb
+  data.tar.gz: dd3b862753366e2fb7d45f6be2b39c5fe2d412b6a84c226cd97ea01b0d66f66f4251103c8d6f7f613c4430552d301b1f27849f21400da8f5dcbdfab71b164b86

data/lib/naranya_ecm-sdk.rb

@@ -41,6 +41,7 @@ module NaranyaEcm
     autoload :MediaProfile
     autoload :MediaProcess
     autoload :MediaResource
+    autoload :Notification
   end
 
   module Behaviors
@@ -69,7 +70,8 @@ module NaranyaEcm
 
   DEFAULT_CONFIG = {
     site: "http://ecm.naranya.net:5000",
-    cache_store: []
+    client_notify_url: "http://www.example.com/naranya_ecm/notifications",
+    notification_processing_modules: []
   }.freeze
 
   class << self

data/lib/naranya_ecm-sdk/version.rb

@@ -1,3 +1,3 @@
 module NaranyaEcm
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/naranya_ecm/behaviors/media_methods.rb

@@ -22,37 +22,64 @@ module NaranyaEcm::Behaviors
       mr.flatten.uniq
     end
 
-    def detect_media_by_roles(*given_roles)
-      raise ArgumentError, "Given role list is blank" if given_roles.blank?
-      current_roles = given_roles.dup
-      detected_media = nil
-      until detected_media.present? || current_roles.count < 1 do
-        detected_media = self.media_resources.detect { |mr| (mr.roles & current_roles).count == current_roles.count }
-        current_roles.pop
+    # Returns an Array of MediaResource objects which match the given options in their role list.
+    #
+    # ==== Attributes
+    #
+    # * +options+ - The given options to select the MediaResource objects
+    #
+    # ==== Options
+    #
+    # You may which to break out options as a separate item since there maybe
+    # multiple items. Note options are prefixed with a colon, denoting them
+    # as a
+    #
+    # * +:match+ - An Array of roles that *must* exist in matching MediaResource objects.
+    # * +:prefer+ - An Array of values consisting of:
+    #   * A String indicating a desired role
+    #   * A Hash containing the desired role as key, and an Array of fallback roles as value.
+    #
+    # ==== Examples
+    #
+    # Illustrate the behaviour of the method using examples. Indent examples:
+    #
+    #   base = Base.new("Example String")
+    #   base.method_name("Example", "more")
+    def select_media_by_roles(options)
+
+      options = options.with_indifferent_access if options.is_a?(Hash) && !options.is_a?(ActiveSupport::HashWithIndifferentAccess)
+
+      match = options.is_a?(Hash) ? options[:match] : options
+      match = [match.to_s] if match.is_a?(String) || match.is_a?(Symbol)
+      
+      raise ArgumentError, "No match options given" if match.blank?
+
+      except = options.is_a?(Hash) ? options[:except] : []
+      except = [except.to_s] if except.is_a?(String) || except.is_a?(Symbol)
+      except = [] if except.blank?
+
+      filtered_media = self.media_resources.select do |mr|
+        ((mr.roles & match).count == match.count) && ((mr.roles & except).count < 1)
       end
-      detected_media
-    end
 
-    def detect_media_url_by_roles(*given_roles)
-      detected_media = detect_media_by_roles(*given_roles)
-      detected_media.present? ? detected_media.downloadable_url : nil
+      prefer = options.is_a?(Hash) ? options[:prefer] : nil
+      prefer = [prefer.to_s] if prefer.is_a?(String) || prefer.is_a?(Symbol)
+      
+      filtered_media
     end
 
-    def select_media_by_roles(*given_roles)
-      raise ArgumentError, "Given role list is blank" if given_roles.blank?
-      current_roles = given_roles.dup
-      selected_media = nil
-      until selected_media.present? || current_roles.count < 1 do
-        selected_media = self.media_resources.select { |mr| (mr.roles & current_roles).count == current_roles.count }
-        current_roles.pop
-      end
-      selected_media
+    def detect_media_by_roles(options)
+      select_media_by_roles(options).first
     end
 
-    def select_media_urls_by_roles(*given_roles)
-      selected_media = select_media_by_roles(*given_roles)
+    def select_media_urls_by_roles(options)
+      selected_media = select_media_by_roles(options)
       selected_media.present? ? selected_media.map(&:downloadable_url) : nil
     end
 
+    def detect_media_url_by_roles(options)
+      select_media_urls_by_roles(options).first
+    end
+
   end
 end

data/lib/naranya_ecm/models/media_process.rb

@@ -12,6 +12,9 @@ module NaranyaEcm
     # Source Media Resource:
     belongs_to :media_resource
 
+    # Profile used as base:
+    belongs_to :media_profile
+
     field :notify_url, type: String
 
     field :append_media_roles, type: Array, default: -> { [] }

data/lib/naranya_ecm/models/media_profile.rb

@@ -15,16 +15,8 @@ module NaranyaEcm
     field :preset_id, type: String
 
     # Template content
-    field :template, type: String
-
-    def template_hash
-      ActiveSupport::JSON.decode template
-    end
-
-    def template_hash=(hash = {})
-      self.template = ActiveSupport::JSON.encode hash
-    end
-    
+    field :template, type: Hash
+        
   end
 
 end

data/lib/naranya_ecm/models/media_resource.rb

@@ -69,6 +69,35 @@ module NaranyaEcm
       NaranyaEcm.root_directory
     end
 
+    def move_downloadable_to(path, force_move=false)
+
+      raise ArgumentError, "Given path is empty" unless path.present?
+      path = path[1..-1] if path.present? && path[0] == "/"
+      raise ArgumentError, "Can't use root (/) as target path" unless path.present?
+      
+      path_exists = root_directory.files.head(path).present?
+      
+      if !path_exists || (path_exists && force_move)
+        old_file = root_directory.files.get downloadable_resource_key
+        
+        new_file = root_directory.files.create(
+          key: path,
+          body: old_file.body,
+          content_type: old_file.content_type,
+          last_modified: old_file.last_modified,
+          :public => public?
+        )
+        
+        self.downloadable_url = public? ? new_file.public_url : new_file.url(1.minutes.from_now).split("?").first
+        
+        old_file.destroy if self.save
+        true
+      else
+        false
+      end
+
+    end
+
     # Generates a MediaProcess with self as the source MediaResource.
     def process_with_profile(given_profile, given_options = {})
       raise ArgumentError, 'Given profile is not a MediaProfile' unless given_profile.is_a? NaranyaEcm::MediaProfile

data/lib/naranya_ecm/models/notification.rb

@@ -0,0 +1,31 @@
+module NaranyaEcm
+
+  class Notification
+  
+    include ActiveModel::Model
+    include ActiveModel::Serialization
+
+    attr_accessor :media_process_id, :processed_media_resources, :ok
+
+    def attributes
+      { media_process_id: media_process_id, processed_media_resources: processed_media_resources, ok: ok }
+    end
+
+    def process
+      NaranyaEcm.logger.debug "NaranyaEcm::Notification: #{self.attributes}"
+      NaranyaEcm.logger.debug "NaranyaEcm::Notification: No processing implemented."
+    end
+
+    def self.process(given_attributes)
+      notification = self.new given_attributes
+      notification.process
+    end
+    
+    NaranyaEcm.config.notification_processing_modules.each do |module_name|
+      processing_module = module_name.safe_constantize
+      include processing_module if processing_module.present?
+    end
+
+  end
+  
+end

data/lib/naranya_ecm/rest/client.rb

@@ -46,8 +46,14 @@ module NaranyaEcm::Rest
           options[:log_level]   = :debug
           options[:log_format]  = :apache
 
-          response = HTTParty.send method, url, options
+          # HTTParty no envía un parametro GET si es un Array vacío.
+          # Convertir los arrays vacíos a [nil] (WTF?)
+          if method == :get && options[:query].is_a?(Hash)
+            options[:query].each { |key, val| options[:query][key] = [nil] if val.is_a?(Array) && val.empty? }
+          end
 
+          response = HTTParty.send method, url, options
+          
           # Retry if response code is 401 and a client token is present:
           if response.code == 401 && authorization_header.present?
             options[:headers]['Authorization'] = authorization_header(true)

data/lib/naranya_ecm/rest/model.rb

@@ -1,4 +1,3 @@
-require 'httparty'
 require 'active_model'
 
 module NaranyaEcm::Rest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naranya_ecm-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -210,6 +210,7 @@ files:
 - lib/naranya_ecm/models/media_process.rb
 - lib/naranya_ecm/models/media_profile.rb
 - lib/naranya_ecm/models/media_resource.rb
+- lib/naranya_ecm/models/notification.rb
 - lib/naranya_ecm/rest/association_relation.rb
 - lib/naranya_ecm/rest/associations.rb
 - lib/naranya_ecm/rest/client.rb