activa 0.0.11 → 0.0.13

data/app/assets/javascripts/activa/activa.js

@@ -0,0 +1,3 @@
+//= require jquery-ui
+//= require activa/form
+//= require jquery.mjs.nestedSortable

data/app/assets/stylesheets/activa/activa.css.scss

@@ -54,8 +54,37 @@ form.activa-page {
   }
 }
 
-ul#pages {
+ul#activa-pages {
+  margin-bottom: 25px;
+  
   ul {
-    padding: 0 0 0 2em !important;
+    padding: 0 0 0 1em !important;
+  }
+
+  li {
+    div {
+      border: 1px solid #efefef;
+      @include border-radius(4px);
+      padding: 4px 7px 4px 25px;
+      margin: 0 0 5px 0;
+      cursor: move;
+      @include background(linear-gradient(top, #fefefe 0%, #efefef 100%));
+
+      &:hover {
+        border: 1px solid #eee;
+        @include background(linear-gradient(top, #eee 0%, #ddd 100%));          
+      }
+
+      span.label {
+        font-size: 80%;
+      }
+    }
+  }
+
+  .placeholder {
+    border: 1px dashed #4183C4;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
   }
 }

data/app/controllers/activa/pages_controller.rb

@@ -8,11 +8,11 @@ class Activa::PagesController < Activa::ApplicationController
   layout 'admin', :except => %w(index show)
 
   def index
-    @pages = Activa::Page.published.roots
+    @pages = Activa::Page.roots
   end
 
   def show
-    # Just render view
+
   end
 
   def new
@@ -48,7 +48,6 @@ class Activa::PagesController < Activa::ApplicationController
 
   def update
     if params[:commit].present?
-      #@page.attributes = params[:page]
       if @page.update_attributes(params[:page])#@page.publish#(params[:page])
         flash.notice = I18n.t 'controllers.pages.create.published_notice'
         smart_redirect_to(@page) and return
@@ -76,6 +75,14 @@ class Activa::PagesController < Activa::ApplicationController
     render :json => { :slug => params[:title].to_s.to_url }
   end
 
+  def position
+    render :json => Activa::Page.move(
+      params[:first_node_id],
+      params[:second_node_id],
+      params[:nesting]
+    )
+  end
+
 private
 
   def smart_redirect_to(page)

data/app/models/activa/page.rb

@@ -92,11 +92,7 @@ module Activa
 
     # Retrieve list of all potential parents pages for current page
     def potential_parents
-      new_record? ? Activa::Page.scoped : Activa::Page.where("id != ?", id)
-    end
-
-    def self.has_root?
-      unscoped.count > 0
+      new_record? ? Activa::Page.published : Activa::Page.published.where("id != ?", id)
     end
 
     def regenerate_uri!
@@ -115,24 +111,53 @@ module Activa
       self_and_siblings.select([:id, :parent_id, :title, :uri, :slug])
     end
 
-    def self.retrieve(uri)
-      uri = Activa::Page.normalize_uri(uri)
-      uri = '/' if uri == '/home'
-      Activa::Page.find_by_uri(Activa::Page.normalize_uri(uri))
+    def draft?
+      state == 'draft'
     end
 
-    def self.normalize_uri(uri)
-      "/#{uri}".sub(/\/+/, '/')
-    end
-
-    def self.normalize_path(path)
-      path.sub(/^\/+/, '')
+    def published?
+      state == 'published'
     end
 
     def to_s
       title
     end
 
+    # Singleton methods
+    class << self
+      def has_root?
+        unscoped.count > 0
+      end
+
+      def retrieve(uri)
+        uri = Activa::Page.normalize_uri(uri)
+        uri = '/' if uri == '/home'
+        Activa::Page.published.find_by_uri(Activa::Page.normalize_uri(uri))
+      end
+
+      def normalize_uri(uri)
+        "/#{uri}".sub(/\/+/, '/')
+      end
+
+      def normalize_path(path)
+        path.sub(/^\/+/, '')
+      end
+
+      # Move node as a neighbour of child of another node
+      def move(firstNodeId, secondNodeId, nesting)
+        firstNode  = find(firstNodeId)
+        secondNode = find(secondNodeId)
+
+        if (nesting.to_i == 0)
+          firstNode.move_to_right_of(secondNode)
+        else
+          firstNode.move_to_child_of(secondNode)
+        end
+
+        return true
+      end
+    end
+
   private
 
     # После переноса узла запускается этот метод и успешно

data/app/views/activa/pages/_form.html.erb

@@ -25,18 +25,20 @@
   </div>
 <% end %>
 
-<script>
-$(function() {
-  var activa;
-  return activa = new Activa({
-    title_input:    $('#page_title'),
-    slug_input:     $('#page_slug'),
-    toggle_btn:     $('#activa-title-wrapper a'),
-    toggle_wrapper: $('form.activa-page div.slug'),
-    done_btn:       $('form.activa-page button'),
-    cancel_btn:     $('form.activa-page a.cancel'),
-    update_uri:     '<%= slug_pages_path(:format => :json) %>',
-    persisted:      <%= @page.persisted? %>
+<% content_for :javascript do %>
+  <script>
+  $(function() {
+    var activa;
+    return activa = new Activa({
+      title_input:    $('#page_title'),
+      slug_input:     $('#page_slug'),
+      toggle_btn:     $('#activa-title-wrapper a'),
+      toggle_wrapper: $('form.activa-page div.slug'),
+      done_btn:       $('form.activa-page button'),
+      cancel_btn:     $('form.activa-page a.cancel'),
+      update_uri:     '<%= slug_pages_path(:format => :json) %>',
+      persisted:      <%= @page.persisted? %>
+    });
   });
-});
-</script>
+  </script>
+<% end %>

data/app/views/activa/pages/_page.html.erb

@@ -1,9 +1,15 @@
-<li>
-  <%= link_to page.title, main_app.activa_page_path(page.path) %>
+<li data-id="<%= page.id %>">
+  <div>
+    <% if page.draft? %>
+      <span class="label label-warning"><%= t('views.pages._page.labels.draft') %></span>
+    <% end %>
+
+    <%= link_to page.title, main_app.activa_page_path(page.path) %>
+  </div>
 
   <% unless page.leaf? %>
     <ul>
-      <%= render :partial => :page, :collection => page.children.published %>
+      <%= render :partial => :page, :collection => page.children.scoped %>
     </ul>
   <% end %>
 </li>

data/app/views/activa/pages/index.html.erb

@@ -1,12 +1,51 @@
 <%= heading_with_title t('views.pages.index.heading') %>
 
 <% if @pages.any? %>
-  <ul id="pages">
+  <ul id="activa-pages">
     <%= render :partial => :page, :collection => @pages %>
   </ul>
 <% else %>
-  <p>No pages yet.</p>
+  <p><%= t('views.pages.index.empty') %></p>
 <% end %>
 
 <%= render 'activa/pages/partials/menu/index' %>
 
+<% content_for :javascript do %>
+<script>
+  $(function() {
+    // see: https://github.com/mjsarfatti/nestedSortable
+    $('#activa-pages').nestedSortable({
+      handle           : 'div',
+      items            : 'li',
+      toleranceElement : '> div',
+      listType         : 'ul',
+      protectRoot      : true,
+      forcePlaceholderSize: true,
+      placeholder      : 'placeholder',
+      helper           : 'clone',
+      stop: function(event, ui) {
+        var item      = $(ui.item[0])
+        var moveAfter = item.prev('li')
+        var nesting   = 0
+
+        // Has nesting
+        if (!moveAfter.length) {
+          nesting   = 1
+          moveAfter = item.parent('ul').parent('li')
+        }
+
+        var params = {
+          'first_node_id'  : item.data('id'),
+          'second_node_id' : moveAfter.data('id'),
+          'nesting'        : nesting,
+          '_method'        : 'put'
+        }
+
+        $.post('<%= position_pages_path(:format => :json) %>', params, function(data) {
+          console.log(data)
+        })
+      }
+    });
+  });
+  </script>
+<% end %>

data/config/locales/en.yml

@@ -53,9 +53,13 @@ en:
           link: 'Edit'
       index:
         heading: 'Pages'
+        empty: 'No pages yet.'
         sidebar:
           heading: 'Actions'
           link: 'Create Page'
+      _page:
+        labels:
+          draft: 'Draft'
       shared:
         back_link: 'back'
         save_as_draft: 'Save as draft'

data/config/locales/ru.yml

@@ -27,6 +27,7 @@ ru:
         or: 'или'
       page:
         create: 'Опубликовать'
+        update: 'Сохранить и опубликовать изменения'
   controllers:
     pages:
       create:
@@ -53,9 +54,13 @@ ru:
           link: 'Редактировать'
       index:
         heading: 'Страницы'
+        empty: 'Еще нет ни одной страницы.'
         sidebar:
           heading: 'Действия'
           link: 'Создать страницу'
+      _page:
+        labels:
+          draft: 'Черновик'
       shared:
         back_link: 'вернуться назад'
         save_as_draft: 'Сохранить как черновик'

data/config/routes.rb

@@ -4,7 +4,8 @@ Activa::Engine.routes.draw  do
   #mount ImperaviRails::Engine => "/imperavi-rails"
 
   resources :pages do
-  	post 'slug', :on => :collection
+  	post 'slug',     :on => :collection
+  	put  'position', :on => :collection
   end
 
   root :to => 'pages#index'

data/lib/activa/version.rb

@@ -1,3 +1,3 @@
 module Activa
-  VERSION = "0.0.11"
-end
+  VERSION = "0.0.13"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activa
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &85507440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *85507440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &85507220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85507220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &85506980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85506980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &85506760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85506760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &85506510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85506510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass-rails
-  requirement: &85506280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85506280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85506030 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85506030
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &85505790 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85505790
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &85505560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85505560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &85505330 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85505330
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &85505110 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85505110
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &85504900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85504900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails 3.1+ dynamic page management
 email:
 - demerest@gmail.com
@@ -159,7 +219,8 @@ files:
 - app/helpers/activa/pages_helper.rb
 - app/controllers/activa/application_controller.rb
 - app/controllers/activa/pages_controller.rb
-- app/assets/javascripts/activa/activa.js.coffee
+- app/assets/javascripts/activa/form.js.coffee
+- app/assets/javascripts/activa/activa.js
 - app/assets/images/input-bg.gif
 - app/assets/images/rails.png
 - app/assets/images/bg.jpg
@@ -612,9 +673,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails 3.1+ dynamic page management
 test_files: []
-has_rdoc: