jakewendt-active_record_sunspotter 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f05bc56e701726f80ddfaae0e883a2681b9153
-  data.tar.gz: ab3caa50a2fec615bc482630e736a38e3df24b77
+  metadata.gz: cb424a0065b4e4b31b3f21f39113a4860bfd4313
+  data.tar.gz: 32664701a4dcd277c5a55b2fe29dbbfbbc0edeb8
 SHA512:
-  metadata.gz: f10cc1f7f4330ac4be8d6ba46fe5c2099c89ec807edaf1c095ad3c83875807dc4e0521733ac9b09af317869d8c7a94c9b3e1f44b95718aee72c6b13b2edbddbe
-  data.tar.gz: ab600a96bd3d2d3d073825b1c01c9b845f69ecb4483c796ac8561249afad172439adc247e27c7111ba094651ccf675e3d16800bc75ffee6eca3e2f25931dfc2f
+  metadata.gz: d6b4cb8f58f15bc862af43f58980e8c544edbddf8dd0ece1b49957211fe96f4d376b3b926cbbf243f50bdd9fde0f6ac83c8de1431f46f69a78bd9b0e5e66ea05
+  data.tar.gz: a77097f426f3be45f7a603a4f530302859be84cae50cf33ba4eaea4564ba277dba00844b5df24b252141e8bf79b657eaa115a9d22e6e56882313b66be41dccd0

data/README.rdoc

@@ -4,6 +4,82 @@
 
 
 
+== Upgrade notes
+
+Upgrading the sunspot family of gems from 2.0.0 to 2.1.0 has been a bit of a nightmare.
+
+However
+
+Both solr/conf/schema.xml and solr/conf/solrconfig.xml differ between the 2 versions, so update your app's.
+
+Once updated, the mods in active_record_sunspotter.rb can be removed.
+Also, remove the added require line in the Rakefile for sunspot rake tasks.
+
+Create a solr/solr.xml to look like so ...
+
+ <?xml version="1.0" encoding="UTF-8" ?>
+ <solr persistent="false">
+  <cores adminPath="/admin/cores" host="${host:}" hostPort="${jetty.port:}">
+    <core name="production"  instanceDir="." dataDir="data/production"/>
+    <core name="development" instanceDir="." dataDir="data/development"/>
+    <core name="test"        instanceDir="." dataDir="data/test"/>
+  </cores>
+ </solr>
+
+... or use the new one, but reorganize the solr directory.
+
+
+
+
+config/sunspot.yml needs an absolute solr_home for each environment, and a path too
+
+    solr_home: /Users/jakewendt/github_repo/jakewendt/active_record_sunspotter/solr
+    path: /solr/production
+
+
+Apparently, solr.xml's dataDir and sunspot.yml's path must match.  Or not?
+
+
+
+Rather confused on this issue. The command (ps | grep solr) shows a solr.data.dir of /solr/data/development 
+even though 
+
+ solr.xml ...
+    <core name="development" instanceDir="." dataDir="development/data"/>
+
+ sunspot.yml
+    path: /solr/development
+
+Seems to use both data/development and development/data for some reason?
+
+
+
+
+
+
+
+
+REALLY NEED TO MAKE THIS UPGRADABLE!  Not Upgrade-and-start-overable!
+
+
+
+
+
+
+
+
+sudo mkdir /opt/local/lib/ruby2.0/gems/2.0.0/gems/sunspot_solr-2.1.0/solr/solr-webapp
+sudo chmod 777 /opt/local/lib/ruby2.0/gems/2.0.0/gems/sunspot_solr-2.1.0/solr/solr-webapp
+
+2014-05-02 14:26:28.072:INFO:oejd.DeploymentManager:Deployable added: /opt/local/lib/ruby2.0/gems/2.0.0/gems/sunspot_solr-2.1.0/solr/contexts/solr.xml
+2014-05-02 14:26:28.116:WARN:oejx.XmlConfiguration:Config error at <Set name="tempDirectory"><Property name="jetty.home" default="."/>/solr-webapp</Set> java.lang.reflect.InvocationTargetException
+
+Caused by: 
+java.lang.IllegalArgumentException: Bad temp directory: /opt/local/lib/ruby2.0/gems/2.0.0/gems/sunspot_solr-2.1.0/solr/solr-webapp
+
+
+I suppose it could be another folder, but you'd need to modify the gem's solr/contexts/solr.xml file.
+
 
 
 
@@ -29,6 +105,7 @@ end
 
 
 
+The 2.1.0 version of this file is now included in this gem.
 
 And another mod... (I may be able to patch this one.)
 
@@ -66,6 +143,9 @@ ArgumentError: Unknown key: :include. Valid keys are: :start, :batch_size
  c ; bundle exec rake sunspot:solr:stop ; bundle exec rake sunspot:solr:stop RAILS_ENV=test ; bundle exec rake sunspot:solr:start ; bundle exec rake sunspot:solr:start RAILS_ENV=test ; bundle exec rake test
 
 
+ bundle exec rake sunspot:solr:stop ; bundle exec rake sunspot:solr:start
+
+ bundle exec rake sunspot:solr:stop RAILS_ENV=test ; bundle exec rake sunspot:solr:start RAILS_ENV=test ; bundle exec rake test  ; bundle exec rake sunspot:solr:stop RAILS_ENV=test
 
 == Gemified with Jeweler
 

data/lib/active_record_sunspotter.rb

@@ -13,14 +13,14 @@ 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'
+#require 'active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_adapters'
 
 #	for some reason, the :include key will inspire ...
 #	ArgumentError: Unknown key: :include. Valid keys are: :start, :batch_size
 #	Tasks: TOP => sunspot:solr:reindex => sunspot:reindex
 #	Seems to have been this way for some time, but now it errors.
 #	Using 2.1.0's version makes everyone happy?
-require 'active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_searchable'
+#require 'active_record_sunspotter/sunspot_rails_2.1.0_sunspot_rails_searchable'
 #	Somehow this requires the presence of a new file solr/solr.xml
 
 
@@ -35,7 +35,7 @@ if defined?(Rails)
 
 	# sunspot_solr-2.0.0 uses "Rails::VERSION::MAJOR == 3" which stops tasks from loading.
 	#if defined?(Rails::Railtie)
-	require 'sunspot/solr/railtie'
+	#require 'sunspot/solr/railtie'
 	#end
 
 	ActionController::Base.append_view_path( File.join(File.dirname(__FILE__), '../vendor/views'))

data/vendor/assets/javascripts/sunspot.js

@@ -1,5 +1,8 @@
 jQuery(function(){
 
+//
+// perhaps make this 'div.facet_toggle *' so as to include the span triangle icon?
+//
 	jQuery('div.facet_toggle a').click(function(){
 //		jQuery(this).parent().next().toggle(500);
 //  added 'blind' so doesn't resize stuff and just slides in.
@@ -14,6 +17,9 @@ jQuery(function(){
 		connectWith: ".selectable_columns"
 	}).disableSelection();
 
+//
+// should this really be '<input>' and not just 'input'?
+//
 	jQuery('form').submit(function(){
 		jQuery('#selected_columns li').each(function(){
 			jQuery('<input>').attr({ 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: jakewendt-active_record_sunspotter
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - George 'Jake' Wendt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,6 @@ files:
 - lib/active_record_sunspotter/sunspot_rails_server.rb
 - lib/active_record_sunspotter/sunspotability.rb
 - lib/jakewendt-active_record_sunspotter.rb
-- lib/tasks/application.rake
 - vendor/assets/javascripts/sunspot.js
 - vendor/assets/stylesheets/sunspot.css.scss
 - vendor/views/layouts/_footer.html.erb

data/lib/tasks/application.rake

@@ -1,214 +0,0 @@
-#namespace :app do
-#	task :import => :environment do
-#		f = File.open('TheKingJamesBible.txt','r')
-#		{} until( ( line = f.gets ) =~ /^The First Book of Moses:  Called Genesis\s*$/ )
-#		puts line
-#		f.close	#	File.open('TheKingJamesBible.txt','r')
-#	end	#	task :import => :environment do
-#end	#	namespace :app do
-namespace :app do
-	task :import => :environment do
-		File.open('data/TheKingJamesBible.txt','r') do |f|
-			until ( line = f.gets ).match(/^\*\*\*/) 
-			#	skip
-			end
-			while ( line = f.gets ).match(/^\s*$/)
-			#	skip
-			end
-			puts line 
-			#	=> The Old Testament of the King James Version of the Bible
-
-			chapter_num = verse_num = book = chapter = verse = nil
-			new_line_counter = 0
-			book_counter = 0
-			buffer = ''
-
-
-#	basic expectations ...
-#
-#	book ends with >4 new lines but can include new lines (<=2 only)
-#	first verse is after >2 new lines
-
-			while cval = f.getc
-				next if cval == "\r"	#13
-
-				if cval == "\n"	#10
-					new_line_counter += 1
-					buffer << ' '
-					next
-				end
-
-
-				if new_line_counter > 4 && book && chapter && verse && !buffer.blank?
-					#	last verse of book
-					puts "-- CH:#{chapter_num}:V:#{verse_num}:#{buffer}"
-					verse.body = buffer.squish
-					verse.save
-					buffer = ''
-					chapter_num = verse_num = book = chapter = verse = nil
-				end
-
-#	2 new lines isn't just for new books
-#	some chapters are separated by 2 new lines
-#	so need more somehow.  Psalms is causing the problem with the extra new line between chapters
-#	manually removed them
-				if new_line_counter > 2 && !buffer.blank?
-					puts "\n\nLooks like a new book is here:#{buffer.squish}:\n"
-					book_counter += 1
-					#book = buffer.squish
-					book = Book.create(:title => buffer.squish)
-					buffer = ''
-				end
-
-				buffer << cval	#.chr
-
-				if buffer.match(/^([\D]*)(\d+):(\d+)\s+/) #or ( buffer =~ /^([\D]*)End of the Project Gutenberg EBook/ )
-					text = $1	#	previous verse
-					if chapter_num && verse_num && text
-						puts "CH:#{chapter_num}:V:#{verse_num}:#{text}"
-						verse.body = text.squish
-						verse.save
-					end
-					#chapter = $2.squish #if $2
-					chapter = book.chapters.find_or_create_by(:position => $2.to_i)
-					chapter_num = $2.squish #if $2
-##	I guess that the verse number is just going to be the position?
-##	relax self!  just a demo!
-					#verse = $3.squish #if $3
-					verse = chapter.verses.new(:position => $3.to_i)	#create(:body => $3)
-					verse_num = $3.squish #if $3
-					buffer= ''
-				end
-
-				break if buffer =~ /End of the Project Gutenberg EBook/
-
-				#	reset counter (perhaps way too often)
-				new_line_counter = 0 if cval != "\n"	#	10
-			end
-			puts book_counter
-		end	#	File
-	end	#	task
-
-end	#	namespace
-
-__END__
-
-
-40:38 For the cloud of the LORD was upon the tabernacle by day, and
-fire was on it by night, in the sight of all the house of Israel,
-throughout all their journeys.
-
-
-
-
-The Third Book of Moses:  Called Leviticus
-
-
-1:1 And the LORD called unto Moses, and spake unto him out of the
-tabernacle of the congregation, saying, 1:2 Speak unto the children of
-Israel, and say unto them, If any man of you bring an offering unto
-the LORD, ye shall bring your offering of the cattle, even of the
-herd, and of the flock.
-
-
-
-CH:40:V:37:But if the cloud were not taken up, then they journeyed not till the day that it was taken up.  
-create new book with title:For the cloud of the LORD was upon the tabernacle by day, and fire was on it by night, in the sight of all the house of Israel, throughout all their journeys.  :
-create new book with title:   The Third Book of Moses:  Called Leviticus  :
-CH:1:V:1:And the LORD called unto Moses, and spake unto him out of the tabernacle of the congregation, saying, 
-CH:1:V:2:Speak unto the children of Israel, and 
-
-
-The First Book of Moses:  Called Genesis
-
-
-1:1 In the beginning God created the heaven and the earth.
-
-1:2 And the earth was without form, and void; and darkness was upon
-the face of the deep. And the Spirit of God moved upon the face of the
-waters.
-
-FYI, some verses actually have multiple "paragraphs" .
-
-Also, some verses are merged on the same line?
-
-3:1 Now the serpent was more subtil than any beast of the field which
-the LORD God had made. And he said unto the woman, Yea, hath God said,
-Ye shall not eat of every tree of the garden?  3:2 And the woman said
-unto the serpent, We may eat of the fruit of the trees of the garden:
-3:3 But of the fruit of the tree which is in the midst of the garden,
-God hath said, Ye shall not eat of it, neither shall ye touch it, lest
-ye die.
-
-
-
-
-50:26 So Joseph died, being an hundred and ten years old: and they
-embalmed him, and he was put in a coffin in Egypt.
-
-
-
-
-The Second Book of Moses:  Called Exodus
-
-
-1:1 Now these are the names of the children of Israel, which came
-into Egypt; every man and his household came with Jacob.
-
-1:2 Reuben, Simeon, Levi, and Judah, 1:3 Issachar, Zebulun, and
-Benjamin, 1:4 Dan, and Naphtali, Gad, and Asher.
-
-1:5 And all the souls that came out of the loins of Jacob were seventy
-souls: for Joseph was in Egypt already.
-
-1:6 And Joseph died, and all his brethren, and all that generation.
-
-1:7 And the children of Israel were fruitful, and increased
-abundantly, and multiplied, and waxed exceeding mighty; and the land
-was filled with them.
-
-1:8 Now there arose up a new king over Egypt, which knew not Joseph.
-
-1:9 And he said unto his people, Behold, the people of the children of
-Israel are more and mightier than we: 1:10 Come on, let us deal wisely
-with them; lest they multiply, and it come to pass, that, when there
-falleth out any war, they join also unto our enemies, and fight
-against us, and so get them up out of the land.
-
-1:11 Therefore they did set over them taskmasters to afflict them with
-their burdens. And they built for Pharaoh treasure cities, Pithom and
-Raamses.
-
-1:12 But the more they afflicted them, the more they multiplied and
-grew.
-
-And they were grieved because of the children of Israel.
-
-
-
-
-
-
-4:5 Behold, I will send you Elijah the prophet before the coming of
-the great and dreadful day of the LORD: 4:6 And he shall turn the
-heart of the fathers to the children, and the heart of the children to
-their fathers, lest I come and smite the earth with a curse.
-
-
-***
-
-
-
-
-The New Testament of the King James Bible
-
-
-
-
-The Gospel According to Saint Matthew
-
-
-1:1 The book of the generation of Jesus Christ, the son of David, the
-son of Abraham.
-
-