quadro 0.5.8 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmE1MTI2NWViNTExOTdmNjAxMjAxYWM2OTFjNmZhNGZjYTY2MzY3Nw==
-  data.tar.gz: !binary |-
-    Y2RlYzQxZDFmNTdiMzAxYjk2YmYxMDhlZDdjNmEyYjg4OTFhMzY5Yg==
+SHA1:
+  metadata.gz: bb73dbba9bba95e0a98de38a88a54825627196bb
+  data.tar.gz: 44dc4d9378f2bab776475b435db9a5d9f7e24033
 SHA512:
-  metadata.gz: !binary |-
-    ODA3OGE4MzU3MzNmMGUzNDY1M2U5ODdhYWI4ODk3YzZmMjk1ZGI5YTc5MDRi
-    ODljYjI4ZWVhZWQ2MDE5MTNkN2QzYzg3YjFjNjY0YTYwZmQ3MTQ0MTA3NDVh
-    OGFhNjhhZGU0OWU2NWFkODc4ZTFmODEyZWM4ODk2Yjc3MzRkYjg=
-  data.tar.gz: !binary |-
-    MTU3NGVlZDkxYjRiZTBiYzdjM2UxOTU1ODk5NmU4MzYzMWJjYmVkOGM2NGQx
-    ZDM0YTlhNDIzODBlYzkyODA0ZTM5MjFlNWVmOWM1NjNkZjk2ZTZkOTU0OTRm
-    YTc3NzA5NzEyMGFlNDZiMWI1MGVkNDZiOGVjZThjN2E0YzAyMzc=
+  metadata.gz: 7928d0cbf90829226ff70643fc40bb226441e1cbe3acca801f1c1030b26dec330161660b786e1498c809b5580524ec89408e46c87bcbc035f31f1b6dcf84431e
+  data.tar.gz: 7e5f1abeb88f5045751e5c568b315f078951b8317cd775f93455c79a3db044c72578173a6b3afdcb3f56d89fe9b60d393f12e2510829835df7c2ec1d2d3cef92

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+Copyright 2016 Hugo Gilmar Erazo
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,9 +14,14 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
+
+load 'rails/tasks/statistics.rake'
+
+
+
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -34,6 +33,5 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-require 'turnout/rake_tasks'
 
 task default: :test

data/app/assets/javascripts/quadro/widget.js.coffee

@@ -19,21 +19,24 @@ class Widget
         tabSize: 2
         mode: 'htmlmixed'
         theme: 'monokai'
-      onChange: =>
-        @setChanged()
-      onfocus: =>
-        @setFocus()
-        return
+      callbacks:
+        onChange: =>
+          console.log "summernote:change"
+          @setChanged()
+          return
+        onfocus: =>
+          @setFocus()
+          return
     return
 
   switchAirmodeOn: ->
-    @element.destroy()
+    @element.summernote('destroy')
     @airmode = true
     @summernote()
     return
 
   switchAirmodeOff: ->
-    @element.destroy()
+    @element.summernote('destroy')
     @airmode = false
     @summernote()
     return
@@ -47,7 +50,7 @@ class Widget
   update: ->
     $.ajax
       url: "#{@path}"
-      type: "PUT"
+      type: 'PUT'
       data:
         widget:
           content: @content
@@ -58,7 +61,7 @@ class Widget
     return
 
   getContent: ->
-    @content = $(".widget-html[data-name=#{@name}]").code()
+    @content = $(".widget-html[data-name=#{@name}]").summernote('code')
     return
 
   setFocus: ->

data/app/controllers/quadro/application_controller.rb

@@ -46,7 +46,7 @@ module Quadro
           asset_type = params[:type]
           if Quadro.available_assets.include?(asset_type)
             klass = asset_type.constantize
-            new_asset = klass.new(params[:asset])
+            new_asset = klass.new(asset_params)
             if widget.present?
               widget.assets << new_asset
             elsif page.present?
@@ -87,7 +87,7 @@ module Quadro
           when %w(new).include?(action_name)
             parent.children.new
           when %w(create).include?(action_name)
-            parent.children.new(params[:page])
+            parent.children.new(page_params)
           when %w(edit update form publish unpublish).include?(action_name)
             root.subtree.find_by_slug(params[:id]) rescue nil
           else
@@ -106,9 +106,9 @@ module Quadro
 
     def subpages
       if user_signed_in?
-        @subpages ||= page.children.ordered.page(params[:page])
+        @subpages ||= page.children.ordered.page(params[:page]).per(1)
       else
-        @subpages ||= page.children.published.ordered.page(params[:page])
+        @subpages ||= page.children.published.ordered.page(params[:page]).per(1)
       end
     end
 
@@ -135,5 +135,23 @@ module Quadro
     def not_found_page
       render file: 'public/404', status: :not_found, layout: false
     end
+
+    private
+
+    def page_params
+      params.require(:page).permit(:title, :summary, :template, :frequency, :priority, :cover_attributes, :author_id, :published_at)
+    end
+
+    def widget_params
+      params.require(:widget).permit(:name, :type, :content, :width, :height)
+    end
+
+    def asset_params
+      params.require(:asset).permit(:attachment, :width, :height, :alt, :href)
+    end
+
+    def user_params
+      params.require(:user).permit(:email, :password, :password_confirmation, :remember_me, :name)
+    end
   end
 end

data/app/controllers/quadro/assets_controller.rb

@@ -15,7 +15,7 @@ module Quadro
     end
 
     def update
-      if asset.update_attributes(params[:asset])
+      if asset.update_attributes(asset_params)
         flash[:notice] = t('quadro.flash.updated')
       else
         flash[:alert] = t('quadro.flash.not_updated')

data/app/controllers/quadro/pages_controller.rb

@@ -18,7 +18,7 @@ module Quadro
     end
 
     def update
-      if page.update_attributes(params[:page])
+      if page.update_attributes(page_params)
         flash[:notice] = t('quadro.flash.updated')
       else
         flash[:alert] = t('quadro.flash.not_updated')

data/app/controllers/quadro/{tools_controller.rb → sitemaps_controller.rb}

@@ -1,12 +1,12 @@
 require_dependency 'quadro/application_controller'
 
 module Quadro
-  class ToolsController < ApplicationController
+  class SitemapsController < ApplicationController
     before_filter :authenticate_user!
 
     respond_to :js, :json, :xml
 
-    def sitemap_notifier
+    def ping
       notifier.run(sitemap_url)
       flash[:notice] = t('quadro.flash.notified')
     end

data/app/controllers/quadro/users_controller.rb

@@ -7,7 +7,7 @@ module Quadro
     respond_to :js, :json, :xml
 
     def update
-      if user.update_with_password(params[:user])
+      if user.update_with_password(user_params)
         sign_in user, bypass: true
       end
     end

data/app/controllers/quadro/widgets_controller.rb

@@ -7,7 +7,7 @@ module Quadro
     respond_to :js, :json, :xml
 
     def update
-      if widget.update_attributes(params[:widget])
+      if widget.update_attributes(widget_params)
         flash[:notice] = t('quadro.flash.updated')
       else
         flash[:alert] = t('quadro.flash.not_updated')

data/app/models/quadro/asset.rb

@@ -1,7 +1,7 @@
 module Quadro
   class Asset < ActiveRecord::Base
     # attributes
-    attr_accessible :attachment
+    # attr_accessible :attachment
 
     delegate :url, to: :attachment
 

data/app/models/quadro/asset/cover.rb

@@ -2,8 +2,8 @@ module Quadro
   class Asset::Cover < Asset
     # attributes
     store :settings, accessors: [:width, :height, :alt]
-    attr_accessible :width, :height, :alt
-    has_attached_file :attachment, styles: { thumb: '200x200#', small: '800x600>', medium: '1024x768>', large: '1280x1024>' }, default_url: '/assets/quadro/missing/cover/:style.png'
+    # attr_accessible :width, :height, :alt
+    has_attached_file :attachment, styles: { thumb: '200x200#', small: '800x600>', medium: '1024x768>', large: '1280x1024>' }, default_url: 'quadro/missing/cover/:style.png'
 
     # validations
     validates :alt, length: { maximum: 60 }

data/app/models/quadro/asset/image.rb

@@ -2,8 +2,8 @@ module Quadro
   class Asset::Image < Asset
     # attributes
     store :settings, accessors: [:width, :height, :alt]
-    attr_accessible :width, :height, :alt
-    has_attached_file :attachment, styles: { thumb: '200x200#', small: '320x240>', medium: '640x480>', large: '800x600>' }, default_url: '/assets/quadro/missing/image/:style.png'
+    # attr_accessible :width, :height, :alt
+    has_attached_file :attachment, styles: { thumb: '200x200#', small: '320x240>', medium: '640x480>', large: '800x600>' }, default_url: 'quadro/missing/image/:style.png'
 
     # validations
     validates :alt, length: { maximum: 60 }

data/app/models/quadro/asset/slide.rb

@@ -2,8 +2,8 @@ module Quadro
   class Asset::Slide < Asset
     # attributes
     store :settings, accessors: [:width, :height, :alt, :href]
-    attr_accessible :width, :height, :alt, :href
-    has_attached_file :attachment, styles: { thumb: '200x200#', small: '640x480>', medium: '800x600>', large: '1024x768>' }, default_url: '/assets/quadro/missing/slide/:style.png'
+    # attr_accessible :width, :height, :alt, :href
+    has_attached_file :attachment, styles: { thumb: '200x200#', small: '640x480>', medium: '800x600>', large: '1024x768>' }, default_url: 'quadro/missing/slide/:style.png'
 
     # validations
     validates :alt, length: { maximum: 60 }

data/app/models/quadro/interaction.rb

@@ -1,13 +1,12 @@
 module Quadro
   class Interaction < ActiveRecord::Base
     # attributes
-    attr_accessible :content, :ip_address, :user_agent
     serialize :content, Hash
 
     # associations
     belongs_to :interactable, polymorphic: true
 
     # scopes
-    default_scope order('quadro_interactions.created_at DESC')
+    default_scope -> { order('quadro_interactions.created_at DESC') }
   end
 end

data/app/models/quadro/page.rb

@@ -6,7 +6,6 @@ module Quadro
     SITEMAP_PRIORITY = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0].freeze
 
     # attributes
-    attr_accessible :title, :summary, :template, :frequency, :priority, :cover_attributes, :author_id, :published_at
     store :settings, accessors: [:template, :frequency, :priority]
 
     # validations
@@ -36,8 +35,8 @@ module Quadro
     delegate :name, :email, to: :author, prefix: true, allow_nil: true
 
     # scopes
-    scope :ordered, order('quadro_pages.published_at DESC, quadro_pages.created_at DESC')
-    scope :published, where('quadro_pages.published_at IS NOT NULL')
+    scope :ordered, -> { order('quadro_pages.published_at DESC, quadro_pages.created_at DESC') }
+    scope :published, -> { where('quadro_pages.published_at IS NOT NULL') }
 
     # methods
     def publish!

data/app/models/quadro/user.rb

@@ -1,7 +1,7 @@
 module Quadro
   class User < ActiveRecord::Base
     # attributes
-    attr_accessible :email, :password, :password_confirmation, :remember_me, :name
+    # attr_accessible :email, :password, :password_confirmation, :remember_me, :name
 
     # behaviours
     devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :lockable
@@ -14,6 +14,6 @@ module Quadro
     has_many :pages, dependent: :destroy
 
     # scopes
-    scope :ordered, order('quadro_users.name ASC')
+    scope :ordered, -> { order('quadro_users.name ASC') }
   end
 end

data/app/models/quadro/widget.rb

@@ -1,8 +1,5 @@
 module Quadro
   class Widget < ActiveRecord::Base
-    # attributes
-    attr_accessible :name, :type
-
     # validations
     validates :name, uniqueness: { scope: :page_id }
 

data/app/models/quadro/widget/gallery.rb

@@ -1,7 +1,6 @@
 module Quadro
   class Widget::Gallery < Widget
     # attributes
-    attr_accessible :content
     store :settings, accessors: [:width, :height]
 
     # associations

data/app/models/quadro/widget/html.rb

@@ -1,7 +1,6 @@
 module Quadro
   class Widget::Html < Widget
     # attributes
-    attr_accessible :content
     store :settings, accessors: [:width, :height]
 
     # methods

data/app/models/quadro/widget/slider.rb

@@ -1,7 +1,6 @@
 module Quadro
   class Widget::Slider < Widget
     # attributes
-    attr_accessible :content
     store :settings, accessors: [:width, :height]
 
     # associations

data/app/views/quadro/assets/image/_image.html.haml

@@ -6,5 +6,5 @@
 
         = link_to (widget.present? ? edit_page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : edit_page_asset_path(id: asset.id, page_id: page.id)), remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-pencil.text-muted
-        = link_to (widget.present? ? page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : page_asset_path(id: asset.id, page_id: page.id)), method: "delete", confirm: t('quadro.confirmation.image'), remote: true, class: "btn btn-link btn-xs" do
+        = link_to (widget.present? ? page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : page_asset_path(id: asset.id, page_id: page.id)), method: "delete", data: { confirm: t('quadro.confirmation.image') }, remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-trash-o.text-danger

data/app/views/quadro/assets/slide/_slide.html.haml

@@ -5,5 +5,5 @@
       .pull-right
         = link_to edit_page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-pencil.text-muted
-        = link_to page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), method: "delete", confirm: t('quadro.confirmation.slide'), remote: true, class: "btn btn-link btn-xs" do
+        = link_to page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), method: "delete", data: { confirm: t('quadro.confirmation.slide') }, remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-trash-o.text-danger

data/app/views/quadro/shared/_navigation.html.haml

@@ -8,9 +8,9 @@
       = link_to root_path, class: 'navbar-brand' do
         = Quadro.config.site
     #navigation.collapse.navbar-collapse
-      = navigation_for root, class: "nav navbar-nav navbar-right"
       - unless user_signed_in?
         %ul.nav.navbar-nav.navbar-right
           %li
             = link_to new_user_session_path, rel: "nofollow" do
-              = t('quadro.navigation.sign_in')
+              = t('navigation.sign_in')
+      = navigation_for root, class: "nav navbar-nav navbar-right"

data/app/views/quadro/shared/_toolbar.html.haml

@@ -14,7 +14,7 @@
       = link_to edit_page_path(page.slug), remote: true, id: "quadro-edit", class: "btn btn-default btn-sm" do
         %i.fa.fa-pencil
         %span.hidden-xs.hidden-sm= t('quadro.toolbar.edit')
-      = link_to page_path(page.slug), remote: true, method: "delete", confirm: t('quadro.confirmation.page'), id: "quadro-delete", class: "btn btn-default btn-sm" do
+      = link_to page_path(page.slug), remote: true, method: "delete", data: { confirm: t('quadro.confirmation.page') }, id: "quadro-delete", class: "btn btn-default btn-sm" do
         %i.fa.fa-trash-o.text-danger
         %span.hidden-xs.hidden-sm.text-danger= t('quadro.toolbar.delete')
       - unless page.is_root?
@@ -44,7 +44,7 @@
         %ul.dropdown-menu
           - unless Rails.env.development?
             %li
-              = link_to sitemap_notifier_path, remote: true do
+              = link_to ping_path, remote: true do
                 %i.fa.fa-sitemap
                 = t('quadro.toolbar.sitemap')
           %li

data/app/views/quadro/shared/templates/_demo.html.haml

@@ -21,3 +21,5 @@
   = widget_for :video, type: :video
 
   = render subpages
+
+  = paginate subpages

data/app/views/quadro/sitemaps/index.xml.builder

@@ -0,0 +1,18 @@
+xml.instruct! :xml, version: "1.0", encoding: "utf-8"
+xml.urlset xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do
+  xml.url do
+    xml.loc root_url
+    xml.lastmod l(root.updated_at, format: :sitemap, locale: :en)
+    xml.changefreq root.frequency
+    xml.priority root.priority
+  end
+
+  root.descendants.published.ordered.each do |page|
+    xml.url do
+      xml.loc page_url(page)
+      xml.lastmod l(page.updated_at, format: :sitemap, locale: :en)
+      xml.changefreq page.frequency
+      xml.priority page.priority
+    end
+  end
+end

data/config/initializers/simple_form.rb

@@ -5,8 +5,8 @@ SimpleForm.setup do |config|
   # wrapper, change the order or even add your own to the
   # stack. The options given below are used to wrap the
   # whole input.
-  config.wrappers :default, :class => :input,
-    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -18,13 +18,13 @@ SimpleForm.setup do |config|
     b.use :html5
 
     # Calculates placeholders automatically from I18n
-    # You can also pass a string as f.input :placeholder => "Placeholder"
+    # You can also pass a string as f.input placeholder: "Placeholder"
     b.use :placeholder
 
     ## Optional extensions
-    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
     # to the input. If so, they will retrieve the values from the model
-    # if any exists. If you want to enable the lookup for any of those
+    # if any exists. If you want to enable any of those
     # extensions by default, you can change `b.optional` to `b.use`.
 
     # Calculates maxlength from length validations for string inputs
@@ -41,8 +41,14 @@ SimpleForm.setup do |config|
 
     ## Inputs
     b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
   end
 
   # The default wrapper to be used by the FormBuilder.
@@ -50,8 +56,8 @@ SimpleForm.setup do |config|
 
   # Define the way to render check boxes / radio buttons with labels.
   # Defaults to :nested for bootstrap config.
-  #   :inline => input + label
-  #   :nested => label > input
+  #   inline: input + label
+  #   nested: label > input
   config.boolean_style = :nested
 
   # Default class for buttons
@@ -66,7 +72,7 @@ SimpleForm.setup do |config|
   config.error_notification_tag = :div
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
+  config.error_notification_class = 'error_notification'
 
   # ID to add for error notification helper.
   # config.error_notification_id = nil
@@ -84,21 +90,21 @@ SimpleForm.setup do |config|
   # config.collection_wrapper_class = nil
 
   # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to :span. Please note that when using :boolean_style = :nested,
-  # SimpleForm will force this option to be a label.
+  # defaulting to :span.
   # config.item_wrapper_tag = :span
 
   # You can define a class to use in all item wrappers. Defaulting to none.
   # config.item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required| "#{required} #{label}" }
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
+  # config.label_class = nil
 
-  # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :simple_form
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
 
   # You can define which elements should obtain additional classes
   # config.generate_additional_classes_for = [:wrapper, :label, :input]
@@ -106,9 +112,12 @@ SimpleForm.setup do |config|
   # Whether attributes are required by default (or not). Default is true.
   # config.required_by_default = true
 
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
-  config.browser_validations = true
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
 
   # Collection of methods to detect if a file type was given.
   # config.file_methods = [ :mounted_as, :file?, :public_filename ]
@@ -120,7 +129,11 @@ SimpleForm.setup do |config|
 
   # Custom wrappers for input types. This should be a hash containing an input
   # type as key and the wrapper that will be used for all inputs with specified type.
-  # config.wrapper_mappings = { :string => :prepend }
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
 
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil
@@ -128,9 +141,6 @@ SimpleForm.setup do |config|
   # Default priority for country inputs.
   # config.country_priority = nil
 
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
   # When false, do not use translations for labels.
   # config.translate_labels = true
 
@@ -139,4 +149,17 @@ SimpleForm.setup do |config|
 
   # Cache SimpleForm inputs discovery
   # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
 end