nested_array 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d681422cfda9dbfc86841b49ced1e215bf6dbb0a35676df690748922b4aac7b
-  data.tar.gz: 151c06bb5ebbf793bd6b90fee9fd3d8dcea0485fda834fa65cceb2e1edc38928
+  metadata.gz: 3369503cce207dd479b18992e18ee749342afa1ade5c48a68c4a9edf20615578
+  data.tar.gz: be213153cda8406132bcc51a4126a7574ac3ef0067be105b2a3a06a25d2579ea
 SHA512:
-  metadata.gz: da25eac83649dcd5ddcaf537be626c682192137bce781dd5e35062970929a262b3cab604624feb4e4cc06a420f1ab5e03f7bc817c661dc0082342adf54666813
-  data.tar.gz: caeb434ad4c64d90c25d9440ce38fa5173b52c8b6776b071a7ba3c514535a3aed179d85fe83ea70ee8a4bda105d0686c828be1f7e2780cccb3432176c69f8e96
+  metadata.gz: 83f15e5a071bbe101818b9e54818c17e51f566a8da9e50a38874e3eb1811cdcdf2fba84bc1357b4e7c585a376f020ac69251ba73860b03908d87f2d42945d4d6
+  data.tar.gz: 4e9bfe8749a33e71c6de44c165d0299d29e3695934cf365f9bb77d0b22cce8775dd3c194e4bf13e940110e18d602741426b7342cffba6f1c411a7fd704d70f79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nested_array (2.0.0)
+    nested_array (2.0.1)
 
 GEM
   remote: https://rubygems.org/

data/README-ru.md

@@ -1,37 +1,45 @@
 # NestedArray
 
-Предназначен для преобразования в древовидную структуру плоских данных описанных по паттерну «Список смежности» (Adjacency List), то есть в нодах указа предок `parent_id`.
+Предназначен для преобразования в древовидную структуру плоских данных описанных по паттерну «Список смежности» (Adjacency List), то есть в нодах указа предок `parent_id`. Например:
 
 ```ruby
 [
   {id: 1, parent_id: nil, name: 'first', …},
   {id: 2, parent_id:   1, name: 'second', …},
-  …
+  {id: 3, parent_id:   1, name: 'third', …}
 ]
 # ↓ ↓ ↓
 [
+  {id: 1, parent_id: nil, name: 'first', children: [
+    {id: 2, parent_id:   1, name: 'second', …},
+    {id: 3, parent_id:   1, name: 'third', …}
+  ], …}
 ]
 ```
 
-## Installation
 
-Add this line to your application's Gemfile:
+## Установка
+
+Добавте строку в _Gemfile_ вашего приложения:
 
 ```ruby
-gem 'nested_array'
+gem 'nested_array', '~> 2.0.0'
 ```
 
-And then execute:
-
-    $ bundle
+И затем выполните `bundle`.
 
-Or install it yourself as:
+Или установите его как `gem install nested_array`
 
-    $ gem install nested_array
 
-## Usage
+## Использование
 
-TODO: Write usage instructions here
+```html
+  <ul>
+    <%= Catalogs.all.to_a.to_nested.nested_to_html do |node| %>
+      <% link_to "#{node['name']}", catalog_view_path(node['slug']) %>
+    <% end %>
+  </ul>
+```
 
 ## Development
 
@@ -41,7 +49,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/nested_array.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Zlatov/nested_array.
 
 ## License
 

data/README.md

@@ -1,5 +1,21 @@
 # NestedArray
 
+It is intended for transformation into a tree structure of flat data described by the “Adjacency List” pattern, that is, the ancestor is specified in the nodes by the field `parent_id`. For instance:
+
+```ruby
+[
+  {id: 1, parent_id: nil, name: 'first', …},
+  {id: 2, parent_id:   1, name: 'second', …},
+  {id: 3, parent_id:   1, name: 'third', …}
+]
+# ↓ ↓ ↓
+[
+  {id: 1, parent_id: nil, name: 'first', children: [
+    {id: 2, parent_id:   1, name: 'second', …},
+    {id: 3, parent_id:   1, name: 'third', …}
+  ], …}
+]
+```
 
 
 ## Installation
@@ -7,20 +23,22 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'nested_array'
+gem 'nested_array', '~> 2.0.0'
 ```
 
-And then execute:
+And then execute: `bundle`.
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install nested_array
+Or install it yourself as `gem install nested_array`.
 
 ## Usage
 
-TODO: Write usage instructions here
+```html
+  <ul>
+    <%= Catalogs.all.to_a.to_nested.nested_to_html do |node| %>
+      <% link_to "#{node['name']}", catalog_view_path(node['slug']) %>
+    <% end %>
+  </ul>
+```
 
 ## Development
 
@@ -30,7 +48,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/nested_array.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Zlatov/nested_array.
 
 ## License
 

data/bash/push/gem.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -eu
+
+cd "$(dirname "${0}")"
+
+cd ../..
+
+if [[ -z ${1-} ]]
+then
+  echo "Не указан путь к скомпилированному гему" 1>&2;
+  exit 0
+fi
+
+gem push $1

data/bin/bundle

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+    module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1 || ">= 0.a"
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||= begin
+      env_var_version || cli_arg_version ||
+        lockfile_version || "#{Gem::Requirement.default}.a"
+    end
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    # must dup string for RG < 1.8 compatibility
+    activate_bundler(bundler_version.dup)
+  end
+
+  def activate_bundler(bundler_version)
+    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
+      bundler_version = "< 2"
+    end
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_version
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/bin/byebug

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'byebug' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("byebug", "byebug")

data/bin/htmldiff

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "htmldiff")

data/bin/ldiff

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "ldiff")

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/nested_array/nested.rb

@@ -31,6 +31,10 @@ module NestedArray::Nested
       # Параматры для "склеивания" вложенных структур
       path_separator: '-=path_separator=-',
       path_key: 'text',
+
+      # Настройки формирования массива для опций тега <select>
+      option_value: 'id', # Что брать в качестве значений при формировании опций селекта.
+      option_text: 'name',
     }
   end
 
@@ -47,8 +51,9 @@ module NestedArray::Nested
       node = cache[level][i[level]]
       i[level]+= 1
       if node != nil
+        is_last_children = cache[level][i[level]].blank?
 
-        yield(node.clone, parents.clone, level)
+        yield(node.clone, parents.clone, level, is_last_children)
 
         if !node[options[:children]].nil? && node[options[:children]].length > 0
           level+= 1
@@ -277,6 +282,29 @@ module NestedArray::Nested
     html.html_safe
   end
 
+  # 
+  # Возвращает массив для формирования опций html-тега <select>
+  # с псевдографикой, позволяющей вывести древовидную структуру.
+  # ```
+  # [['option_text1', 'option_value1'],['option_text2', 'option_value2'],…]
+  # ```
+  def nested_to_options options={}
+    options = NESTED_OPTIONS.merge options
+    ret = []
+    last = []
+    each_nested do |node, parents, level, is_last|
+      last[level+1] = is_last
+      node_text = node[options[:option_text]]
+      node_level = (1..level).map{|l| last[l] == true ? ' ' : '┃'}.join
+      node_last = is_last ? '┗' : '┣'
+      node_children = node[options[:children]].present? && node[options[:children]].length > 0 ? '┳' : '━'
+      option_text = "#{node_level}#{node_last}#{node_children}╸#{node_text}"
+      option_value = node[options[:option_value]]
+      ret.push [option_text, option_value]
+    end
+    ret
+  end
+
   # "Скеивание" вложенных структур
   # ноды склеиваются если путь к ним одинаков;
   # путь определяется из сложения Текстов (конфигурируемо через :path_key);

data/lib/nested_array/version.rb

@@ -1,3 +1,3 @@
 module NestedArray
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_array
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - zlatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,8 +98,15 @@ files:
 - README.md
 - Rakefile
 - bash/build/gem.sh
+- bash/push/gem.sh
 - bash/test/gem.sh
+- bin/bundle
+- bin/byebug
 - bin/console
+- bin/htmldiff
+- bin/ldiff
+- bin/rake
+- bin/rspec
 - bin/setup
 - lib/.byebug_history
 - lib/nested_array.rb