geoblacklight 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b55f272d121ee2d812f798e81bb54c81c6cd26
-  data.tar.gz: 50704f9e6eed51f0c8ef30d349a8985ba5a12b64
+  metadata.gz: 1e3dff76debb6018b35c109add225964984a5da3
+  data.tar.gz: f1c3cfbe2308c37e0d897ab4e88a8dbff3e62529
 SHA512:
-  metadata.gz: 292aab24138e8c5d7ac59a8daae5075cdb8d7c4d381472093ca54153deb9847b22161206665a83e46b80c4da85ae086af490e29b413f30e986032715a370e9b1
-  data.tar.gz: 562da646f3e4e8d7507de4007b896e0c52b7310b9551deb4f8e6d7fc318c898d13e7ae629b6d1cf7cb1c0bf20d2efa625dbf0e415efc11cd1815f49d0a46cfb9
+  metadata.gz: 3cb8faabed2e1d3fe1cd68a134b05c9bc668a9c668b35f32ec6fd35e88b996b222da199e036577cbba82440e2f300450eedec9db3b0431a4114abc68db8df3e3
+  data.tar.gz: 03c7c599e496f974b4d6d7587211dab9c67481c30ec836b1b66bf135c40545bd7e23ca39ac71cbfff5c1a02c9796a0ca7cc14fd4099871aa0202fee0268d0031

data/app/assets/javascripts/geoblacklight/modules/item.js

@@ -11,7 +11,7 @@ GeoBlacklight.Item = GeoBlacklight.extend({
     GeoBlacklight.prototype.initialize.call(this, element, options);
     this.dataAttributes = $(element).data();
     this.layer = new L.layerGroup().addTo(this.map);
-    if (this.dataAttributes.available) {
+    if (this.dataAttributes.available && this.dataAttributes.wmsUrl !== null) {
       this.addPreviewLayer();
       this.addOpacityControl();
     } else {

data/app/views/catalog/_show_default.html.erb

@@ -4,7 +4,7 @@
 
 <div class='row'>
   <div class="col-md-8">
-    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document.references.wms.endpoint, available: document_available? } do %>
+    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document.wms_url, available: document_available? } do %>
     <% end %>
   </div>
   <div id='table-container' class='col-md-4'><div id='attribute-table' ></div></div>

data/lib/geoblacklight/solr_document.rb

@@ -38,5 +38,25 @@ module Geoblacklight
     def itemtype
       "http://schema.org/Dataset"
     end
+
+    ##
+    # Provides a convenience method to access a SolrDocument's References
+    # endpoint url without having to check and see if it is available
+    # :type => a string which if its a Geoblacklight::Constants::URI key
+    #          will return a coresponding Geoblacklight::Reference
+    def checked_endpoint(type)
+      type = references.send(type)
+      type.endpoint if type.present?
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      if /.*_url$/ =~ method.to_s
+        checked_endpoint(method.to_s.gsub('_url', ''))
+      else
+        super
+      end
+    end
   end
 end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
 end

data/spec/lib/geoblacklight/solr_document_spec.rb

@@ -86,4 +86,26 @@ describe Geoblacklight::SolrDocument do
       expect(document.direct_download).to be_nil
     end
   end
+  describe 'checked_endpoint' do
+    let(:document_attributes) { {} }
+    let(:reference) { Geoblacklight::Reference.new(['http://www.opengis.net/def/serviceType/ogc/wms', 'http://www.example.com/wms']) }
+    it 'returns endpoint if available' do
+      expect_any_instance_of(Geoblacklight::References).to receive(:wms).and_return(reference)
+      expect(document.checked_endpoint('wms')).to eq 'http://www.example.com/wms'
+    end
+    it 'return nil if not available' do
+      expect_any_instance_of(Geoblacklight::References).to receive(:wms).and_return(nil)
+      expect(document.checked_endpoint('wms')).to be_nil
+    end
+  end
+  describe 'method_missing' do
+    let(:document_attributes) { {} }
+    it 'calls checked_endpoint with parsed method name if matches' do
+      expect(document).to receive(:checked_endpoint).with('wms').and_return(nil)
+      expect(document.wms_url).to be_nil
+    end
+    it 'raises no method error' do
+      expect { document.wms_urlz }.to raise_error NoMethodError
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Darren Hardy