jakewendt-active_record_sunspotter 0.0.12 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc5d2892a72ebadab5312d46eb1bab1d30821be
-  data.tar.gz: f58e5becead798a846087b9ce8641ac8a705b90e
+  metadata.gz: 1cbf38085cf568de0799a1f8ce7ebb52545b26ff
+  data.tar.gz: ce140ffcd58a91c4eb55e5a4b8a2861e723bb8f7
 SHA512:
-  metadata.gz: 15fd738ed93098d20eb9e563c73f90f7d0818e1e8956fefd2ad5bf4b54de3f4f4752597a66a7053dee7e7ec0bf672bb1112337b4e16ea086c02f725c931c50a8
-  data.tar.gz: 3f6705aa87f2e0a77ea34f37b9f14bf43f90f179d41b019da958f61b2613eb8797066536e484cc5e2ea51ff65d456abd389275a55358e636362781c54a7d92e9
+  metadata.gz: 84df83b33a7dcd53314a4561054c45d46007b879dbcd7e2867f1fd2cf09cdc3ea3502decf9fdedf8d9d83bf2f808a0457b1be5d40b7d1ef2d8be0336fe090cff
+  data.tar.gz: 47eba5dffe54913b9f5b99b5974f23a87622913f67f9a61e11f01f44ede4a8754ce2f4feb809fc3d625ef7f7936e6f4dd9e9ab101028ce6bb5b90134cdfee111

data/lib/active_record_sunspotter.rb

@@ -10,9 +10,20 @@ require 'active_record_sunspotter/search_sunspot_for'
 require 'active_record_sunspotter/sunspot_helper'
 
 
+#	sunspot_rails_2.0.0 uses methods that are deprecated in rails 4
+#	sunspot_rails_2.1.0 (or sunspot_2.1.0 or sunspot_solr_2.1.0) won't compile (java issues)
+#	copied in this 1 file
+require 'active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_adapters'
+
+
 if defined?(Rails)
 	require 'active_record_sunspotter/rails/engine'
 	require 'active_record_sunspotter/rails/railtie'
 
+	# sunspot_solr-2.0.0 uses "Rails::VERSION::MAJOR == 3" which stops tasks from loading.
+	#if defined?(Rails::Railtie)
+	require 'sunspot/solr/railtie'
+	#end
+
 	ActionController::Base.append_view_path( File.join(File.dirname(__FILE__), '../vendor/views'))
 end

data/lib/active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_adapters.rb

@@ -0,0 +1,90 @@
+module Sunspot #:nodoc:
+  module Rails #:nodoc:
+    # 
+    # This module provides Sunspot Adapter implementations for ActiveRecord
+    # models.
+    #
+    module Adapters
+      class ActiveRecordInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+        # 
+        # Return the primary key for the adapted instance
+        #
+        # ==== Returns
+        # 
+        # Integer:: Database ID of model
+        #
+        def id
+          @instance.id
+        end
+      end
+
+      class ActiveRecordDataAccessor < Sunspot::Adapters::DataAccessor
+        # options for the find
+        attr_accessor :include
+        attr_reader :select
+
+        def initialize(clazz)
+          super(clazz)
+          @inherited_attributes = [:include, :select]
+        end
+
+        #
+        # Set the fields to select from the database. This will be passed
+        # to ActiveRecord.
+        #
+        # ==== Parameters
+        #
+        # value<Mixed>:: String of comma-separated columns or array of columns
+        #
+        def select=(value)
+          value = value.join(', ') if value.respond_to?(:join)
+          @select = value
+        end
+        
+        # 
+        # Get one ActiveRecord instance out of the database by ID
+        #
+        # ==== Parameters
+        #
+        # id<String>:: Database ID of model to retreive
+        #
+        # ==== Returns
+        #
+        # ActiveRecord::Base:: ActiveRecord model
+        # 
+        def load(id)
+          @clazz.where(@clazz.primary_key => id).merge(scope_for_load).first
+        end
+
+        # 
+        # Get a collection of ActiveRecord instances out of the database by ID
+        #
+        # ==== Parameters
+        #
+        # ids<Array>:: Database IDs of models to retrieve
+        #
+        # ==== Returns
+        #
+        # Array:: Collection of ActiveRecord models
+        #
+        def load_all(ids)
+          @clazz.where(@clazz.primary_key => ids).merge(scope_for_load)
+        end
+        
+        private
+        
+        def scope_for_load
+          scope = relation
+          scope = scope.includes(@include) if @include.present?
+          scope = scope.select(@select)    if @select.present?
+          scope 
+        end
+
+        # COMPATIBILITY: Rails 4 has deprecated the 'scoped' method in favour of 'all'
+        def relation
+          ::Rails.version >= '4' ? @clazz.all : @clazz.scoped
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jakewendt-active_record_sunspotter
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 4.0.0
 platform: ruby
 authors:
 - George 'Jake' Wendt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
@@ -42,14 +42,14 @@ dependencies:
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: active_record_sunspotter
@@ -65,6 +65,7 @@ files:
 - lib/active_record_sunspotter/search_sunspot_for.rb
 - lib/active_record_sunspotter/sunspot_column.rb
 - lib/active_record_sunspotter/sunspot_helper.rb
+- lib/active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_adapters.rb
 - lib/active_record_sunspotter/sunspot_rails_server.rb
 - lib/active_record_sunspotter/sunspotability.rb
 - lib/jakewendt-active_record_sunspotter.rb
@@ -93,12 +94,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []