maplibre-preview 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df12e7c5527319ba509cd5640dd3af10977259fcfc1272aeb53511d298670caa
-  data.tar.gz: eb0ef8cf653b812c7b29c99cbf69848b7f1ab71d34ba5718da5bf84ac0c6b9f1
+  metadata.gz: 5e4e645edbcdd94a6633c742b4e5f17a3e49939d5b62dd1775b2b792acba55d8
+  data.tar.gz: 56e81ddd213236c6f4aca3c62d2dc957ce7073fe7b94f0dd0c9a394e482a9ba8
 SHA512:
-  metadata.gz: e7a98ded840731605fd20f1dd17fff9d0d2957f70c5f08aa24fd3cb4aa6b790f9b37445e23bb44096d85c2dfd6e77c5715c532dfb10332f1d0370273667bab9c
-  data.tar.gz: e51939f434f6535a0ba22226fd9b3721cc3b953353d0401b87aab2536c6a059cfa95f1997f2be79cfeccc2e52b020f6c9f80504e0ec1dfbf9835d29b6fabade2
+  metadata.gz: 0d90632acaeef88dadbc8058e1499fe1dc204b79492c308076fe96ae472c37d0b51fafe118307d3804645899635cf8600bde73f2d9dc47690bfbedbeeebf2fb8
+  data.tar.gz: 45104ec1339511744bc7ae24be029368c7048661cd0484d7b0c8b928c183a894bb3582078048678d08576583406b215551e5fb5474f7977b61bac5480c8c7094

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.1.0] - 2025-10-01
+
+### Refactored
+- **Simplified architecture** with streamlined Sinatra extension pattern
+- **Consolidated code** into single `lib/maplibre-preview.rb` file
+- **Removed helper methods** in favor of direct Slim template calls
+- **Updated template names** to `maplibre_map` and `maplibre_layout` to avoid conflicts
+- **Streamlined Sinatra extension** with prepend modules for static assets and templates
+
+### Technical Changes
+- **Removed StaticMiddleware** in favor of prepend-based static asset serving
+- **Removed Helpers module** with helper methods
+- **Direct route integration** using `slim :maplibre_map, layout: :maplibre_layout`
+- **Simplified file structure** with all core functionality in main file
+- **Improved template resolution** using `__dir__` context for gem paths
+
 ## [1.0.0] - 2025-09-29
 
 ### Added

data/README.md

@@ -58,7 +58,7 @@ class MyApp < Sinatra::Base
   register MapLibrePreview::Extension
   
   get '/map' do
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -76,7 +76,7 @@ http://localhost:9292/map?style_url=https://example.com/style.json
 ```ruby
 get '/map' do
   params[:style_url] = 'https://example.com/style.json'
-  render_maplibre_preview
+  slim :maplibre_map, layout: :maplibre_layout
 end
 ```
 
@@ -134,14 +134,14 @@ The gem uses fixed configurations for optimal compatibility:
 register MapLibrePreview::Extension
 ```
 
-### Helper Methods
+### Template Integration
 
-| Method | Description | Parameters |
-|--------|-------------|------------|
-| `render_maplibre_preview` | Render complete map development interface | None |
-| `render_map_layout` | Render map layout only | None |
-| `style_url` | Get current style URL from params | None |
-| `should_show_map?` | Check if map should be displayed | None |
+The gem provides Slim templates that can be used directly in your routes:
+
+| Template | Description | Usage |
+|----------|-------------|-------|
+| `maplibre_map` | Main map interface template | `slim :maplibre_map, layout: :maplibre_layout` |
+| `maplibre_layout` | HTML layout with external dependencies | Used as layout for map template |
 
 ### Standalone Application
 
@@ -270,7 +270,7 @@ class MyApp < Sinatra::Base
   register MapLibrePreview::Extension
   
   get '/map' do
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -283,7 +283,7 @@ class MyApp < Sinatra::Base
   
   get '/map' do
     # Style URL passed via params[:style_url]
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -296,13 +296,13 @@ class MyApp < Sinatra::Base
   
   get '/map' do
     # Uses params[:style_url] if provided
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
   
   get '/terrain' do
     # Set style URL via params
     params[:style_url] = 'https://example.com/terrain-style.json'
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```

data/docs/README_RU.md

@@ -58,7 +58,7 @@ class MyApp < Sinatra::Base
   register MapLibrePreview::Extension
   
   get '/map' do
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -76,7 +76,7 @@ http://localhost:9292/map?style_url=https://example.com/style.json
 ```ruby
 get '/map' do
   params[:style_url] = 'https://example.com/style.json'
-  render_maplibre_preview
+  slim :maplibre_map, layout: :maplibre_layout
 end
 ```
 
@@ -134,14 +134,14 @@ Gem использует фиксированные настройки:
 register MapLibrePreview::Extension
 ```
 
-### Вспомогательные методы
+### Интеграция шаблонов
 
-| Метод | Описание | Параметры |
-|-------|----------|-----------|
-| `render_maplibre_preview` | Рендеринг полного интерфейса разработки карт | Нет |
-| `render_map_layout` | Рендеринг только макета карты | Нет |
-| `style_url` | Получение текущего URL стиля из параметров | Нет |
-| `should_show_map?` | Проверка, должна ли отображаться карта | Нет |
+Gem предоставляет Slim шаблоны, которые можно использовать напрямую в маршрутах:
+
+| Шаблон | Описание | Использование |
+|--------|----------|---------------|
+| `maplibre_map` | Основной шаблон интерфейса карты | `slim :maplibre_map, layout: :maplibre_layout` |
+| `maplibre_layout` | HTML макет с внешними зависимостями | Используется как макет для шаблона карты |
 
 ### Автономное приложение
 
@@ -270,7 +270,7 @@ class MyApp < Sinatra::Base
   register MapLibrePreview::Extension
   
   get '/map' do
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -283,7 +283,7 @@ class MyApp < Sinatra::Base
   
   get '/map' do
     # URL стиля передается через params[:style_url]
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```
@@ -296,13 +296,13 @@ class MyApp < Sinatra::Base
   
   get '/map' do
     # Использует params[:style_url] если предоставлен
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
   
   get '/terrain' do
     # Устанавливаем URL стиля через params
     params[:style_url] = 'https://example.com/terrain-style.json'
-    render_maplibre_preview
+    slim :maplibre_map, layout: :maplibre_layout
   end
 end
 ```

data/lib/maplibre-preview/version.rb

@@ -1,3 +1,3 @@
 module MapLibrePreview
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

data/lib/maplibre-preview.rb

@@ -2,7 +2,7 @@
 
 require 'sinatra/base'
 require 'slim'
-require 'rack'
+require_relative 'maplibre-preview/version'
 
 module MapLibrePreview
   # Fixed versions for guaranteed compatibility
@@ -10,72 +10,36 @@ module MapLibrePreview
   CONTOUR_VERSION = '0.1.0'
   D3_VERSION = '7'
 
-  # Rack middleware for serving static JS files from gem
-  class StaticMiddleware
-    def initialize(app)
-      @app = app
-      @gem_public_path = File.expand_path('maplibre-preview/public', __dir__)
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-
-      if request.path.match?(%r{^/js/})
-        serve_js_file(request.path)
-      else
-        @app.call(env)
+  # Sinatra extension for map development tools
+  module Extension
+    module AddPublic
+      def static!(options={})
+        super
+        path = File.expand_path "#{__dir__}/maplibre-preview/public/#{Sinatra::Base::URI_INSTANCE.unescape(request.path_info)}"
+        return unless File.file?(path)
+
+        env['sinatra.static_file'] = path
+        cache_control(*settings.static_cache_control) if settings.static_cache_control?
+        send_file path, options.merge(disposition: nil)
       end
     end
 
-    private
-
-    def serve_js_file(path)
-      file_path = File.join(@gem_public_path, path)
-
-      if File.exist?(file_path) && File.file?(file_path)
-        [200, {'Content-Type' => 'application/javascript'}, [File.read(file_path)]]
-      else
-        [404, {'Content-Type' => 'text/plain'}, ['File not found']]
+    module FindTemplate
+      def find_template(views, name, engine, &block)
+        super
+        yield File.expand_path "#{__dir__}/maplibre-preview/views/#{name}.#{@preferred_extension}"
       end
     end
-  end
 
-  # Sinatra extension for map development tools
-  module Extension
     def self.registered(app)
-      app.helpers Helpers
-      app.use StaticMiddleware
+      Sinatra::Templates.prepend FindTemplate
+      Sinatra::Base.prepend AddPublic
+      app.set :static, true
       app.set :maplibre_preview_options, {}
-    end
-  end
-
-  # Helper methods for map development tools
-  module Helpers
-    def render_maplibre_preview
-      gem_views_path = File.expand_path('maplibre-preview/views', __dir__)
-      original_views = settings.views
-      settings.set :views, gem_views_path
-      slim(:map, layout: :map_layout)
-    ensure
-      settings.set :views, original_views
-    end
-
-    def render_map_layout
-      gem_views_path = File.expand_path('maplibre-preview/views', __dir__)
-      original_views = settings.views
 
-      settings.set :views, gem_views_path
-      slim(:map_layout)
-    ensure
-      settings.set :views, original_views
-    end
-
-    def style_url
-      params[:style_url]
-    end
-
-    def should_show_map?
-      !!(params[:style] || params[:style_url] || params[:source])
+      app.get '/maplibre_preview' do
+        slim :maplibre_map, layout: :maplibre_layout
+      end
     end
   end
 
@@ -93,7 +57,7 @@ module MapLibrePreview
     end
 
     get '/map' do
-      slim :map, layout: :map_layout, locals: { options: {} }
+      slim :maplibre_map, layout: :maplibre_layout, locals: { options: {} }
     end
 
     private

data/spec/maplibre_preview_spec.rb

@@ -49,4 +49,4 @@ RSpec.describe MapLibrePreview do
       expect(test_app.settings.maplibre_preview_options).to be_a(Hash)
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maplibre-preview
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexander Ludov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -162,8 +162,8 @@ files:
 - lib/maplibre-preview/public/js/contour.js
 - lib/maplibre-preview/public/js/filters.js
 - lib/maplibre-preview/version.rb
-- lib/maplibre-preview/views/map.slim
-- lib/maplibre-preview/views/map_layout.slim
+- lib/maplibre-preview/views/maplibre_layout.slim
+- lib/maplibre-preview/views/maplibre_map.slim
 - spec/maplibre_preview_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/artyomb/maplibre-preview
@@ -172,7 +172,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/artyomb/maplibre-preview
   source_code_uri: https://github.com/artyomb/maplibre-preview
-  changelog_uri: https://github.com/artyomb/maplibre-preview/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/artyomb/maplibre-preview/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: