sunspot_padrino 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9afd03f8cd7b011bfe02a63f39779fa082ad253d
-  data.tar.gz: 8aec5a2fc5925f7e28f55a672b9809eb2223b5a5
+  metadata.gz: 5619c6bf801dffdfe2d404c93c808531971ccd00
+  data.tar.gz: 0357049bc3f1676cf04b7075057ee4eac23b8a01
 SHA512:
-  metadata.gz: db929029d01de3f2f157509be0f55f2d7f906552ae1fad450045416587c65f157001cfced346a49e0fe08ad10ab9b224d48782a0fc40cdf54d42e23ec8423370
-  data.tar.gz: 31632484fe9f8c858d68b5da3d0bc0bd6b869fc80d56df895e395b790f4e42f0351f2545d4c1199537df04f1e3929485db2ead3aa1b9af7b82ff7d08c26f0c8a
+  metadata.gz: 9b53351a0776a78418f226b4a92500e0706799951f82fa02edadb32f263ed442191bb0b4de801a6a1fea5fe42500d06ab3a0dd5f0961ec09b268b02caacf0325
+  data.tar.gz: 05b43bf0b9ebab34da5b68ef7df22e46c12dfe50b6c09d925b4dcee4e6162a7c8ae5aea487cda65bd8e8876b4c5f1fa039af03c00c3798614d0bf80eaa936bb5

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/sunspot/padrino.rb

@@ -6,8 +6,8 @@ require File.join(File.dirname(__FILE__), 'padrino', 'searchable')
 
 module Sunspot #:nodoc:
   module Padrino #:nodoc:
-    autoload :SolrInstrumentation, File.join(File.dirname(__FILE__), 'padrino', 'solr_instrumentation')
     autoload :StubSessionProxy, File.join(File.dirname(__FILE__), 'padrino', 'stub_session_proxy')
+
     begin
       require 'sunspot_solr'
       autoload :Server, File.join(File.dirname(__FILE__), 'padrino', 'server')

data/lib/sunspot/padrino/init.rb

@@ -1,6 +1,10 @@
-require 'padrino-core/tasks'
-require 'padrino-gen/command'
-require 'padrino-core/cli/rake'
+begin
+  require 'padrino-core/tasks'
+  require 'padrino-gen/command'
+  require 'padrino-core/cli/rake'
+rescue LoadError
+  # Totally okay if these can't load.
+end
 
 Sunspot.session = Sunspot::Padrino.build_session
 Sunspot::Adapters::InstanceAdapter.register(Sunspot::Padrino::Adapters::ActiveRecordInstanceAdapter, ActiveRecord::Base)

data/lib/sunspot_padrino.rb

@@ -7,8 +7,7 @@ end
 require 'sunspot/padrino'
 require 'sunspot/padrino/init'
 
-# Add our generators to Padrino::Generators.
-Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/../generators/*.rb']
-
-# Add our tasks to padrino-core.
-Padrino::Tasks.files << File.dirname(__FILE__) + '/sunspot/padrino/tasks.rb'
+if defined? Padrino::Tasks
+  # Add our tasks to padrino-core.
+  Padrino::Tasks.files << File.dirname(__FILE__) + '/sunspot/padrino/cli/tasks.rb'
+end

data/sunspot_padrino.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "sunspot_padrino"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jordan Yaker", "Supportify, Inc."]
+  s.date = "2015-05-08"
+  s.description = "    Sunspot::Padrino is a derived plugin that provides drop-in integration of the\n    Sunspot Solr search library with Padrino. It is based on the original Sunspot\n    ::Rails library located at https://github.com/sunspot/sunspot.\n"
+  s.email = "help@supportify.io"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "generators/sunspot.rb",
+    "generators/templates/sunspot.yml",
+    "lib/sunspot/padrino.rb",
+    "lib/sunspot/padrino/adapters.rb",
+    "lib/sunspot/padrino/cli/tasks.rb",
+    "lib/sunspot/padrino/configuration.rb",
+    "lib/sunspot/padrino/init.rb",
+    "lib/sunspot/padrino/rspec/spec_helper.rb",
+    "lib/sunspot/padrino/searchable.rb",
+    "lib/sunspot/padrino/server.rb",
+    "lib/sunspot/padrino/stub_session_proxy.rb",
+    "lib/sunspot_padrino.rb",
+    "spec/spec_helper.rb",
+    "spec/sunspot_padrino_spec.rb",
+    "sunspot_padrino.gemspec"
+  ]
+  s.homepage = "http://github.com/supportify/sunspot_padrino"
+  s.licenses = ["BSD"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.6"
+  s.summary = "Padrino integration for the Sunspot Solr search library"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_padrino
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jordan Yaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -104,18 +104,17 @@ files:
 - generators/templates/sunspot.yml
 - lib/sunspot/padrino.rb
 - lib/sunspot/padrino/adapters.rb
+- lib/sunspot/padrino/cli/tasks.rb
 - lib/sunspot/padrino/configuration.rb
 - lib/sunspot/padrino/init.rb
-- lib/sunspot/padrino/request_lifecycle.rb
+- lib/sunspot/padrino/rspec/spec_helper.rb
 - lib/sunspot/padrino/searchable.rb
 - lib/sunspot/padrino/server.rb
-- lib/sunspot/padrino/solr_instrumentation.rb
-- lib/sunspot/padrino/spec_helper.rb
 - lib/sunspot/padrino/stub_session_proxy.rb
-- lib/sunspot/padrino/tasks.rb
 - lib/sunspot_padrino.rb
 - spec/spec_helper.rb
 - spec/sunspot_padrino_spec.rb
+- sunspot_padrino.gemspec
 homepage: http://github.com/supportify/sunspot_padrino
 licenses:
 - BSD

data/lib/sunspot/padrino/request_lifecycle.rb

@@ -1,36 +0,0 @@
-module Sunspot #:nodoc:
-  module Padrino #:nodoc:
-    # 
-    # This module adds an after_filter to ActionController::Base that commits
-    # the Sunspot session if any documents have been added, changed, or removed
-    # in the course of the request.
-    #
-    module RequestLifecycle
-      class <<self
-        def included(base) #:nodoc:
-          subclasses = base.subclasses.map do |subclass|
-            begin
-              subclass.constantize
-            rescue NameError
-            end
-          end.compact
-          loaded_controllers = [base].concat(subclasses)
-          # Depending on how Sunspot::Padrino is loaded, there may already be
-          # controllers loaded into memory that subclass this controller. In
-          # this case, since after_filter uses the inheritable_attribute
-          # structure, the already-loaded subclasses don't get the filters. So,
-          # the below ensures that all loaded controllers have the filter.
-          loaded_controllers.each do |controller|
-            controller.after do
-              if Sunspot::Padrino.configuration.auto_commit_after_request?
-                Sunspot.commit_if_dirty
-              elsif Sunspot::Padrino.configuration.auto_commit_after_delete_request?
-                Sunspot.commit_if_delete_dirty
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sunspot/padrino/solr_instrumentation.rb

@@ -1,21 +0,0 @@
-module Sunspot
-  module Padrino
-    module SolrInstrumentation
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :send_and_receive, :as_instrumentation
-      end
-
-
-      def send_and_receive_with_as_instrumentation(path, opts)
-        parameters = (opts[:params] || {})
-        parameters.merge!(opts[:data]) if opts[:data].is_a? Hash
-        payload = {:path => path, :parameters => parameters}
-        ActiveSupport::Notifications.instrument("request.rsolr", payload) do
-          send_and_receive_without_as_instrumentation(path, opts)
-        end
-      end
-    end
-  end
-end