blacklight-maps 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cede804f84631bbe7ec2c80370c8f0cbf88c31
-  data.tar.gz: 853cd08e29850b439c5d7773c48118b835216d28
+  metadata.gz: c65861d83b3dd09bf952bdb38a75daba0df6c3a2
+  data.tar.gz: 6590ed2323e163921cd0c31a4529c44e9290bf74
 SHA512:
-  metadata.gz: 4181770fa39430c201156ab3b9d83cffc0208a58c530e6209fea4d5f4ce56b3e52d04ee7a49059be6cd84ae65208589afdc00f6e80de51a082652b1f8d33cb9e
-  data.tar.gz: defd9c711b0f083449e952726548532d078b639c822fc606ab4fd3d79f3eaf3abeb5658a022a52041dca3981a2363eecfbb284dcaaa37f534e89d27b5057a0d7
+  metadata.gz: 450803322d3af9937d7dd1806cec17d8fa3894b63a0878221e46ece78036eef3d8731d0a14fb7e35694ead8b4451eff229b2fb60672c71f90a05e8fc7c94c843
+  data.tar.gz: 366c568585f5b81baad7f35a6e142aa160a3054c78382993e002db9922b1e41cef75d8bef9724db980d0f872dce28952a2e55eed56b5d1c54ee3fdaf2f51a251

data/Gemfile

@@ -3,19 +3,21 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in blacklight-maps.gemspec
 gemspec
 
-gem 'simplecov', require: false
-gem 'coveralls', require: false
-
 # If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main
 # Gemfile.lock but since sass-rails gets generated (rails new) into the test app
 # it'll want sprockets 2.11.0 and we'll have a conflict
 gem 'sprockets', '2.11.0'
 
-# # If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main
-# # Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# # it'll want sass 3.2.0 and we'll have a conflict
+# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main
+# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
+# it'll want sass 3.2.0 and we'll have a conflict
 gem 'sass', '~> 3.2.0'
+gem 'bootstrap-sass', ">= 3.1.1.1"
 
+group :test do
+  gem 'simplecov', require: false
+  gem 'coveralls', require: false
+end
 
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
 if File.exists?(file)

data/README.md

@@ -20,6 +20,10 @@ And then execute:
 Or install it yourself as:
 
     $ gem install blacklight-maps
+    
+Run Blacklight-Maps generator:
+    
+    $ rails g blacklight_maps:install
 
 ## Usage
 

data/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js

@@ -3,6 +3,9 @@
   $.fn.blacklight_leaflet_map = function(geojson_docs, arg_opts) {
     var map, sidebar, markers, geoJsonLayer, currentLayer;
 
+    // Update page links with number of mapped items
+    $('.page_links').append('<span class="badge mapped-count">' + geojson_docs.features.length + '</span> mapped');
+
     // Configure default options and those passed via the constructor options
     var options = $.extend({
       tileurl : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',

data/app/assets/stylesheets/blacklight_maps/default.css.scss

@@ -13,6 +13,11 @@
   height: 550px;
 }
 
+.badge.mapped-count {
+  margin-left: 8px;
+  vertical-align: text-bottom;
+}
+
 .sidebar-thumb{
   height: 64px;
   width: 64px;

data/blacklight-maps.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rspec-rails", "~> 2.9"
   spec.add_development_dependency "jettywrapper"
-  spec.add_development_dependency "engine_cart", "~> 0.3.2"
+  spec.add_development_dependency "engine_cart", "~> 0.4.0"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist", ">= 1.5.0"
 end

data/lib/blacklight/maps/geometry.rb

@@ -22,6 +22,10 @@ module BlacklightMaps
         center = []
         center[0] = (@west + @east) / 2
         center[1] = (@south + @north) / 2
+
+        # Handle bounding boxes that cross the dateline
+        center[0] -= 180 if @west > @east
+
         center
       end
 

data/lib/blacklight/maps/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Maps
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/features/maps_spec.rb

@@ -97,6 +97,10 @@ describe "Map View", js: true do
       expect(find("div.marker-cluster")).to have_content(4)
     end
 
+    it "should display number mapped" do
+      expect(page).to have_content('4 mapped')
+    end
+
     describe "click marker cluster" do
       before { find("div.marker-cluster").click }
 

data/spec/lib/blacklight/maps/export_spec.rb

@@ -58,7 +58,7 @@ describe "BlacklightMaps::GeojsonExport" do
   end
 
   it "should render correct sidebar div" do
-    expect(subject.send(:render_leaflet_sidebar_partial, @response.docs[0])).to include('href="/catalog/2008308478">')
+    expect(subject.send(:render_leaflet_sidebar_partial, @response.docs[0])).to include('href="/catalog/2008308478')
   end
 
   it "should render feature collection as json" do

data/spec/lib/blacklight/maps/geometry_spec.rb

@@ -4,6 +4,7 @@ describe "BlacklightMaps::Geometry::BoundingBox" do
 
   let(:bbox) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-100 -50 100 50') }
   let(:bbox_california) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-124.4096196 32.5342321 -114.131211 42.0095169') }
+  let(:bbox_dateline) {BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('165 30 -172 -20') }
 
   it "should instantiate Geometry::BoundingBox" do
     expect(bbox.class).to eq(::BlacklightMaps::Geometry::BoundingBox)
@@ -16,4 +17,8 @@ describe "BlacklightMaps::Geometry::BoundingBox" do
   it "should return center of California bounding box" do
     expect(bbox_california.find_center).to eq([-119.2704153, 37.271874499999996])
   end
+
+  it "should return correct dateline bounding box" do
+    expect(bbox_dateline.find_center).to eq([-183.5, 5])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Maps for Blacklight
@@ -271,4 +271,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-has_rdoc: