blacklight 3.0.0pre3 → 3.0.0pre4

data/VERSION

@@ -1 +1 @@
-3.0.0pre3
+3.0.0pre4

data/lib/blacklight.rb

@@ -25,6 +25,7 @@ module Blacklight
   extend Configurable
   extend SearchFields
   
+  require 'blacklight/version'
   require 'blacklight/engine' if defined?(Rails)
   
   class << self

data/lib/blacklight/catalog.rb

@@ -1,10 +1,11 @@
 module Blacklight::Catalog 
   extend ActiveSupport::Concern
-  include Blacklight::SolrHelper
+
 
   # The following code is executed when someone includes blacklight::catalog in their
   # own controller.
   included do  
+    include Blacklight::SolrHelper
     before_filter :search_session, :history_session
     before_filter :delete_or_assign_search_session_params, :only => :index
     after_filter :set_additional_search_session_values, :only=>:index

data/lib/blacklight/controller.rb

@@ -39,9 +39,9 @@ module Blacklight::Controller
     # http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
     # for how to turn off a filter in a sub-class and such.
     def default_html_head
-      stylesheet_links << ['blacklight/yui', 'blacklight/jquery/ui-lightness/jquery-ui-1.8.1.custom.css', 'blacklight/blacklight', {:media=>'all'}]
+      stylesheet_links << ['yui', 'jquery/ui-lightness/jquery-ui-1.8.1.custom.css', 'blacklight/blacklight', {:media=>'all'}]
       
-      javascript_includes << ['blacklight/jquery-1.4.2.min.js', 'blacklight/jquery-ui-1.8.1.custom.min.js', 'blacklight/blacklight' ]
+      javascript_includes << ['jquery-1.4.2.min.js', 'jquery-ui-1.8.1.custom.min.js', 'blacklight/blacklight' ]
     end
     
     

data/lib/blacklight/engine.rb

@@ -15,11 +15,11 @@ module Blackight
     # innitilization process.  
     # See: http://www.cowboycoded.com/2010/08/02/hooking-in-your-rails-3-engine-or-railtie-initializer-in-the-right-place/
     initializer 'blacklight.init', :after=> :disable_dependency_loading do |app|
-      # Note, check for configuration files before calling init, 
-      # otherwise we can't generate these files with the Generator
-      # and we can't tell at this point if we are begin run as a generator
-      # or not (at least, I didn't see a way)
-      Blacklight.init if File.exists?(Blacklight.solr_file)      
+      # Check for a blacklight_install envrionment variable - if set then blacklight
+      # is actively being installed and we should not attempt an init at this time.
+      if defined?(Rails::Server)
+        Blacklight.init
+      end      
     end
 
     # This makes our rake tasks visible.

data/lib/blacklight/version.rb

@@ -1,7 +1,9 @@
 module Blacklight
-  def self.version
-    @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
-  end
+  unless Blacklight.const_defined? :VERSION
+    def self.version
+      @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
+    end
 
-  VERSION = self.version
+    VERSION = self.version
+  end
 end

data/lib/generators/blacklight/assets_generator.rb

@@ -16,9 +16,9 @@ module Blacklight
     source_root File.expand_path('../templates', __FILE__)
   
     def assets
-      directory("public/images", "public/images/blacklight")
-      directory("public/stylesheets", "public/stylesheets/blacklight")
-      directory("public/javascripts", "public/javascripts/blacklight")
+      directory("public/images")
+      directory("public/stylesheets") 
+      directory("public/javascripts") 
     end
     
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight
 version: !ruby/object:Gem::Version 
-  hash: -766259868
-  prerelease: true
+  hash: 1923832001
+  prerelease: 5
   segments: 
   - 3
   - 0
-  - 0pre3
-  version: 3.0.0pre3
+  - 0
+  - pre
+  - 4
+  version: 3.0.0pre4
 platform: ruby
 authors: 
 - jrochkind
@@ -21,7 +23,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,11 +126,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 270495401
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id007
@@ -276,19 +279,20 @@ files:
 - lib/generators/blacklight/templates/migrations/create_bookmarks.rb
 - lib/generators/blacklight/templates/migrations/create_searches.rb
 - lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb
-- lib/generators/blacklight/templates/public/images/bg.png
-- lib/generators/blacklight/templates/public/images/border.png
-- lib/generators/blacklight/templates/public/images/bul_sq_gry.gif
-- lib/generators/blacklight/templates/public/images/checkmark.gif
-- lib/generators/blacklight/templates/public/images/logo.png
-- lib/generators/blacklight/templates/public/images/magnifying_glass.gif
-- lib/generators/blacklight/templates/public/images/remove.gif
-- lib/generators/blacklight/templates/public/images/separator.gif
-- lib/generators/blacklight/templates/public/images/start_over.gif
-- lib/generators/blacklight/templates/public/javascripts/blacklight.js
+- lib/generators/blacklight/templates/public/images/blacklight/bg.png
+- lib/generators/blacklight/templates/public/images/blacklight/border.png
+- lib/generators/blacklight/templates/public/images/blacklight/bul_sq_gry.gif
+- lib/generators/blacklight/templates/public/images/blacklight/checkmark.gif
+- lib/generators/blacklight/templates/public/images/blacklight/logo.png
+- lib/generators/blacklight/templates/public/images/blacklight/magnifying_glass.gif
+- lib/generators/blacklight/templates/public/images/blacklight/remove.gif
+- lib/generators/blacklight/templates/public/images/blacklight/separator.gif
+- lib/generators/blacklight/templates/public/images/blacklight/start_over.gif
+- lib/generators/blacklight/templates/public/javascripts/blacklight/blacklight.js
 - lib/generators/blacklight/templates/public/javascripts/jquery-1.4.2.min.js
 - lib/generators/blacklight/templates/public/javascripts/jquery-ui-1.8.1.custom.min.js
-- lib/generators/blacklight/templates/public/stylesheets/blacklight.css
+- lib/generators/blacklight/templates/public/stylesheets/blacklight/blacklight.css
+- lib/generators/blacklight/templates/public/stylesheets/jquery/ui-lightness/images/ui-anim_basic_16x16.gif
 - lib/generators/blacklight/templates/public/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - lib/generators/blacklight/templates/public/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 - lib/generators/blacklight/templates/public/stylesheets/jquery/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
@@ -420,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities