naranya_ecm-sdk 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6a90236bd794d754bdf445805afdf1b4539d4f
-  data.tar.gz: e40ad3616ae04fb8932e2df7fb47546efb0ce7b1
+  metadata.gz: cb455d97321126300a191b589db3204014254115
+  data.tar.gz: 912aa46d7321a71136aa42568927e0749715a955
 SHA512:
-  metadata.gz: f0802bf180226d3b443697ab502f09e1b13a23dd79105b246419de9a8e534cdc4db8351b6577953551ad3e8361c3a67a61e35c896509266c2309affbb9458f3a
-  data.tar.gz: 62565940d9f2025491f2a5d30d45990e1a2744afa2b411feb8c0bd1ebb5b766a4bd92b87b0127a22e098e6619686379318762f725dcabc8f163f86443316fc9b
+  metadata.gz: 1c2b38a2edaa91ee6782e19843eba65f3809014c176daa18f495058f2210894277300f6ab9e7aacd98c1781a4e2fa616a84242dfc209084b09ee4bfcb5d0a20a
+  data.tar.gz: a4f1363812dc63eceb161577aa450a6dcef942a1badb92043790a24c28bc4a5715920b87398f4bf83d78c3bf7b1475effbfb631e52667d5cae38f6f4549fa673

data/lib/naranya_ecm/behaviors/{mediable.rb → media_methods.rb}

@@ -1,5 +1,5 @@
 module NaranyaEcm::Behaviors
-  module Mediable
+  module MediaMethods
 
     extend ActiveSupport::Concern
 

data/lib/naranya_ecm/models/category.rb

@@ -4,9 +4,8 @@ module NaranyaEcm
 
     include NaranyaEcm.document_module
     include NaranyaEcm::Behaviors::Timestampable
-    include NaranyaEcm::Cache::Methods
     include NaranyaEcm::Search::Methods
-    include NaranyaEcm::Behaviors::Mediable
+    include NaranyaEcm::Behaviors::MediaMethods
 
     field :code, type: String
     validates :code, presence: true

data/lib/naranya_ecm/models/content.rb

@@ -4,9 +4,8 @@ module NaranyaEcm
 
     include NaranyaEcm.document_module
     include NaranyaEcm::Behaviors::Timestampable
-    include NaranyaEcm::Cache::Methods
     include NaranyaEcm::Search::Methods
-    include NaranyaEcm::Behaviors::Mediable
+    include NaranyaEcm::Behaviors::MediaMethods
 
     # Type:
     # Describes the main type of the content - App, Note, etc.

data/lib/naranya_ecm/models/content_version.rb

@@ -4,8 +4,7 @@ module NaranyaEcm
 
     include NaranyaEcm.document_module
     include NaranyaEcm::Behaviors::Timestampable
-    include NaranyaEcm::Cache::Methods
-    include NaranyaEcm::Behaviors::Mediable
+    include NaranyaEcm::Behaviors::MediaMethods
 
     # Description (localized):
     # A localized string that describes an overview of the significant changes

data/lib/naranya_ecm/models/download_authorization.rb

@@ -4,7 +4,6 @@ module NaranyaEcm
 
     include NaranyaEcm.document_module
     include NaranyaEcm::Behaviors::Timestampable
-    include NaranyaEcm::Cache::Methods
 
     belongs_to :media_resource
     # validates :media_resource, presence: true

data/lib/naranya_ecm/models/media_resource.rb

@@ -4,7 +4,6 @@ module NaranyaEcm
 
     include NaranyaEcm.document_module
     include NaranyaEcm::Behaviors::Timestampable
-    include NaranyaEcm::Cache::Methods
 
     # Media MIME/Internet Type:
     field :type, type: String

data/lib/naranya_ecm/rest/finder_methods.rb

@@ -4,32 +4,18 @@ module NaranyaEcm::Rest
   module FinderMethods
 
     def find(*args)
-      if block_given?
-        to_a.find { |*block_args| yield(*block_args) }
+      case args.length
+      when 0
+        raise ResourceNotFound, "Couldn't find #{self.name} without an ID"
+      when 1
+        find_one(args.first)
       else
-        find_with_ids(*args)
+        self.where(id: args)
       end
     end
 
     protected
 
-      def find_with_ids(*ids)
-        expects_array = ids.first.kind_of?(Array)
-        return ids.first if expects_array && ids.first.empty?
-
-        ids = ids.flatten.compact.uniq
-
-        case ids.size
-        when 0
-          raise ResourceNotFound, "Couldn't find #{self.name} without an ID"
-        when 1
-          result = find_one(ids.first)
-          expects_array ? [ result ] : result
-        else
-          find_some(ids)
-        end
-      end
-
       def find_one(id)
         self.load fetch_one(id)
       end

data/lib/naranya_ecm/rest/persistence.rb

@@ -94,6 +94,7 @@ module NaranyaEcm::Rest
           case response.code
           when 204
             self.reload!
+            off_band_changes.clear if off_band_changes.present?
             true
           when 422 # Unprocessable Entity
             self.load_server_errors(response.to_hash)
@@ -110,11 +111,23 @@ module NaranyaEcm::Rest
         object_to_create.save
         object_to_create
       end
+
       def create!(attributes={})
         created_object = create(attributes)
         raise "ValidationError" unless created_object.persisted?
         created_object
       end
+
+      def delete(id, options={})
+        response = HTTParty.delete("#{NaranyaEcm.options[:site]}#{self.path}/#{id}.json")
+        case response.code
+        when 204
+          true
+        else
+          false
+        end
+      end
+
     end
 
   end

data/lib/naranya_ecm/search/hit.rb

@@ -14,9 +14,6 @@ module NaranyaEcm::Search
     def klass
       @klass ||= "NaranyaEcm::#{type.classify}".constantize
     end
-
-    def cache_key
-      @cache_key ||= NaranyaEcm::Cache::Key.new klass, id, updated_at
-    end
+    
   end
 end

data/lib/naranya_ecm/search/results.rb

@@ -12,17 +12,6 @@ module NaranyaEcm::Search
       # resource:
       result_elements = search_results.hits.dup
 
-      # Load from cache any matching element caching_key:
-      result_elements.each_index do |index|
-        hit_data = result_elements[index].dup
-        fetched_data = result_elements[index].cache_key.read
-        if fetched_data.present?
-          puts "===== Cache READ:  '#{result_elements[index].cache_key}'"
-          result_elements[index] = hit_data.klass.load(fetched_data)
-          result_elements[index].merge_search_hit_data(hit_data)
-        end
-      end
-
       # Load from server all elements yet to materialize:
       pending_hits = result_elements.select { |e| e.is_a? NaranyaEcm::Search::Hit }
       pending_hits.map(&:klass).uniq.each do |hit_klass|
@@ -36,8 +25,6 @@ module NaranyaEcm::Search
           hit_data = result_elements.detect { |e| e.is_a?(NaranyaEcm::Search::Hit) && e.klass == r.class && e.id == r.id }
           hit_index = result_elements.find_index hit_data
 
-          puts "===== Cache WRITE: '#{r.cache_key}'"
-          r.cache_key.write fetched_data
           r.merge_search_hit_data hit_data
           result_elements[hit_index] = r
         end
@@ -63,10 +50,6 @@ module NaranyaEcm::Search
       ]
     end
 
-    def cache_keys
-      hits.map(&:cache_key)
-    end
-
     def hits
       do_search! unless @hits
       @hits

data/lib/naranya_ecm-sdk/version.rb

@@ -1,3 +1,3 @@
 module NaranyaEcm
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

data/lib/naranya_ecm-sdk.rb

@@ -39,13 +39,7 @@ module NaranyaEcm
     extend ActiveSupport::Autoload
     autoload :Localizable
     autoload :Timestampable
-    autoload :Mediable
-  end
-
-  module Cache
-    extend ActiveSupport::Autoload
-    autoload :Key
-    autoload :Methods
+    autoload :MediaMethods
   end
 
   autoload_under 'lifecycles' do
@@ -60,8 +54,6 @@ module NaranyaEcm
     autoload :Results
   end
 
-  autoload :ActiveResourceBasePatch
-
   include ActiveSupport::Configurable
 
   DEFAULT_CONFIG = {
@@ -78,13 +70,9 @@ module NaranyaEcm
       @root_directory ||= storage.directories.get(options[:storage][:root_directory])
     end
 
-    def setup
-      yield config
-    end
-
-    def document_module
-      NaranyaEcm::Rest::Model
-    end
+    def setup; yield config; end
+    def document_module; NaranyaEcm::Rest::Model; end
+    def timestamp_module; NaranyaEcm::Behaviors::Timestampable; end
 
     def options
       auto_conf unless config.present?
@@ -97,11 +85,6 @@ module NaranyaEcm
         .with_indifferent_access
       setup { |config| yml_config.each { |key, val| config.send "#{key}=".to_sym, val } }
     end
-
-    def cache
-      auto_conf unless config.present?
-      @cache ||= ActiveSupport::Cache.lookup_store *options[:cache]
-    end
   
     protected
 
@@ -110,9 +93,6 @@ module NaranyaEcm
       if defined?(Rails)
         yml_path = File.join(Rails.root, 'config', 'naranya_ecm.yml')
         load_config_from_yml(yml_path, Rails.env)
-
-        # Use the Rails cache:
-        @cache = Rails.cache
       elsif File.exists?('./naranya_ecm.yml')
         load_config_from_yml('./naranya_ecm.yml')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naranya_ecm-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -169,10 +169,8 @@ files:
 - lib/naranya_ecm-sdk.rb
 - lib/naranya_ecm-sdk/version.rb
 - lib/naranya_ecm/behaviors/localizable.rb
-- lib/naranya_ecm/behaviors/mediable.rb
+- lib/naranya_ecm/behaviors/media_methods.rb
 - lib/naranya_ecm/behaviors/timestampable.rb
-- lib/naranya_ecm/cache/key.rb
-- lib/naranya_ecm/cache/methods.rb
 - lib/naranya_ecm/lifecycles/content_lifecycle.rb
 - lib/naranya_ecm/models/category.rb
 - lib/naranya_ecm/models/content.rb

data/lib/naranya_ecm/cache/key.rb

@@ -1,49 +0,0 @@
-require 'active_support/hash_with_indifferent_access'
-
-module NaranyaEcm::Cache
-  class Key < String
-
-    TIMESTAMP_FORMAT = '%Y%m%d%H%M%S'.freeze
-
-    attr_reader :klass, :id, :timestamp
-
-    def initialize(given_class, given_id, given_timestamp = nil)
-      @klass, @id = given_class, given_id
-
-      unless given_timestamp.blank?
-        @timestamp = if given_timestamp.is_a? String
-          given_timestamp.to_datetime
-        elsif given_timestamp.respond_to? :strftime
-          given_timestamp
-        else
-          raise ArgumentError, "Given timestamp is not a Date|Time like object" 
-        end
-      end
-
-      super join_segments
-    end
-
-    def timestamped?
-      timestamp.present?
-    end
-
-    def exist?
-      NaranyaEcm.cache.exist? self
-    end
-
-    def read
-      NaranyaEcm.cache.read self
-    end
-
-    def write(data)
-      NaranyaEcm.cache.write self, data
-    end
-
-    private
-      def join_segments
-        key = "#{klass.name.tableize}/#{id}"
-        timestamped? ? "#{key}-#{timestamp.strftime(TIMESTAMP_FORMAT)}" : key
-      end
-
-  end
-end

data/lib/naranya_ecm/cache/methods.rb

@@ -1,69 +0,0 @@
-require 'active_support/concern'
-
-module NaranyaEcm::Cache
-  module Methods
-
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        alias_method_chain :find,     :caching
-        alias_method_chain :find_one, :caching
-      end
-    end
-
-    def cache_key
-      self.new_resource? ? nil : self.class.cache_key_for(self.id, self.updated_at)
-    end
-
-    module ClassMethods
-
-      def cache
-        NaranyaEcm.cache
-      end
-
-      def cache_key_for(id, timestamp=nil)
-        Key.new self, id, timestamp
-      end
-
-      def find_with_caching(id, cache_options = {})
-        find_one_with_caching(id, cache_options)
-      end
-
-      private
-
-        # Find a single resource from the default URL
-        def find_one_with_caching(id, cache_options = {})
-          fetched_data = nil
-          missed = true
-          
-          # Ver primero si lo podemos obtener del cache:
-          cache_timestamp = cache_options.delete(:timestamp)
-          if cache_timestamp.present?
-            # Try to load the record from cache:
-            cache_key = cache_key_for(id, cache_timestamp)
-            missed = (fetched_data = cache_key.read).nil?
-            puts "===== CACHE #{(missed ? 'MISS: ' : 'HIT:  ')} '#{cache_key}'"
-          end
-
-          # Si no lo obtuvimos del caché, traer uno del server:
-
-          unless fetched_data.present?
-            fetched_data = fetch_one(id) 
-          end
-          
-          # Inicializar el recurso con los datos obtenidos:
-          resource = self.load fetched_data
-
-          # Write unless data exists:
-          if missed
-            puts "===== Cache WRITE: '#{resource.cache_key}'"
-            cache.write(resource.cache_key, fetched_data)
-          end
-
-          resource
-        end
-    end
-
-  end
-end