about_page 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    about_page (0.0.2)
+    about_page (0.0.3)
       rails (~> 3.2)
 
 GEM

data/app/controllers/about_page/about_controller.rb

@@ -11,7 +11,7 @@ module AboutPage
       @configuration.set_headers!(response)
 
       respond_to do |format|
-        format.html { render :status => @configuration.ok? ? 200 : 417 } # about_page.html.erb
+        format.html { render :status => @configuration.valid? ? 200 : 417 } # about_page.html.erb
         format.json { render :json => @configuration.to_json }
         format.xml  { render :xml  => @configuration.to_xml }
       end

data/app/views/about_page/about/_generic_hash.html.erb

@@ -1,9 +1,7 @@
 <h1><%= key.to_s.humanize %></h1>
-<% if profile.respond_to? :messages %>
   <% profile.messages.each do |msg| %>
     <div><%= msg %></div>
-  <% end %>
-<% end %>
+  <% end if profile.respond_to? :messages %>
 <ul>
   <% profile.each_pair do |k,v| %>
     <li><%= [k,v].join(': ') %></li>

data/app/views/about_page/about/index.html.erb

@@ -1,6 +1,6 @@
 <div class="about_page">
   <% @configuration.each do |key, profile| %>
-    <div class="pane pane-<%= key.to_s.parameterize %> <%= 'not-ok' if profile.respond_to? :ok? and !profile.ok? %>">
+    <div class="pane pane-<%= key.to_s.parameterize %> <%= 'not-ok' if profile.respond_to? :valid? and !profile.valid? %>">
       <%= render_about_pane(key, profile) %>
     </div>
   <% end %>

data/lib/about_page/configuration.rb

@@ -50,8 +50,8 @@ module AboutPage
       self.nodes.each { |key, profile| profile.preflight(request) }
     end
 
-    def ok?
-       self.nodes.select { |key, profile| profile.respond_to? :ok? }.all? { |key, profile| profile.ok? }
+    def valid?
+       self.nodes.select { |key, profile| profile.respond_to? :ok? }.all? { |key, profile| profile.valid? }
     end
 
     def nodes
@@ -63,8 +63,20 @@ module AboutPage
     end
 
     class Node
+      include ActiveModel::Validations
+
       def preflight request
+        errors.clear
+        @request_expectations = request.params.select { |k,v| k =~ /^#{namespace}\./ }
+      end
+
+      def expects key 
+        @request_expectations["#{namespace}.#{key}"] || self.options[:expects][key] if @request_expectations
+      end
 
+      def messages
+        run_validations!
+        errors.to_a.uniq
       end
 
       def set_headers! response
@@ -73,16 +85,13 @@ module AboutPage
 
       def add_header response, text
         response.headers['X-AboutPage-Warning'] ||= "" 
-        response.headers['X-AboutPage-Warning'] += "#{text};"
+        response.headers['X-AboutPage-Warning'] += "#{self.class.name}: #{text};"
         
       end
 
-      def ok?
-        true
-      end
-
-      def messages
-        []
+      protected
+      def namespace
+        self.class.name.split("::").last.downcase
       end
     end
   end

data/lib/about_page/fedora.rb

@@ -2,30 +2,31 @@ module AboutPage
   class Fedora < AboutPage::Configuration::Node
     delegate :each_pair, :to_json, :to_xml, :to => :to_h
 
+    validates_each :profile do |record, attr, value| 
+      unless value.present?
+        record.errors.add attr, ": unable to connect to Fedora: #{record.rubydora.inspect}"
+      end
+    end
+
     attr_accessor :rubydora
 
     def initialize rubydora_instance
       self.rubydora = rubydora_instance
     end
 
-    def to_h
+    def profile
       rubydora.profile || {}
     end
 
-    def ok?
-      !to_h.empty?
+    def to_h
+      profile
     end
 
-    def messages
-      a = []
-      a << "Unable to connect to fedora: #{self.rubydora.inspect}" if rubydora.profile.nil?
-
-      a
-    end
 
     def preflight request
       # FIXME: ew.
       self.rubydora.instance_variable_set('@profile', nil)
+      super(request)
     end
 
   end

data/lib/about_page/solr.rb

@@ -4,11 +4,21 @@ module AboutPage
 
     attr_accessor :rsolr, :options
 
+    validates_each :schema do |record, attr, value| 
+      unless value.present?
+        record.errors.add attr, ": unable to connect to Solr: #{record.rsolr.inspect}"
+      end
+    end
+    validates :numDocs, :numericality => { :greater_than_or_equal_to => Proc.new { |c| c.expects(:numDocs) } }
+
+
     def initialize rsolr_instance, options = {}
       self.rsolr = rsolr_instance
       self.options = options
+      self.options[:expects] ||= {}
+      self.options[:expects][:numDocs] ||= 1
 
-      self.options[:minimum_numdocs] ||= 1
+      @request_expectations = {}
     end
 
     def schema
@@ -17,33 +27,38 @@ module AboutPage
       {}
     end
 
-    def index
-      schema['index'] || {}
-    end
-    alias_method :to_h, :index
+    def registry
+      @registry ||= begin
+                      h = {}
+                      resp = rsolr.get 'admin/registry.jsp', :params => { :wt => 'xml' }
+                      doc = Nokogiri::XML resp
 
-    def ok?
-      return false if schema.empty?
-      return false if index[:numDocs].to_i < minimum_numdocs
+                      doc.xpath('/solr/*').each do |node|
+                        next if node.name == "solr-info"
+                        h[node.name] = node.text
+                      end
 
-      true
+                      h
+                    end
+    rescue
+      {}
     end
 
-    def messages
-      a = []
-      a << "Unable to connect to solr: #{self.rsolr.inspect}" if schema.empty?
-      a << "Solr numDocs (#{index[:numDocs]}) is less than the minimum #{minimum_numdocs}" if !schema.empty? and index[:numDocs].to_i < minimum_numdocs
+    def index
+      (schema || {})['index'] || {}
+    end
 
-      a
+    def to_h
+      index.merge(registry)
     end
 
+    def numDocs; index[:numDocs]; end
+
     def preflight request
       @schema = nil
-      @minimum_numdocs = request.params['solr.numDocs'].to_i if request.params['solr.numDocs'].to_i
-    end
+      @registry = nil
 
-    def minimum_numdocs
-      @minimum_numdocs || self.options[:minimum_numdocs]
+      super
     end
   end
 end

data/lib/about_page/version.rb

@@ -1,3 +1,3 @@
 module AboutPage
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/solr_spec.rb

@@ -27,31 +27,30 @@ describe AboutPage::Solr do
     end
   end
 
-
-  describe "#ok?" do
+  describe "#valid?" do
     it "should be ok if the number of documents in the index is greater than or equal to the :minimum_numdocs" do
-      subject.stub(:index).and_return { { :numDocs => 1 }}
-      subject.stub(:minimum_numdocs).and_return 1
-      subject.should be_ok
+      subject.stub(:schema).and_return { { 'index' => { :numDocs => 1 } } } 
+      subject.stub(:expects).and_return 1
+      subject.should be_valid
     end
 
     it "should be not be ok if the number of documents in the index is less than the :minimum_numdocs" do
-      subject.stub(:index).and_return { { :numDocs => 1 }}
-      subject.stub(:minimum_numdocs).and_return 5
-      subject.should_not be_ok
+      subject.stub(:schema).and_return { { 'index' => { :numDocs => 1 } } }
+      subject.stub(:expects).and_return 5
+      subject.should_not be_valid
     end
 
     it "should not be ok if the index :numDocs param is not set" do
-      subject.stub(:index).and_return { Hash.new }
-      subject.stub(:minimum_numdocs).and_return 1
-      subject.should_not be_ok
+      subject.stub(:schema).and_return { { 'index' => { } } } 
+      subject.stub(:expects).and_return 1
+      subject.should_not be_valid
     end
   end
 
   describe "#set_headers!" do
     it "should add helpful headers when something is wrong" do
-      subject.stub(:index).and_return { { :numDocs => 1 }}
-      subject.stub(:minimum_numdocs).and_return 5
+      subject.stub(:schema).and_return { { 'index' => { :numDocs => 1 } } } 
+      subject.stub(:expects).and_return 5
 
       subject.should_receive(:add_header)
       subject.set_headers! mock()
@@ -60,19 +59,19 @@ describe AboutPage::Solr do
 
   describe "#minimum_numdocs" do
     it "should default to 1" do
-      subject.minimum_numdocs.should == 1
+      subject.expects(:numDocs).should == 1
     end
 
     it "should use parameters given in the configuration" do
-      node = AboutPage::Solr.new(@mock_solr_connection, :minimum_numdocs => 5)
-      node.minimum_numdocs.should == 5
+      node = AboutPage::Solr.new(@mock_solr_connection, :expects => { :numDocs => 5 })
+      node.expects(:numDocs).should == 5
     end
 
     it "should use the request parameters to set the minimum_numdocs" do
-      node = AboutPage::Solr.new(@mock_solr_connection, :minimum_numdocs => 5)
+      node = AboutPage::Solr.new(@mock_solr_connection, :expects => { :numDocs => 5 })
       node.preflight(mock(:params => { 'solr.numDocs' => 1000 }))
 
-      node.minimum_numdocs.should == 1000
+      node.expects(:numDocs).should == 1000 
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: about_page
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 823128254637505744
+      hash: 2890899449821864305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 823128254637505744
+      hash: 2890899449821864305
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24