about_page 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    about_page (0.0.4)
+    about_page (0.0.5)
       rails (~> 3.2)
 
 GEM
@@ -120,10 +120,10 @@ GEM
     sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/app/assets/stylesheets/about_page.scss

@@ -4,6 +4,10 @@
   column-count:3;
 }
 
+.dependency.required {
+  font-weight: bold;
+}
+
 .about_page .pane.not-ok {
   border: 3px solid #f00;
   background-color: rgba(255,0,0,0.5);

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

@@ -1,8 +1,8 @@
-<h1>Dependency Versions</h1>
+<h1>Dependencies</h1>
 <div class="dependencies">
   <ul>
-    <% profile.each_pair do |group,deps| %>
-    <li class="dependency group"><%= group %><%= render :partial => 'dependency_tree', :locals => { :graph => deps } %></li>
+    <% profile.spec_list.each do |dep,version,groups| %>
+    <li class="dependency<%=groups.present? ? ' required' : ''%>"><%=dep%> (<%=version%>)</li>
     <% end %>
   </ul>
 </div>

data/lib/about_page/dependencies.rb

@@ -1,8 +1,35 @@
 module AboutPage
   class Dependencies < AboutPage::Configuration::Node
     delegate :each_pair, :to_xml, :to_json, :to => :to_h
+    attr_reader :max_depth
+
+    def initialize(max_depth=100)
+      @max_depth = max_depth
+    end
+
     def to_h
-      @dependencies ||= Hash[groups.collect { |group,deps| [group,Hash[deps.collect { |dep| [dep.name,dependency_hash(environment, dep.name)] }]] }]
+      @dependencies ||= spec_list.inject({}) { |h,data|
+        spec = { :name => data[0], :version => data[1] }
+        if data[2].nil?
+          h[:implied] ||= []
+          h[:implied] << spec
+        else
+          data[2].each { |g| 
+            h[g] ||= [] 
+            h[g] << spec
+          }
+        end
+        h        
+      }
+    end
+
+    def spec_list
+      required = environment.current_dependencies.inject({}) { |h,d| h[d.name] = d.groups; h }
+      list = environment.specs.sort { |a,b| a.name <=> b.name }.collect { |s| [
+        s.name, 
+        [s.version.to_s, s.git_version.to_s].join,
+        required[s.name]
+      ]}
     end
 
     private
@@ -14,19 +41,25 @@ module AboutPage
       @groups ||= environment.current_dependencies.group_by { |d| d.groups.first.to_s }
     end
 
-    def dependency_version(env, key)
-      spec = env.specs.find { |s| s.name == key }
+    def specs
+      @specs ||= environment.specs
+    end
+
+    def dependency_version(key)
+      spec = environment.specs.find { |s| s.name == key }
       rev = spec.git_version
       rev.strip! unless rev.nil?
       location = [spec.source.options.values_at('path','uri').compact.first,rev].compact.join('@')
       [spec.version.to_s,location].compact.join(' ').strip
     end
     
-    def dependency_hash(env, key, graph=nil)
-      graph = Bundler::Graph.new(env,'/dev/null') if graph.nil?
-      result = { :version => dependency_version(env, key) }
-      deps = Hash[graph.relations[key].collect { |dep| [dep, dependency_hash(env, dep, graph)]}]
-      result[:dependencies] = deps unless deps.empty?
+    def dependency_hash(key, graph=nil, depth=0)
+      graph = Bundler::Graph.new(environment,'/dev/null') if graph.nil?
+      result = { :version => dependency_version(key) }
+      if depth < @max_depth
+        deps = Hash[graph.relations[key].collect { |dep| [dep, dependency_hash(dep, graph, depth+1)]}]
+        result[:dependencies] = deps unless deps.empty?
+      end
       result
     end
   end

data/lib/about_page/solr.rb

@@ -15,14 +15,20 @@ module AboutPage
     def initialize rsolr_instance, options = {}
       self.rsolr = rsolr_instance
       self.options = options
-      self.options[:expects] ||= {}
+      self.options[:luke]     ||= 'admin/luke'
+      if self.options[:registry] == :registry
+        self.options[:registry] = 'admin/registry.jsp'
+      else
+        self.options[:registry] ||= 'admin/mbeans'
+      end
+      self.options[:expects]  ||= {}
       self.options[:expects][:numDocs] ||= 1
 
       @request_expectations = {}
     end
 
     def schema
-      @schema ||= rsolr.luke(:show => 'schema', :numTerms => 0)
+      @schema ||= rsolr.get self.options[:luke], :params => { :show => 'schema', :numTerms => 0 }
     rescue
       {}
     end
@@ -30,7 +36,7 @@ module AboutPage
     def registry
       @registry ||= begin
                       h = {}
-                      resp = rsolr.get 'admin/registry.jsp', :params => { :wt => 'xml' }
+                      resp = rsolr.get self.options[:registry], :params => { :wt => 'xml' }
                       doc = Nokogiri::XML resp
 
                       doc.xpath('/solr/*').each do |node|
@@ -49,7 +55,7 @@ module AboutPage
     end
 
     def to_h
-      index.merge(registry)
+      index#.merge(registry)
     end
 
     def numDocs; index[:numDocs]; end

data/lib/about_page/version.rb

@@ -1,3 +1,3 @@
 module AboutPage
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/solr_spec.rb

@@ -9,11 +9,11 @@ describe AboutPage::Solr do
 
   describe "#schema" do
     it "should be empty if the connection to solr fails" do
-      @mock_solr_connection.should_receive(:luke).with(any_args).and_throw(:msg)
+      @mock_solr_connection.should_receive(:get).with('admin/luke', an_instance_of(Hash)).and_throw(:msg)
       subject.schema.should be_empty
     end
     it "should retrieve index information from luke" do
-      @mock_solr_connection.should_receive(:luke).with(any_args).and_return { Hash.new }
+      @mock_solr_connection.should_receive(:get).with('admin/luke', an_instance_of(Hash)).and_return { Hash.new }
       subject.schema.should be_a_kind_of(Hash)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: about_page
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,6 @@ files:
 - app/helpers/about_page/about_helper.rb
 - app/views/about_page/about/_app.html.erb
 - app/views/about_page/about/_dependencies.html.erb
-- app/views/about_page/about/_dependency_tree.html.erb
 - app/views/about_page/about/_environment.html.erb
 - app/views/about_page/about/_exception.html.erb
 - app/views/about_page/about/_generic_hash.html.erb
@@ -187,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 36777501986760828
+      hash: 1201806507108649834
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,10 +195,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 36777501986760828
+      hash: 1201806507108649834
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Summary of AboutPage.

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

@@ -1,10 +0,0 @@
-<ul class="dependency">
-  <% graph.keys.sort.each do |name| spec = graph[name] %>
-    <li class="dependency">
-      <b><%= name %></b> (<%= spec[:version] %>)
-      <% if spec[:dependencies] %>
-          <%= render :partial => 'dependency_tree', :locals => { :graph => spec[:dependencies] }%>
-      <% end %>
-    </li>
-  <% end %>
-</ul>