para 0.7.2 → 0.7.3.p1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f2e4cc7267a3d024fb9690cf426b0064bdb5da8
-  data.tar.gz: eea345a2e6a7b354420b6fb27d8bcef5bda8d5b9
+  metadata.gz: 9914054a92494ea3515aff6b5d6666cedac890dd
+  data.tar.gz: e315815203d4e228705bcf9d0c65f79ce90628e2
 SHA512:
-  metadata.gz: 75f8375384ace99363c1d518f82df23c7261cc96d86b925d743dcf6052b8d9d79a767eb2c2d21ebbe549798cf22caa429ca7cd88d1bb32acd96f497bf9afc9b0
-  data.tar.gz: ea104d47ae45e079a54d0af2c2af8212dc2d5148722ee432f54764594d09cfff86988ec4ff2b4bdb15f96938c668fbb817e6c19f6774519c3ddcf5f99c96f0a5
+  metadata.gz: bacae843ada593e3530f3e71a9aa432a1db3a45b17d1e4bacd7acc99033ba4eddbed1aa514abce6e96240bc7b0b52d7a5f67b64ff630717d8c9534c00b517f1c
+  data.tar.gz: a332a031f1e49cb77eda71bdffd8166055e5b8962432513ed444f2d096f61c8b29a693fd209c08c467e6748192f2ce4b1dc00d1a9a1993c529504592b2ba83de

data/app/models/para/page/section.rb

@@ -3,7 +3,7 @@ module Para
     class Section < ActiveRecord::Base
       self.table_name = 'para_page_sections'
 
-      acts_as_orderable
+      acts_as_orderable parent: :page, as: :sections
 
       page_relation_options = { polymorphic: true }
 

data/app/models/para/page/section_resource.rb

@@ -3,7 +3,7 @@ module Para
     class SectionResource < ActiveRecord::Base
       self.table_name = 'para_page_section_resources'
 
-      acts_as_orderable
+      acts_as_orderable parent: :section, as: :section_resources
 
       belongs_to :section
       belongs_to :resource, polymorphic: true

data/lib/para/orderable.rb

@@ -4,14 +4,18 @@ module Para
 
     included do
       scope :ordered, -> { order("#{ table_name }.position ASC") }
+
       before_create :orderable_assign_position
+      after_commit  :reprocess_ordering
+      after_destroy :reprocess_ordering
     end
 
+    private
+
     def orderable_assign_position
       return if attribute_present?(:position)
 
-      last_resource = self.class.unscoped
-        .ordered
+      last_resource = orderable_scope
         .where.not(position: nil)
         .select(:position)
         .first
@@ -22,20 +26,45 @@ module Para
         0
       end
     end
+
+    # Unfragment existing resources positions
+    #
+    def reprocess_ordering
+      orderable_scope.each_with_index do |resource, index|
+        resource.update_column(:position, index)
+      end
+    end
+
+    def orderable_scope
+      if (parent = _orderable_options[:parent]) && (as = _orderable_options[:as])
+        try(parent).try(as).try(:ordered) || []
+      else
+        self.class.unscoped.ordered
+      end
+    end
   end
 
   module ActiveRecordOrderableMixin
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :orderable
+      class_attribute :orderable, :_orderable_options
     end
 
     module ClassMethods
-      def acts_as_orderable
+      def acts_as_orderable(options = {})
         return if orderable?
 
+        unless (
+          ( options[:parent] &&  options[:as]) ||
+          (!options[:parent] && !options[:as])
+        )
+          raise "You need to either pass :parent and :as options to the " \
+                "acts_as_orderable macro, or no options at all."
+        end
+
         self.orderable = true
+        self._orderable_options = options
         include Para::Orderable
       end
 

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.7.2'
+  VERSION = '0.7.3.p1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3.p1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -833,9 +833,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11