c80_map_floors 0.2.0.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12562e1d29ffa3aa03573adbf587cfa7462dedaf
-  data.tar.gz: 69c9b326a50ef540f6d1da7a44dfc9707bf0a2d9
+  metadata.gz: 6203902100f1bcf658b845977cb33e441d462c79
+  data.tar.gz: b105046880ac029a1c8e7304dcb865a50ff7f646
 SHA512:
-  metadata.gz: ecc52260192c12dfdf97c52526bdbfab6d00d3ae879c706d25dd0d8a88cdf8295c1a74e1bf40dc81cf61cd723a36dc44a189a8b3d60ef1aebed6576e952d5abe
-  data.tar.gz: d3c6c6639bd3ebac4dbfa4cc2c9fff78be474484654e49531b5ae3edfcd9cc2d36126a6bac8d03d28025773cd792973213f1e4f59ea4b0ec27f32e0fa1e684f3
+  metadata.gz: e6e836632b002192d876ffab35015ed9aed1492d0177833963be0d4d2c87866032a1870d1442e53bb5324c2e58b77fb8caa6f27f19b84a9587c6285e6ca1a644
+  data.tar.gz: ec59d93f87393df58149a5d549b52247f5abf19326a4ef7152aba6a2ffe13ea50f8962497c87ac8ed4d3697d4eb1e2a9de4fc443f6ce6aa87f088a4ba7ebf093

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /.idea
 *.gem
+*.log

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in c80_map_floors.gemspec
 gemspec
+
+group :development, :test do
+
+  gem 'rspec-rails'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-zeus'
+  gem 'logging'
+
+end

data/Guardfile

@@ -0,0 +1,59 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard 'zeus' do
+  require 'ostruct'
+
+  rspec = OpenStruct.new
+  rspec.spec_dir = 'spec'
+  rspec.spec = ->(m) { "#{rspec.spec_dir}/#{m}_spec.rb" }
+  rspec.spec_helper = "#{rspec.spec_dir}/spec_helper.rb"
+
+  # matchers
+  rspec.spec_files = /^#{rspec.spec_dir}\/.+_spec\.rb$/
+
+  # Ruby apps
+  ruby = OpenStruct.new
+  ruby.lib_files = /^(lib\/.+)\.rb$/
+
+  watch(rspec.spec_files)
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(ruby.lib_files) { |m| rspec.spec.call(m[1]) }
+
+  # Rails example
+  rails = OpenStruct.new
+  rails.app_files = /^app\/(.+)\.rb$/
+  rails.views_n_layouts = /^app\/(.+(?:\.erb|\.haml|\.slim))$/
+  rails.controllers = %r{^app/controllers/(.+)_controller\.rb$}
+
+  watch(rails.app_files) { |m| rspec.spec.call(m[1]) }
+  watch(rails.views_n_layouts) { |m| rspec.spec.call(m[1]) }
+  watch(rails.controllers) do |m|
+    [
+      # rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      # rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # TestUnit
+  # watch(%r|^test/(.*)_test\.rb$|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb$|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  # watch(%r|^test/test_helper\.rb$|)    { "test" }
+  # watch(%r|^app/controllers/(.*)\.rb$|) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb$|)      { |m| "test/unit/#{m[1]}_test.rb" }
+end

data/app/assets/javascripts/lib/awesomplete.js

@@ -22,7 +22,7 @@ var _ = function (input, o) {
 
 	configure(this, {
 		minChars: 2,
-		maxItems: 10,
+		maxItems: 100,
 		autoFirst: false,
 		data: _.DATA,
 		filter: _.FILTER_CONTAINS,

data/app/assets/stylesheets/lib/awesomplete.scss

@@ -26,6 +26,10 @@
     padding: 0;
     margin: 0;
     background: #fff;
+
+    /*20170524: my patch*/
+    max-height: 410px;
+    overflow-y: auto;
 }
 
 .awesomplete > ul:empty {

data/app/controllers/c80_map_floors/ajax_controller.rb

@@ -4,6 +4,8 @@ module C80MapFloors
   # noinspection RubyResolve
   class AjaxController < ApplicationController
 
+    include AjaxHelper
+
     def map_edit_buttons
       # puts "<AjaxController.map_edit_buttons> #{params}"
     end
@@ -129,71 +131,10 @@ module C80MapFloors
 
       result = SearchResult.new
 
-      # 1. Находим категорию, title которой равен строке.
-      cats   = ::Category.where(:name => params[:stext])
-      if cats.count > 0
-        # работаем только с первой попавшейся категорией
-        cat = cats[0]
-
-        # если у категории имеются связанные магазины
-        if cat.leasers.count > 0
-
-          # переберём их
-          cat.leasers.each do |shop|
-
-            # добираемся до Rent::Area каждого магазина
-            if shop.areas.count > 0
-
-              shop.areas.each do |rent_area|
-
-                # если у Rent::Area имеется связанный полигон
-                if rent_area.area.present? # has_one
-
-                  map_area = rent_area.area
-
-                  # NOTE:: теперь, зная C80MapFloors::Area.id, находим id полигона этажа и id полигона здания
-
-                  Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_area: #{map_area.id}"
-                  # result[:areas] << rent_area.area.id
-                  result.add_area(map_area.id)
-
-                  # посмотрим, имеется ли у полигона площади родители
-                  if map_area.floor.present?
-
-                    map_floor = map_area.floor
-                    Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_floor: #{map_floor.id}"
-                    result.add_floor(map_floor.id)
-
-                    if map_floor.map_building.present?
-                      Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_building: #{map_floor.map_building}"
-                      result.add_building(map_floor.map_building.id)
-                    else
-                      Rails.logger.debug "[TRACE] <AjaxController.find_shops> У Rent::Area нет родителей: #{rent_area.name}"
-                    end
-
-                  else
-                    Rails.logger.debug "[TRACE] <AjaxController.find_shops> У полигона площади нет родителей: #{rent_area.name}"
-                  end
-
-
-                else
-                  Rails.logger.debug "[TRACE] <AjaxController.find_shops> У Rent::Area нет полигона: #{rent_area.name}"
-                end
-
-              end
-
-            else
-              Rails.logger.debug "[TRACE] <AjaxController.find_shops> У магазина нет Rent::Area: #{shop.name}"
-            end
-
-          end
-
-        else
-          Rails.logger.debug "[TRACE] <AjaxController.find_shops> У этой категории нет магазинов: #{params[:stext]}"
-        end
-
+      if params[:stext][' (магазин)']
+        find_areas_by_shop!(result, params[:stext])
       else
-        Rails.logger.debug "[TRACE] <AjaxController.find_shops> Нет категории с таким именем = #{params[:stext]}"
+        find_areas_by_category!(result, params[:stext])
       end
 
       Rails.logger.debug "[TRACE] <AjaxController.find_shops> Отправляем ответ: result = #{result.data}"

data/app/controllers/c80_map_floors/application_controller.rb

@@ -1,6 +1,6 @@
 module C80MapFloors
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
-    before_filter :authenticate_admin_user!
+    before_action :authenticate_admin_user!
   end
 end

data/app/helpers/c80_map_floors/ajax_helper.rb

@@ -0,0 +1,138 @@
+module C80MapFloors
+  module AjaxHelper
+
+    def find_areas_by_category!(result, stext)
+      # 1. Находим категорию, title которой равен строке.
+      cats   = ::Category.where(:name => stext)
+      if cats.count > 0
+        # работаем только с первой попавшейся категорией
+        cat = cats[0]
+
+        # если у категории имеются связанные магазины
+        if cat.leasers.count > 0
+
+          # переберём их
+          cat.leasers.each do |shop|
+
+            # добираемся до Rent::Area каждого магазина
+            if shop.areas.count > 0
+
+              shop.areas.each do |rent_area|
+
+                # если у Rent::Area имеется связанный полигон
+                if rent_area.area.present? # has_one
+
+                  map_area = rent_area.area
+
+                  # NOTE:: теперь, зная C80MapFloors::Area.id, находим id полигона этажа и id полигона здания
+
+                  Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_area: #{map_area.id}"
+                  # result[:areas] << rent_area.area.id
+                  result.add_area(map_area.id)
+
+                  # посмотрим, имеется ли у полигона площади родители
+                  if map_area.floor.present?
+
+                    map_floor = map_area.floor
+                    Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_floor: #{map_floor.id}"
+                    result.add_floor(map_floor.id)
+
+                    if map_floor.map_building.present?
+                      Rails.logger.debug "[TRACE] <AjaxController.find_shops> add_building: #{map_floor.map_building}"
+                      result.add_building(map_floor.map_building.id)
+                    else
+                      Rails.logger.debug "[TRACE] <AjaxController.find_shops> У Rent::Area нет родителей: #{rent_area.name}"
+                    end
+
+                  else
+                    Rails.logger.debug "[TRACE] <AjaxController.find_shops> У полигона площади нет родителей: #{rent_area.name}"
+                  end
+
+
+                else
+                  Rails.logger.debug "[TRACE] <AjaxController.find_shops> У Rent::Area нет полигона: #{rent_area.name}"
+                end
+
+              end
+
+            else
+              Rails.logger.debug "[TRACE] <AjaxController.find_shops> У магазина нет Rent::Area: #{shop.name}"
+            end
+
+          end
+
+        else
+          Rails.logger.debug "[TRACE] <AjaxController.find_shops> У этой категории нет магазинов: #{stext}"
+        end
+
+      else
+        Rails.logger.debug "[TRACE] <AjaxController.find_shops> Нет категории с таким именем = #{stext}"
+      end
+    end
+
+    def find_areas_by_shop!(result, stext)
+      shop_name = stext.gsub(' (магазин)','')
+      shops = ::Leaser.where(:name => shop_name)
+      Rails.logger.debug "[TRACE] <AjaxHelper> shops.count = #{shops.count}"
+
+      if shops.count > 0
+        # работаем только с первым попавшимся магазином
+        shop = shops[0]
+
+        _process_shop_areas!(result, shop)
+
+      end
+
+    end
+
+    private
+
+    def _process_shop_areas!(result, shop)
+      # добираемся до Rent::Area каждого магазина
+      if shop.areas.count > 0
+
+        shop.areas.each do |rent_area|
+
+          # если у Rent::Area имеется связанный полигон
+          if rent_area.area.present? # has_one
+
+            map_area = rent_area.area
+
+            # NOTE:: теперь, зная C80MapFloors::Area.id, находим id полигона этажа и id полигона здания
+
+            Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> add_area: #{map_area.id}"
+            # result[:areas] << rent_area.area.id
+            result.add_area(map_area.id)
+
+            # посмотрим, имеется ли у полигона площади родители
+            if map_area.floor.present?
+
+              map_floor = map_area.floor
+              Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> add_floor: #{map_floor.id}"
+              result.add_floor(map_floor.id)
+
+              if map_floor.map_building.present?
+                Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> add_building: #{map_floor.map_building}"
+                result.add_building(map_floor.map_building.id)
+              else
+                Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> У Rent::Area нет родителей: #{rent_area.name}"
+              end
+
+            else
+              Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> У полигона площади нет родителей: #{rent_area.name}"
+            end
+
+
+          else
+            Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> У Rent::Area нет полигона: #{rent_area.name}"
+          end
+
+        end
+
+      else
+        Rails.logger.debug "[TRACE] <AjaxHelper._process_shop_areas!> У магазина нет Rent::Area: #{shop.name}"
+      end
+    end
+
+  end
+end

data/app/helpers/c80_map_floors/application_helper.rb

@@ -24,5 +24,24 @@ module C80MapFloors
 
     end
 
+    # рендер поисковой формы, которая видна сверху поцентру в слое над картой
+    # noinspection RubyResolve
+    def render_search_input
+
+      # NOTE:: названия всех категорий в алфавитном порядке через запятую в одну строку возьмём из HOST-приложения
+      cl = ::Category.filled_cats.map { |c| c.name }.join(', ')
+
+      # NOTE:: названия всех магазинов, у которых есть площадь, через запятую в одну строку возьмём из HOST-приложения
+      sl = ::Leaser.assigned_to_areas.map { |e| e }.join(' (магазин), ')
+      sl = "#{sl} (магазин)" # про последний элемент не забудем
+
+      render :partial => 'c80_map_floors/shared/map_row/search_gui',
+             :locals => {
+                 # categories_list: categories_list
+                 categories_list: [cl, sl].join(', ')
+             }
+
+    end
+
   end
 end

data/app/views/c80_map_floors/_map_row_index.html.erb

@@ -30,7 +30,7 @@
     </div>
 
     <div class="container" id="search_container">
-      <%= render_search_gui %>
+      <%= render_search_input %>
     </div>
 
     <div class="container" id="ui">

data/app/views/c80_map_floors/shared/map_row/_search_gui.html.erb

@@ -3,7 +3,7 @@
 <div id="search_gui">
   <form class="navbar-form" role="form">
     <div class="form-group">
-      <input placeholder="Введите название товара, который вас интересует" class="form-control awesomplete" type="text" data-list="<%= categories_list %>">
+      <input placeholder="Введите название товара или магазина, который вас интересует" class="form-control awesomplete" type="text" data-list="<%= categories_list %>">
     </div>
     <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button>
   </form>

data/bin/rails

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/c80_map_floors/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/c80_map_floors.gemspec

@@ -25,4 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bootstrap-sass', '~> 3.3.4'
   spec.add_dependency 'bootstrap-select-rails'
   spec.add_dependency 'historyjs-rails'
+  spec.add_development_dependency 'friendly_id'
+  spec.add_development_dependency 'babosa'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'rails'
+  # spec.add_development_dependency 'rspec-rails'
+  # spec.add_development_dependency 'guard'
+  # spec.add_development_dependency 'guard-rspec'
+  # spec.add_development_dependency 'guard-zeus'
 end

data/custom_plan.rb

@@ -0,0 +1,11 @@
+require 'zeus/rails'
+
+class CustomPlan < Zeus::Rails
+
+  # def my_custom_command
+  #  # see https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
+  # end
+
+end
+
+Zeus.plan = CustomPlan.new

data/lib/c80_map_floors/version.rb

@@ -1,3 +1,3 @@
 module C80MapFloors
-  VERSION = '0.2.0.8'
+  VERSION = '0.2.1'
 end

data/zeus.json

@@ -0,0 +1,13 @@
+{
+  "command": "ruby -rubygems -r./custom_plan -eZeus.go",
+
+  "plan": {
+    "boot": {
+      "default_bundle": {
+        "test_environment": {
+          "test_helper": {"test": ["rspec", "testrb"]}
+        }
+      }
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map_floors
 version: !ruby/object:Gem::Version
-  version: 0.2.0.8
+  version: 0.2.1
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: babosa
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Map + map editor
 email:
 - c080609a@gmail.com
@@ -102,9 +158,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -168,9 +226,9 @@ files:
 - app/controllers/c80_map_floors/ajax_controller.rb
 - app/controllers/c80_map_floors/application_controller.rb
 - app/controllers/c80_map_floors/map_ajax_controller.rb
+- app/helpers/c80_map_floors/ajax_helper.rb
 - app/helpers/c80_map_floors/application_helper.rb
 - app/helpers/c80_map_floors/model_floor_helper.rb
-- app/helpers/c80_map_floors/search_gui_helper.rb
 - app/models/c80_map_floors/area.rb
 - app/models/c80_map_floors/area_representator.rb
 - app/models/c80_map_floors/base_map_object.rb
@@ -203,10 +261,12 @@ files:
 - app/views/c80_map_floors/shared/map_row/_building_info_old.html.erb
 - app/views/c80_map_floors/shared/map_row/_search_gui.html.erb
 - bin/console
+- bin/rails
 - bin/setup
 - bounding_box.jpg
 - c80_map_floors.gemspec
 - config/routes.rb
+- custom_plan.rb
 - db/migrate/20161015190000_create_c80_map_floors_settings.rb
 - db/migrate/20161015190001_create_c80_map_floors_map_buildings.rb
 - db/migrate/20161015190002_create_c80_map_floors_areas.rb
@@ -223,6 +283,7 @@ files:
 - lib/integer.rb
 - lib/search_result.rb
 - map_padding_tuning.jpg
+- zeus.json
 homepage: http://www.vorsa-park.ru
 licenses:
 - MIT

data/app/helpers/c80_map_floors/search_gui_helper.rb

@@ -1,19 +0,0 @@
-module C80MapFloors
-  module SearchGuiHelper
-
-    # рендер поисковой формы, которая видна сверху поцентру в слое над картой
-    # noinspection RubyResolve
-    def render_search_gui
-
-      # NOTE:: названия всех категорий в алфавитном порядке через запятую в одну строку возьмём из HOST-приложения
-      categories_list = ::Category.filled_cats.map { |c| c.name }.join(', ')
-
-      render :partial => 'c80_map_floors/shared/map_row/search_gui',
-             :locals => {
-                 categories_list: categories_list
-             }
-
-    end
-
-  end
-end