paginas 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f21d442944522ab4692034eefcb99d7acf81f2
-  data.tar.gz: 84c1dcf0739ced4800eb7608f48b721de4d1f585
+  metadata.gz: d9586cf18c392b5e33aa55d42cd03f42207a107b
+  data.tar.gz: 5f4c578603b3428a5ee3a604b8029fc880cca2ef
 SHA512:
-  metadata.gz: 5703832b65ba0a33fc87fc191161a0f1383e92c1b75ea8f030ce05e555e80c5b85715aa5a0af9ca477156e680695573a5ea00efdf9018796aafac8d9ec5059f6
-  data.tar.gz: c4598da271f2a2c9d49e23fd1bea16928d9f14e0d014e2512e7bf3cb5d01eff03df8e03cf02a7ce6d1f4abe0f7859900bcf6ea3e17ddb7b2757b97274c91ef40
+  metadata.gz: c8ca5f974318c84503a598183c5669721063703eb6b55862def0a2dcb85dc78a0e65d08823d221022f6ed89d05a79888fd9f5cc9bf9fa0d97994577d12a9b1b9
+  data.tar.gz: 2610e9bd6e74593cf989543eda8e7fed048899b14c502adc9e4feadadd930ca9916b81583d2b27d3ad784d89c6a549f4c3206c92f9f82756c76affd37214f025

data/app/assets/javascripts/paginas.js

@@ -1 +1,6 @@
 //= require tinymce
+
+if( typeof jQuery != 'undefined')
+{
+	$(document).on('page:receive',function(){tinymce.remove()});
+}

data/app/controllers/paginas/application_controller.rb

@@ -1,3 +1,5 @@
   class Paginas::ApplicationController < ApplicationController
-
+    rescue_from ActiveRecord::RecordNotFound do |exception|
+         redirect_to root_url, :alert => exception.message
+    end
   end

data/app/controllers/paginas/categories_controller.rb

@@ -0,0 +1,43 @@
+require_dependency "paginas/application_controller"
+module Paginas
+  class CategoriesController < ApplicationController
+    before_action :set_category, only: [:show, :edit, :update, :destroy]
+    def index
+      @categories = Category.all
+    end
+    def show
+    end
+    def new
+      @category = Category.new
+    end
+    def edit
+    end
+    def create
+      @category = Category.new(category_params)
+      if @category.save
+        redirect_to @category, notice: 'Category was successfully created.'
+      else
+        render :new
+      end
+    end
+    def update
+      if @category.update(category_params)
+        redirect_to @category, notice: 'Category was successfully updated.'
+      else
+        render :edit
+      end
+    end
+    def destroy
+      @category.destroy
+      redirect_to categories_url, notice: 'Category was successfully destroyed.'
+    end
+
+    private
+      def set_category
+        @category = Category.find(params[:id])
+      end
+      def category_params
+        params.require(:category).permit(:name, :description)
+      end
+  end
+end

data/app/controllers/paginas/pages_controller.rb

@@ -1,9 +1,8 @@
 require_dependency "paginas/application_controller"
-
 module Paginas
   class PagesController < ApplicationController
     before_action :set_page, only: [:display,:show, :edit, :update, :destroy]
-
+    before_action :set_categories, only: [:edit,:new,:update,:destroy]
     def index
       @pages = Page.all
     end
@@ -11,7 +10,6 @@ module Paginas
       @pages = Page.where(featured: true)
       render :featured
     end
-
     def show
     end
     def display
@@ -19,20 +17,16 @@ module Paginas
     def new
       @page = Page.new
     end
-
     def edit
     end
-
     def create
       @page = Page.new(page_params)
-
       if @page.save
         redirect_to @page, notice: 'Page was successfully created.'
       else
         render :new
       end
     end
-
     def update
       if @page.update(page_params)
         redirect_to @page, notice: 'Page was successfully updated.'
@@ -40,19 +34,20 @@ module Paginas
         render :edit
       end
     end
-
     def destroy
       @page.destroy
       redirect_to pages_url, notice: 'Page was successfully destroyed.'
     end
 
     private
-      def set_page
-        @page = Page.find(params[:id])
-      end
-
-      def page_params
-        params.require(:page).permit(:title, :text, :featured)
-      end
+    def set_categories
+      @categories = Category.all
+    end
+    def set_page
+      @page = Page.find(params[:id])
+    end
+    def page_params
+      params.require(:page).permit(:title, :text, :featured,:show_title,:category_id)
+    end
   end
 end

data/app/helpers/paginas/application_helper.rb

@@ -1,5 +1,46 @@
 module Paginas
   module ApplicationHelper
+    def paginas_menu_helper_by_pages(ids,options = {})
+      options[:item_style] ||= "[link]"
+      options[:item_separator] ||= " | "
+      options[:group_style] ||= "[items]"
+      options[:active_class] ||= ""
+
+      output = ''
+      separator = ''
+      ids.each do |key,id|
+        output += separator
+        output += options[:item_style].gsub(/\[link\]/, link_to(key ,display_path(id)))
+        if separator == ''
+          separator= options[:item_separator]
+        end
+    end
+      output = options[:group_style].gsub(/\[items\]/, output)
+      output = output.gsub(/\[active\]/, output)
+
+      return output.html_safe
+    end
+    def paginas_menu_helper_by_cat(catid,options = {})
+      options[:item_style] ||= "[link]"
+      options[:item_separator] ||= " | "
+      options[:group_style] ||= "[items]"
+      options[:active_class] ||= ""
+
+      output = ''
+      separator = ''
+      Category.find(catid).pages.each do |page|
+        output += separator
+        output += options[:item_style].gsub(/\[link\]/, link_to(page.title ,display_path(page.id)))
+        if separator == ''
+          separator= options[:item_separator]
+        end
+      end
+      output = options[:group_style].gsub(/\[items\]/, output)
+      output = output.gsub(/\[active\]/, output)
+
+      return output.html_safe
+    end
+
     def method_missing(method, *args, &block)
       if (method.to_s.end_with?('_path') || method.to_s.end_with?('_url')) && main_app.respond_to?(method)
         main_app.send(method, *args)

data/app/helpers/paginas/categories_helper.rb

@@ -0,0 +1,4 @@
+module Paginas
+  module CategoriesHelper
+  end
+end

data/app/models/paginas/category.rb

@@ -0,0 +1,5 @@
+module Paginas
+  class Category < ActiveRecord::Base
+    has_many :pages, :dependent => :destroy
+  end
+end

data/app/models/paginas/page.rb

@@ -1,5 +1,6 @@
 module Paginas
   class Page < ActiveRecord::Base
+    belongs_to :category
     validates :title, presence: true
   end
 end

data/app/views/paginas/categories/_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_for(@category) do |f| %>
+  <% if @category.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@category.errors.count, "error") %> prohibited this category from being saved:</h2>
+
+      <ul>
+      <% @category.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :description %><br>
+    <%= f.text_area :description %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/paginas/categories/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Category</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @category %> |
+<%= link_to 'Back', categories_path %>

data/app/views/paginas/categories/index.html.erb

@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Categories</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>ID</th>
+      <th>Name</th>
+      <th>Description</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @categories.each do |category| %>
+      <tr>
+        <td><%= category.id %></td>
+        <td><%= category.name %></td>
+        <td><%= category.description %></td>
+        <td><%= link_to 'Show', category %></td>
+        <td><%= link_to 'Edit', edit_category_path(category) %></td>
+        <td><%= link_to 'Destroy', category, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Category', new_category_path %>

data/app/views/paginas/categories/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Category</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', categories_path %>

data/app/views/paginas/categories/show.html.erb

@@ -0,0 +1,18 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>ID:</strong>
+  <%= @category.id %>
+</p>
+<p>
+  <strong>Name:</strong>
+  <%= @category.name %>
+</p>
+
+<p>
+  <strong>Description:</strong>
+  <%= @category.description %>
+</p>
+
+<%= link_to 'Edit', edit_category_path(@category) %> |
+<%= link_to 'Back', categories_path %>

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

@@ -15,10 +15,18 @@
     <%= f.label :title %><br>
     <%= f.text_field :title %>
   </div>
+  <div class="field">
+    <%= f.label :show_title %><br>
+    <%= f.check_box :show_title %>
+  </div>
   <div class="field">
     <%= f.label :featured %><br>
     <%= f.check_box :featured %>
   </div>
+  <div class="field">
+    <%= f.label :category_id %><br>
+    <%= f.select :category_id,options_from_collection_for_select(@categories,:id,:name,f.object.category_id)  %>
+  </div>
   <div class="field">
     <%= f.label :text %><br>
     <%= f.text_area :text, :class => "tinymce", :rows => 20, :cols => 80 %>

data/app/views/paginas/pages/display.html.erb

@@ -1,2 +1,2 @@
-<h3><%= @page.title %> </h3>
+<%=(@page.show_title)? "<h3>#{@page.title}</h3>".html_safe : "" %> 
 <div><%= @page.text.html_safe %></div>

data/app/views/paginas/pages/featured.html.erb

@@ -1,5 +1,5 @@
 <% @pages.each do |page| %>
-    <h3><%= page.title %></h3>
+  <%=(page.show_title)? "<h3>#{page.title}</h3>".html_safe : "" %> 
     <div><%= page.text.html_safe %></div>
     </tr>
 <% end %>

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

@@ -7,6 +7,7 @@
     <tr>
       <th>Title</th>
       <th>Featured</th>
+      <th>Category</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -16,6 +17,7 @@
       <tr>
         <td><%= page.title %></td>
         <td><%= page.featured %></td>
+        <td><%= page.category.name %></td>
         <td><%= link_to 'Show', page %></td>
         <td><%= link_to 'Edit', edit_page_path(page) %></td>
         <td><%= link_to 'Destroy', page, method: :delete, data: { confirm: "Are you sure?" } %></td>

data/app/views/paginas/pages/show.html.erb

@@ -2,6 +2,8 @@
 
 <h3><%= @page.title %> </h3>
 
+<label>Page Link</label>
+<%= text_field_tag :link, display_url(@page), :readonly => 'readonly' %>
 <div><%= @page.text.html_safe %></div>
 
 <%= link_to 'Edit', edit_page_path(@page) %> |

data/config/routes.rb

@@ -1,4 +1,5 @@
 Paginas::Engine.routes.draw do
+  resources :categories
   resources :pages
   get 'featured', to: 'pages#featured'
   get 'display/:id', to: 'pages#display', as: "display"

data/db/migrate/20150212133316_create_paginas_pages.rb

@@ -4,7 +4,7 @@ class CreatePaginasPages < ActiveRecord::Migration
       t.string :title
       t.text :text
       t.boolean :featured, :default => false
-      
+
       t.timestamps null: false
     end
   end

data/db/migrate/20150213135047_add_show_title_to_paginas_pages.rb

@@ -0,0 +1,5 @@
+class AddShowTitleToPaginasPages < ActiveRecord::Migration
+  def change
+    add_column :paginas_pages, :show_title, :boolean, :default => false
+  end
+end

data/db/migrate/20150213154421_create_paginas_categories.rb

@@ -0,0 +1,10 @@
+class CreatePaginasCategories < ActiveRecord::Migration
+  def change
+    create_table :paginas_categories do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150213155126_add_ref_to_paginas_pages.rb

@@ -0,0 +1,5 @@
+class AddRefToPaginasPages < ActiveRecord::Migration
+  def change
+    add_reference :paginas_pages, :category, index: true
+  end
+end

data/lib/generators/paginas/views_generator.rb

@@ -35,6 +35,7 @@ module Paginas
           end
         else
           view_directory :pages
+          view_directory :categories
         end
       end
 
@@ -63,7 +64,7 @@ module Paginas
 
       # Override copy_views to just copy mailer and shared.
       def copy_views
-        view_directory :shared
+        # view_directory :shared
       end
     end
 

data/lib/paginas.rb

@@ -1,4 +1,3 @@
 require "paginas/engine"
-
 module Paginas
 end

data/lib/paginas/version.rb

@@ -1,3 +1,3 @@
 module Paginas
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/controllers/paginas/categories_controller_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+module Paginas
+  class CategoriesControllerTest < ActionController::TestCase
+    setup do
+      @category = categories(:one)
+    end
+
+    test "should get index" do
+      get :index
+      assert_response :success
+      assert_not_nil assigns(:categories)
+    end
+
+    test "should get new" do
+      get :new
+      assert_response :success
+    end
+
+    test "should create category" do
+      assert_difference('Category.count') do
+        post :create, category: { description: @category.description, name: @category.name }
+      end
+
+      assert_redirected_to category_path(assigns(:category))
+    end
+
+    test "should show category" do
+      get :show, id: @category
+      assert_response :success
+    end
+
+    test "should get edit" do
+      get :edit, id: @category
+      assert_response :success
+    end
+
+    test "should update category" do
+      patch :update, id: @category, category: { description: @category.description, name: @category.name }
+      assert_redirected_to category_path(assigns(:category))
+    end
+
+    test "should destroy category" do
+      assert_difference('Category.count', -1) do
+        delete :destroy, id: @category
+      end
+
+      assert_redirected_to categories_path
+    end
+  end
+end