spree_taxon_group 3.0.0.beta → 3.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edbcdb30355927cc63a0209509ee3d5855f6da5f
-  data.tar.gz: 7ce4725f2c0cff3bbb507b4ae8974d3b6c0d0929
+  metadata.gz: 6e76e2eb51ec86d40bd3baefa94f689a93d8d9b6
+  data.tar.gz: 0359460858e8c233ef5cbf09c783632a342c3798
 SHA512:
-  metadata.gz: b9dba5719377369616674ccdf087acb4ef1e1e053df0d2f319fd5a858a17e66e1d94dddfea5e380b803ed2180d9bddd0aa03e819e8f25dfdbf033fe5d32186f2
-  data.tar.gz: 9f1a1819ebe53daaea7c0490b11ea9f623ef23098530bb07f43835a13cc805550fbd4cdfe7806946fabee6ab428dea43942e13652f046ceb33cecccc422eb3ec
+  metadata.gz: fc52c16f902531c34841d7dddd3767e89997ae83fca6bdc39192ab3a6d16e60ce5a8db386f762d01f63900046d28eef66f84f0b9c84aea48ee29a770a5445b08
+  data.tar.gz: 74117d1d131c67e36afcd81f236495b15214048cb6e118d534786e604e64531c87e5bb785e87767e619fd4620986953c53be3d2c9b9dcb8d1746f4fb33fe3e0d

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 3.1.0.beta / 2015-10-19
+
+* [FEATURE] Ability to manage position of taxons in taxon group
+* [ENHANCEMENT] Added 'key' to taxon group to better find
+* [ENHANCEMENT] Bug fixes
+
+## 3.0.0.beta / 2015-10-04
+
+* Initial release!

data/README.md

@@ -1,6 +1,6 @@
 # Spree Taxon Group
 
-Easily create and manage groups of taxons, irrespective of their parent or children taxons/taxonomies.
+Easily create and manage groups of taxons, irrespective of their parent or children taxons/taxonomies and control the position of taxons in their taxon groups.
 Useful if you need flexible taxon usage, for example a group of taxons for featured categories from different parent taxon/taxonomies.
 
 ---
@@ -11,7 +11,7 @@ If you want a taxon tree, similar to `taxons_tree` in the default spree sidebar.
 
 ```html
 <nav id="featured-categories" class="sidebar-item" data-hook>
-  <% featured = Spree::TaxonGroup.find_by_name('featured') %>
+  <% featured = Spree::TaxonGroup.find_by_key('featured') %>
   <% cache [I18n.locale, featured] do %>
     <h4 class='taxon-group-root'><%= Spree.t(:shop_by_taxon_group, :taxon_group => featured.name) %></h4>
     <%= taxon_group_tree(featured, @taxon) %>
@@ -19,6 +19,18 @@ If you want a taxon tree, similar to `taxons_tree` in the default spree sidebar.
 </nav>
 ```
 
+or for more control, without `taxon_group_tree`:
+
+```html
+<% navigation_taxon_upcase_group = Spree::TaxonGroup.find_by_key('navigation') %>
+<% cache [I18n.locale, navigation_taxon_upcase_group] do %>
+  <%= navigation_taxon_upcase_group.taxons.map do |taxon|
+        '<li class="hidden-lg hidden-md">' + link_to(taxon.name.upcase, seo_url(taxon)) + '</li>'
+      end.join("\n").html_safe
+  %>
+<% end %>
+```
+
 ---
 
 ## Basic Installation
@@ -26,7 +38,7 @@ If you want a taxon tree, similar to `taxons_tree` in the default spree sidebar.
 Add to your `Gemfile`:
 
 ```ruby
-gem 'spree_taxon_group', github: 'whelton/spree_taxon_group', branch: 'master'
+gem 'spree_taxon_group', '~> 3.1', '>= 3.1.0.beta'
 ```
 
 Run:

data/app/controllers/spree/admin/taxon_groups_controller.rb

@@ -1,13 +1,46 @@
 module Spree
   module Admin
     class TaxonGroupsController < ResourceController
-      before_action :load_taxons, only: [:new, :edit]
+      before_action :load_taxons, only: [:new, :edit, :create]
+      before_action :load_taxon_group, only: [:update_positions]
+
+      def positions
+        @taxon_group_memberships = @taxon_group.taxon_group_memberships.order(:position)
+      end
+
+      def update_positions
+        begin
+          update_taxon_group_memership_positions
+          flash[:success] = flash_message_for(@taxon_group, :successfully_updated)
+        rescue => e
+          flash[:error] = e.message
+        end
+
+        respond_with(@taxon_group) do |format|
+          format.html { redirect_to positions_admin_taxon_group_url(@taxon_group) }
+          format.json { render json: @taxon_group.to_json }
+        end
+      end
 
       private
 
       def load_taxons
         @taxons = Spree::Taxon.all
       end
+
+      def load_taxon_group
+        @taxon_group = Spree::TaxonGroup.find(params[:id])
+      end
+
+      def update_taxon_group_memership_positions
+        update_positions_params.each do |id, position|
+          Spree::TaxonGroupMembership.update(id, position: position)
+        end
+      end
+
+      def update_positions_params
+        params.require(:taxon_group_membership).require(:position)
+      end
     end
   end
 end

data/app/helpers/spree/frontend_helper_decorator.rb

@@ -1,9 +1,9 @@
 Spree::FrontendHelper.class_eval do
   def taxon_group_tree(taxon_group, current_taxon)
     content_tag :div, class: 'list-group' do
-      taxon_group.taxons.map do |taxon|
-        css_class = (current_taxon.eql? taxon) ? 'list-group-item active' : 'list-group-item'
-        link_to(taxon.name, seo_url(taxon), class: css_class)
+      taxon_group.taxon_group_memberships.sort_by(&:position).map do |membership|
+        css_class = (current_taxon.eql? membership.taxon) ? 'list-group-item active' : 'list-group-item'
+        link_to(membership.taxon.name, seo_url(membership.taxon), class: css_class)
       end.join("\n").html_safe
     end
   end

data/app/models/spree/taxon_group.rb

@@ -1,8 +1,9 @@
 module Spree
   class TaxonGroup < ActiveRecord::Base
     validates :name, presence: true
+    validates :key, presence: true
 
     has_many :taxon_group_memberships, class_name: 'Spree::TaxonGroupMembership', dependent: :destroy
-    has_many :taxons, through: :taxon_group_memberships
+    has_many :taxons, -> { order 'spree_taxon_group_memberships.position' }, through: :taxon_group_memberships
   end
 end

data/app/models/spree/taxon_group_membership.rb

@@ -2,6 +2,7 @@ module Spree
   class TaxonGroupMembership < ActiveRecord::Base
     validates :taxon_group, presence: true
     validates :taxon, presence: true
+    validates :position, presence: true, numericality: { only_integer: true }
 
     belongs_to :taxon_group
     belongs_to :taxon

data/app/views/spree/admin/taxon_groups/_form.html.erb

@@ -10,6 +10,12 @@
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     </div>
+
+    <div class="form-group">
+      <%= f.label :key, Spree.t(:key) %> <span class="required">*</span>
+      <%= f.text_field :key, class: 'form-control' %>
+      <%= f.error_message_on :key %>
+    </div>
   </div>
 
   <div class="row" data-hook="admin_page_form_fields">
@@ -25,7 +31,7 @@
         <tbody>
           <% @taxons.each do |taxon| %>
             <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
-              <td><%= check_box_tag("taxon_group[taxon_ids][]", taxon.id, taxon.id.in?(resource.taxons.pluck(:id))) %></td>
+              <td><%= check_box_tag('taxon_group[taxon_ids][]', taxon.id, taxon.id.in?(resource.taxons.pluck(:id))) %></td>
               <td><%= taxon.name %></td>
               <td><%= taxon_path taxon %></td>
             </tr>
@@ -42,12 +48,12 @@
     $(function() {
       // Checks a taxon's row checkbox on click
       $('[data-hook="taxons_row"]').on('click', function(e) {
-
+        // If checkbox, do nothing (prevent double select)
         if ($(event.target).context.type == 'checkbox' ) {
-          return; // Do nothing (checkbox)
+          return;
         }
-
-        var checkbox = $(this).children('td:first').children('input');
+        //debugger;
+        var checkbox = $(this).find('input:checkbox');
         checkbox.prop("checked", !checkbox.prop("checked"));
       });
     });

data/app/views/spree/admin/taxon_groups/_form_positions.html.erb

@@ -0,0 +1,56 @@
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: plural_resource_name(Spree::TaxonGroup)), spree.admin_taxon_groups_path, icon: 'arrow-left', class: 'btn-primary' %>
+<% end %>
+
+<%= form_for [:admin, resource], url: positions_admin_taxon_group_path(resource.id) do |f| %>
+
+  <div class="row" data-hook="admin_page_form_fields">
+    <div class="form-group">
+      <table class="table table-hover">
+        <thead>
+          <tr data-hook="taxons_header">
+            <th></th>
+            <th><%= Spree.t(:taxon_name) %></th>
+            <th><%= Spree.t(:path) %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @taxon_group_memberships.each do |membership| %>
+            <tr id="<%= spree_dom_id(membership) %>" data-hook="taxons_row">
+              <td class="move-handle">
+                <span class="icon icon-sort handle" style="cursor: pointer"></span>
+                <%=  hidden_field_tag('taxon_group_membership[position]['+membership.id.to_s+']', membership.position) %>
+              </td>
+              <td><%= membership.taxon.name %></td>
+              <td><%= taxon_path membership.taxon %></td>
+            </tr>
+          <% end %>
+          <% if @taxon_group_memberships.empty? %>
+            <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+
+  <div class="form-actions" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success'} %>
+    <span class="or"><%= Spree.t(:or) %></span>
+    <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
+  </div>
+
+  <script>
+    $(function() {
+      // Make the tablesortable (with updating the position field)
+      $('tbody').sortable({
+        handle: '.handle',
+        update: function(event, ui) {
+          $.each($("tbody input"), function(position){
+            $(this).val(position);
+          });
+        }
+      });
+    });
+  </script>
+
+<% end %>

data/app/views/spree/admin/taxon_groups/_list.html.erb

@@ -2,6 +2,7 @@
   <thead>
     <tr data-hook="taxon_groups_header">
       <th><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:key) %></th>
       <th><%= Spree.t(:taxon_count) %></th>
       <th class="actions"></th>
     </tr>
@@ -10,9 +11,18 @@
     <% @taxon_groups.each do |taxon_group| %>
       <tr id="<%= spree_dom_id taxon_group %>" data-hook="taxon_groups_row">
         <td><%= taxon_group.name %></td>
+        <td><%= taxon_group.key %></td>
         <td><%= taxon_group.taxons.count %></td>
         <td class="actions actions-2 text-right">
+          <!-- Edit -->
           <%= link_to_edit taxon_group.id, no_text: true %>
+
+          <!-- Positions -->
+          <%= link_to positions_admin_taxon_group_path(taxon_group.id), class: 'btn btn-default btn-sm icon-link with-tip action-positions no-text', 'data-original-title': 'Positions' do %>
+            <span class="icon icon-sort"></span>
+          <% end %>
+
+          <!-- Delete -->
           <%= link_to_delete taxon_group, no_text: true %>
         </td>
       </tr>

data/app/views/spree/admin/taxon_groups/positions.html.erb

@@ -0,0 +1,5 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:positions_taxon_group) %>
+<% end %>
+
+<%= render 'form_positions', resource: @taxon_group %>

data/config/locales/en.yml

@@ -14,5 +14,6 @@ en:
         taxon_groups: Taxon Groups
     new_taxon_group: "New Taxon Group"
     edit_taxon_group: "Edit Taxon Group"
+    positions_taxon_group: "Taxon Group Positions"
     taxon_count: "Taxon Count"
     shop_by_taxon_group: Shop by %{taxon_group}

data/config/routes.rb

@@ -1,5 +1,10 @@
 Spree::Core::Engine.add_routes do
   namespace :admin do
-    resources :taxon_groups
+    resources :taxon_groups do
+      member do
+        get :positions, to: 'taxon_groups#positions'
+        patch :positions, to: 'taxon_groups#update_positions'
+      end
+    end
   end
 end

data/db/migrate/20151018171108_add_position_to_spree_taxon_group_membership.rb

@@ -0,0 +1,5 @@
+class AddPositionToSpreeTaxonGroupMembership < ActiveRecord::Migration
+  def change
+    add_column :spree_taxon_group_memberships, :position, :integer, default: 0
+  end
+end

data/db/migrate/20151019140301_add_key_to_spree_taxon_group.rb

@@ -0,0 +1,5 @@
+class AddKeyToSpreeTaxonGroup < ActiveRecord::Migration
+  def change
+    add_column :spree_taxon_groups, :key, :string
+  end
+end

data/db/migrate/20151019140742_update_keys_where_nil_for_spree_taxon_group.rb

@@ -0,0 +1,7 @@
+class UpdateKeysWhereNilForSpreeTaxonGroup < ActiveRecord::Migration
+  def up
+    Spree::TaxonGroup.where(key: nil).each do |taxon_group|
+      taxon_group.update(key: taxon_group.name.downcase)
+    end
+  end
+end

data/lib/spree_taxon_group/version.rb

@@ -9,7 +9,7 @@ module SpreeTaxonGroup
 
   module VERSION
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
     PRE   = 'beta'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_taxon_group
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.1.0.beta
 platform: ruby
 authors:
 - James Whelton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -35,6 +35,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -48,15 +49,20 @@ files:
 - app/models/spree/taxon_group_membership.rb
 - app/overrides/add_taxon_groups_under_taxon_in_products_in_admin_sidebar_menu.rb
 - app/views/spree/admin/taxon_groups/_form.html.erb
+- app/views/spree/admin/taxon_groups/_form_positions.html.erb
 - app/views/spree/admin/taxon_groups/_list.html.erb
 - app/views/spree/admin/taxon_groups/edit.html.erb
 - app/views/spree/admin/taxon_groups/index.html.erb
 - app/views/spree/admin/taxon_groups/new.html.erb
+- app/views/spree/admin/taxon_groups/positions.html.erb
 - bin/rails
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20151004162900_create_spree_taxon_groups.rb
 - db/migrate/20151004173034_create_spree_taxon_group_memberships.rb
+- db/migrate/20151018171108_add_position_to_spree_taxon_group_membership.rb
+- db/migrate/20151019140301_add_key_to_spree_taxon_group.rb
+- db/migrate/20151019140742_update_keys_where_nil_for_spree_taxon_group.rb
 - lib/generators/spree_taxon_group/install/install_generator.rb
 - lib/spree_taxon_group.rb
 - lib/spree_taxon_group/engine.rb