naranya_ecm-sdk 0.0.14 → 0.0.15

data/lib/naranya_ecm/search/results.rb

@@ -1,170 +1,167 @@
-module NaranyaEcm
-  module Search
-    class Results
-
-      DEFAULT_MATERIALIZER = Proc.new do |resource_class, hits|
-      
-        # Extract the object ids for ActiveResource loading:
-        unloaded_resource_ids = hits.map(&:id)
-
-        materialized_elements = []
-
-        # Load from cache any matching element caching_key:
-        hits.each do |hit|
-          cached_element = resource_class.find_cached(resource_class.cache_key_for id: hit.id, timestamp: hit.updated_at)
-          if cached_element.present?
-            cached_element.merge_search_hit_data(hit)
-            materialized_elements << cached_element
-            unloaded_resource_ids.delete cached_element.id
-          end
-        end
-
-        # Load from server all elements not in cache:
-        resource_class.find(:all, params: { id: unloaded_resource_ids }).each do |element|
-          hit = hits.detect { |hit| hit.id == element.id }
-          
-          # Add the hit score and order to each element:
-          element.merge_search_hit_data(hit)
-
-          # Add it to the loaded_elements:
-          materialized_elements << element
-        end unless unloaded_resource_ids.empty?
-
-        materialized_elements
-      end
+require 'naranya_ecm/rest/relation'
 
-      include Enumerable
-      delegate :to_yaml, :all?, :each, to: :to_a
+module NaranyaEcm::Search
+  class Results < NaranyaEcm::Rest::Relation
 
-      # The array of actual elements returned by index actions
-      attr_reader :elements, :resource_class
+    include HTTParty
+    base_uri NaranyaEcm.options[:site]
 
-      attr_accessor :materializer
-
-      def initialize(given_dsl, given_resource_class = nil)
-        @dsl, @resource_class = given_dsl, given_resource_class
+    DEFAULT_MATERIALIZER = Proc.new do |search_results|
+    
+      # Duplicate the hits array - we'll replace each element with the
+      # 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
 
-      def total_hits
-        do_search! unless @total_hits
-        @total_hits
-      end
-      alias_method :total_count, :total_hits
-
-      def digest
-        [
-          'naranya_ecm',
-          'search',
-          'results',
-          Digest::MD5.hexdigest(@dsl.to_s)
-        ]
-      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|
+        # Obtain the ids for this hit_klass:
+        hit_ids = pending_hits.select { |e| e.klass == hit_klass }.map(&:id)
+        
+        # Fetch the data from server:
+        hit_klass.where(id: hit_ids).fetch_from_server.each do |fetched_data|
+          r = hit_klass.load fetched_data
+          
+          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
 
-      def hits
-        do_search! unless @hits
-        @hits
+          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
       end
 
-      def count
-        hits.count
-      end
+      result_elements
+    end
 
-      def any?
-        count > 0
-      end
+    attr_accessor :materializer
 
-      def empty?
-        count < 1
-      end
+    def total_hits
+      do_search! unless @total_hits
+      @total_hits
+    end
+    alias_method :total_count, :total_hits
+
+    def digest
+      [
+        'naranya_ecm',
+        'search',
+        'results',
+        Digest::MD5.hexdigest(@dsl.to_s)
+      ]
+    end
 
-      def facts
-        do_search! unless @facts
-        @facts
-      end
+    def cache_keys
+      hits.map(&:cache_key)
+    end
 
-      def max_score
-        do_search! unless @max_score
-        @max_score
-      end
+    def hits
+      do_search! unless @hits
+      @hits
+    end
 
-      def query_process_time
-        do_search! unless @query_process_time
-        @query_process_time
-      end
+    def count
+      hits.count
+    end
 
-      def query_total_time
-        do_search! unless @query_total_time
-        @query_total_time
-      end
+    def any?
+      count > 0
+    end
 
-      def materializer
-        @materializer || DEFAULT_MATERIALIZER
-      end
-      
-      def to_a
-        materialize! unless @elements
-        elements
-      end
+    def empty?
+      count < 1
+    end
 
-      private
+    def facts
+      do_search! unless @facts
+      @facts
+    end
 
-        def do_search!
+    def max_score
+      do_search! unless @max_score
+      @max_score
+    end
 
-          start_time = Time.now
-          
-          # Strip '.json' from collection path:
-          search_path = resource_class.present? ? resource_class.collection_path.split('.').first : ''
-          search_path += '/_search'
+    def query_process_time
+      do_search! unless @query_process_time
+      @query_process_time
+    end
 
-          search_site = URI(NaranyaEcm.options.site)
+    def query_total_time
+      do_search! unless @query_total_time
+      @query_total_time
+    end
 
-          search_connection = Net::HTTP.new search_site.host, search_site.port
+    def materializer
+      @materializer || DEFAULT_MATERIALIZER
+    end
+    
+    def to_a
+      materialize! unless @elements
+      elements
+    end
 
-          search_get_url = URI("#{search_site}#{search_path}")
+    private
 
-          search_request = Net::HTTP::Get.new search_get_url
-          search_request.body = ActiveSupport::JSON.encode @dsl
+      def do_search!
 
-          puts "curl --XGET '#{search_get_url}?pretty=true' -d '#{search_request.body}'"
+        start_time = Time.now
+        
+        # Strip '.json' from collection path:
+        search_path = klass.present? ? klass.path : ''
+        search_path += '/_search'
 
-          # Use the class connection to get the search results,
-          # using any authentication / headers configured:
-          #search_response = connection.get(search_path, headers)
-          search_response = search_connection.request search_request
-          
-          # Parse the search results:
-          @facts = ActiveSupport::JSON.decode(search_response.body)
-            .with_indifferent_access
+        # Use the class connection to get the search results,
+        # using any authentication / headers configured:
+        #search_response = connection.get(search_path, headers)
+        search_body = ActiveSupport::JSON.encode(conditions)
+        search_response = self.class.get search_path, body: search_body
+        
+        puts "curl -XGET '#{NaranyaEcm.options[:site]}#{search_path}?pretty=true' -d '#{search_body}'"
+        
+        # Parse the search results:
+        @facts = search_response.to_hash.with_indifferent_access
 
-          # Obtain the query processing time, which is given in miliseconds as 'took' key: 
-          @query_process_time = (Float(@facts.delete(:took)) / 1000)
+        # Obtain the query processing time, which is given in miliseconds as 'took' key: 
+        @query_process_time = (Float(@facts.delete(:took)) / 1000)
 
-          result_hits = @facts.delete :hits
+        result_hits = @facts.delete :hits
 
-          @total_hits = result_hits.delete :total
-          @max_score  = result_hits.delete :max_score
+        @total_hits = result_hits.delete :total
+        @max_score  = result_hits.delete :max_score
 
-          @hits = result_hits[:hits].each_with_index.map { |ht, o| Hit.new(ht.merge(order: o)) }
-          
-          @hits.freeze
-          @facts.freeze
+        @hits = result_hits[:hits].each_with_index.map { |ht, o| Hit.new(ht.merge(order: o)) }
+        
+        @hits.freeze
+        @facts.freeze
 
-          @query_total_time = (Time.now - start_time)
-          
-        end
+        @query_total_time = (Time.now - start_time)
+        
+      end
 
-        def materialize!
-          # Call the materializer and:
-          # - Filter out elements that materialized as nulls
-          # - Order the elements by relevance
-          @elements = materializer.call(resource_class, hits)
-            .select { |materialized_element| materialized_element.present? }
-            .sort_by do |element|
-              element.search_order
-            end
-          
-        end
-    
-    end
+      def materialize!
+        # Call the materializer and:
+        # - Filter out elements that materialized as nulls
+        # - Order the elements by relevance
+        @elements = materializer.call(self)
+          .select { |materialized_element| materialized_element.present? }
+          .sort_by do |element|
+            element.search_order
+          end
+        
+      end
+  
   end
-end
+end

data/lib/naranya_ecm-sdk/version.rb

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

data/lib/naranya_ecm-sdk.rb

@@ -1,8 +1,9 @@
-require "naranya_ecm-sdk/version"
+require 'naranya_ecm-sdk/version'
 
 require 'active_support/time'
 require 'active_support/configurable'
 require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/hash/indifferent_access.rb'
 require 'yaml'
 
 require 'fog'
@@ -11,17 +12,57 @@ require 'fog'
 module NaranyaEcm
   
   extend ActiveSupport::Autoload
-  
-  autoload :Cache
-  autoload :Search
-  autoload :Lifecycles
 
-  autoload :Models
-  autoload :Behaviors
+  autoload_under 'rest' do
+    autoload :Client
+  end
 
-  include ActiveSupport::Configurable
+  module Rest
+    extend ActiveSupport::Autoload
+    autoload :Client
+    autoload :Persistence
+    autoload :Associations
+    autoload :Model
+    autoload :FinderMethods
+    autoload :Relation
+  end
+
+  autoload_under 'models' do
+    autoload :Category
+    autoload :Content
+    autoload :ContentVersion
+    autoload :DownloadAuthorization
+    autoload :MediaResource
+  end
+
+  module Behaviors
+    extend ActiveSupport::Autoload
+    autoload :Localizable
+    autoload :Timestampable
+    autoload :Mediable
+  end
+
+  module Cache
+    extend ActiveSupport::Autoload
+    autoload :Key
+    autoload :Methods
+  end
 
-  include Models
+  autoload_under 'lifecycles' do
+    autoload :ContentLifecycle
+  end
+
+  module Search
+    extend ActiveSupport::Autoload
+    autoload :Hit
+    autoload :Methods
+    autoload :Query
+    autoload :Results
+  end
+
+  autoload :ActiveResourceBasePatch
+
+  include ActiveSupport::Configurable
 
   DEFAULT_CONFIG = {
     site: "http://ecm.naranya.net:5000",
@@ -41,15 +82,15 @@ module NaranyaEcm
       yield config
     end
 
+    def document_module
+      NaranyaEcm::Rest::Model
+    end
+
     def options
       auto_conf unless config.present?
       config
     end
 
-    def cache_key_for(attributes = {})
-      Cache::Key.new attributes
-    end
-
     def load_config_from_yml(yml_path, env="production")
       raise "YAML file doesn't extst" unless File.exist?(yml_path)
       yml_config = DEFAULT_CONFIG.merge(YAML::load(ERB.new(File.read(yml_path)).result)[env])

data/naranya_ecm-sdk.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport',  '>= 4.0.4'
   spec.add_dependency 'activemodel',    '>= 4.0.4'
-  spec.add_dependency 'activeresource', '~> 4.0.0'
+  spec.add_dependency 'httparty'
   spec.add_dependency 'state_machine'
   spec.add_dependency 'fog'
 

data/spec/models/category_spec.rb

@@ -4,8 +4,13 @@ describe NaranyaEcm::Category, vcr: true do
 
   it_behaves_like "a NaranyaEcm resource"
 
-  it "responds to #names" do
-    expect(subject).to respond_to :names
+  describe "#name" do
+    it "responds to #name" do
+      expect(subject).to respond_to :name
+    end
+    it "responds to #name_translations" do
+      expect(subject).to respond_to :name_translations
+    end
   end
 
 end

data/spec/models/content_spec.rb

@@ -4,8 +4,17 @@ describe NaranyaEcm::Content, vcr: true do
 
   it_behaves_like "a NaranyaEcm resource"
 
-  it "responds to #titles" do
-    expect(subject).to respond_to :titles
+  describe "localized title" do
+    it "responds to #title" do
+      expect(subject).to respond_to :title
+    end
+    it "responds to #title_translations" do
+      expect(subject).to respond_to :title_translations
+    end
+  end
+
+  it "responds to #description" do
+    expect(subject).to respond_to :title
   end
 
 end

data/spec/models/media_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe NaranyaEcm::Media, vcr: true do
+describe NaranyaEcm::MediaResource, vcr: true do
 
   it_behaves_like "a NaranyaEcm resource"
 

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ VCR.configure do |config|
   config.default_cassette_options = { record: :new_episodes, erb: true }
 end
 
-require 'naranya_ecm'
+require 'naranya_ecm-sdk'
 
 RSpec.configure do |config|
   # ## Mock Framework

data/spec/support/naranya_ecms_shared_specs.rb

@@ -6,18 +6,6 @@ shared_examples "a NaranyaEcm resource" do
     
     subject { described_class }
 
-    it "responds to #site" do
-      expect(subject).to respond_to :site
-    end
-
-    describe "#site" do
-      subject { described_class.site }
-
-      it "has the same URL as in the configuration options" do
-        expect(subject.to_s).to eq NaranyaEcm.options.site
-      end
-    end
-
     it "responds to #find" do
       expect(subject).to respond_to :find
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naranya_ecm-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.4
 - !ruby/object:Gem::Dependency
-  name: activeresource
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -168,28 +168,24 @@ files:
 - dev/search.rb
 - lib/naranya_ecm-sdk.rb
 - lib/naranya_ecm-sdk/version.rb
-- lib/naranya_ecm/behaviors.rb
 - lib/naranya_ecm/behaviors/localizable.rb
-- lib/naranya_ecm/behaviors/resourceable.rb
+- lib/naranya_ecm/behaviors/mediable.rb
 - lib/naranya_ecm/behaviors/timestampable.rb
-- lib/naranya_ecm/cache.rb
 - lib/naranya_ecm/cache/key.rb
 - lib/naranya_ecm/cache/methods.rb
-- lib/naranya_ecm/has_many_patch.rb
-- lib/naranya_ecm/lifecycles.rb
 - lib/naranya_ecm/lifecycles/content_lifecycle.rb
-- lib/naranya_ecm/lifecycles/lifecycleable.rb
-- lib/naranya_ecm/lifecycles/version_lifecycle.rb
-- lib/naranya_ecm/models.rb
 - lib/naranya_ecm/models/category.rb
 - lib/naranya_ecm/models/content.rb
 - lib/naranya_ecm/models/content_version.rb
 - lib/naranya_ecm/models/download_authorization.rb
-- lib/naranya_ecm/models/embedded_hash.rb
-- lib/naranya_ecm/models/embedded_localized_hash.rb
-- lib/naranya_ecm/models/lifecycle.rb
 - lib/naranya_ecm/models/media_resource.rb
-- lib/naranya_ecm/search.rb
+- lib/naranya_ecm/rest/associations.rb
+- lib/naranya_ecm/rest/client.rb
+- lib/naranya_ecm/rest/errors.rb
+- lib/naranya_ecm/rest/finder_methods.rb
+- lib/naranya_ecm/rest/model.rb
+- lib/naranya_ecm/rest/persistence.rb
+- lib/naranya_ecm/rest/relation.rb
 - lib/naranya_ecm/search/hit.rb
 - lib/naranya_ecm/search/methods.rb
 - lib/naranya_ecm/search/query.rb

data/lib/naranya_ecm/behaviors/resourceable.rb

@@ -1,22 +0,0 @@
-# estoy loco...
-
-module NaranyaEcm::Behaviors
-  module Resourceable
-    extend ActiveSupport::Concern
-
-    included do
-      self.site = NaranyaEcm.options.site
-      before_save :normalize_attributes
-      after_save :reload
-    end
-
-    def normalize_attributes
-      # Remove associated objects; Keep only the ID's:
-      self.reflections
-        .select { |key, val| val.class.name == "ActiveResource::Reflection::AssociationReflection" }
-        .keys.each { |attribute_name| self.attributes.delete attribute_name }
-      
-    end
-    
-  end
-end

data/lib/naranya_ecm/behaviors.rb

@@ -1,10 +0,0 @@
-require 'active_support/dependencies/autoload'
-
-module NaranyaEcm
-  module Behaviors
-    extend ActiveSupport::Autoload
-    autoload :Localizable
-    autoload :Timestampable
-    autoload :Resourceable
-  end
-end

data/lib/naranya_ecm/cache.rb

@@ -1,9 +0,0 @@
-require 'active_support/dependencies/autoload'
-
-module NaranyaEcm
-  module Cache
-    extend ActiveSupport::Autoload
-    autoload :Key
-    autoload :Methods
-  end
-end