udongo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f653f73b0217efa872c2c95ba0783abc619759c7
-  data.tar.gz: 11a751bfb31b7bb8ad63e61deff0d68d9ad981c9
+  metadata.gz: a741be7e19b1fe104859632571d9df99fbd9e307
+  data.tar.gz: 475674d26ab25c95e1c548bdfe851142670a533c
 SHA512:
-  metadata.gz: 6fd818e7d16aed0a1577018f55f3fa5986480ee41498e7c8e752be3a3f3b4feff0cece1575c8968ec7f70e902658628b61aae95bf0b202b2b9934c3761152591
-  data.tar.gz: a7651642f1ad02aa54039ad91326a1d1913b8dedd50a95548f16f639a2a18c28064af4917f9fe1e08fe222d511cbc398ea44438c5e9352d8e0c6e7ca0ddf909c
+  metadata.gz: ddeb74872a714284c0a5a63fd2d8de7b36ba01fab7bb36d628a0a23b73a4bd5775b823febd31ed14b7064f1c9ee90fbd437e8eeac9d0b5d6917723561feef8db
+  data.tar.gz: ca5cc722453d9f9c1458ea823ca881cb866cf41e13615c938ca03239ed111c26dfbf3881698c62a0e6d11b50b9c4368c134b48de2fd7c336f87690f97a28f26c

data/app/assets/stylesheets/backend/application.scss

@@ -14,5 +14,5 @@
  */
 
 @import 'bootstrap';
-@import 'backend/bootstrap-datepicker.min';
+@import 'backend/bootstrap-datepicker.css';
 @import 'udongo';

data/app/controllers/backend/pages_controller.rb

@@ -41,9 +41,6 @@ class Backend::PagesController < BackendController
     render json: { moved: @model.set_position(params[:position], params[:parent_id]) }
   end
 
-  def edit_translation
-  end
-
   def destroy
     render json: { trashed: @model.destroy }
   end

data/app/controllers/backend/snippets_controller.rb

@@ -9,21 +9,28 @@ class Backend::SnippetsController < BackendController
   end
 
   def new
-    @model = ::Snippet.new
+    @form = Backend::SnippetForm.new
+    # @model = ::Snippet.new
   end
 
   def create
-    @model = ::Snippet.new allowed_params
+    @form = Backend::SnippetForm.new
 
-    if @model.save
-      redirect_to edit_translation_backend_snippet_path(@model, translation_locale: default_locale), notice: translate_notice(:added, :snippet)
+    if @form.save params[:snippet]
+      redirect_to edit_translation_backend_snippet_path(@form.snippet, translation_locale: default_locale), notice: translate_notice(:added, :snippet)
     else
       render :new
     end
   end
 
+  def edit
+    @form = Backend::SnippetForm.new(@model)
+  end
+
   def update
-    if @model.update_attributes(allowed_params)
+    @form = Backend::SnippetForm.new(@model)
+
+    if @form.save params[:snippet]
       redirect_to edit_backend_snippet_path(@model), notice: translate_notice(:edited, :snippet)
     else
       render :edit
@@ -42,8 +49,4 @@ class Backend::SnippetsController < BackendController
       translation: @model.translation(params[:translation_locale])
     )
   end
-
-  def allowed_params
-    params.require('snippet').permit(:identifier, :description)
-  end
 end

data/app/forms/backend/snippet_form.rb

@@ -0,0 +1,54 @@
+class Backend::SnippetForm
+  include ActiveModel::Model
+  include Virtus.model
+
+  attr_reader :snippet
+
+  attribute :identifier, String
+  attribute :description, String
+
+  validates :identifier, :description, presence: true
+  validate :unique_identifier
+
+  delegate :id, to: :snippet
+
+  def initialize(snippet = nil)
+    @snippet = snippet || ::Snippet.new
+    attributes.keys.each { |k| send("#{k}=", @snippet.send(k)) } if snippet
+  end
+
+  def self.model_name
+    ::Snippet.model_name
+  end
+
+  def persisted?
+    !@snippet.new_record?
+  end
+
+  def save(params)
+    attributes.keys.each { |k| send("#{k}=", params[k]) }
+
+    if valid?
+      save_snippet
+      true
+    else
+      false
+    end
+  end
+
+  private
+
+  def unique_identifier
+    qry = ::Snippet.unscoped
+    qry = qry.where.not(identifier: @snippet.identifier) if persisted?
+
+    if qry.exists?(identifier: identifier)
+      errors.add :identifier, I18n.t('errors.messages.taken')
+    end
+  end
+
+  def save_snippet
+    attributes.each { |k, v| @snippet.send("#{k}=", v) }
+    @snippet.save!
+  end
+end

data/app/models/comment.rb

@@ -1,9 +1,7 @@
 class Comment < ActiveRecord::Base
   include Concerns::Parentable
   include Concerns::Locale
-
   include Concerns::Spammable
-  spammable author_email: :email, content: :message
 
   STATUSES = %w(pending_moderation published)
 

data/app/models/concerns/spammable.rb

@@ -5,20 +5,12 @@ module Concerns
     extend ActiveSupport::Concern
 
     included do
-      include Rakismet::Model
-
       scope :spam, ->{ where(marked_as_spam: true) }
       scope :not_spam, -> { where('marked_as_spam = 0 OR marked_as_spam IS NULL') }
 
       after_initialize :spam_defaults
     end
 
-    module ClassMethods
-      def spammable(*args)
-        rakismet_attrs *args
-      end
-    end
-
     def mark_as_spam!
       update_attribute :marked_as_spam, true
     end

data/app/views/backend/snippets/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [:backend, @model] do |f| %>
+<%= simple_form_for [:backend, @form] do |f| %>
   <div class="row">
     <div class="col-md-6">
       <div class="card">

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/udongo.rb

@@ -15,7 +15,6 @@ require 'simple_form'
 require 'acts_as_list'
 require 'carrierwave'
 require 'reform'
-require 'rakismet'
 require 'draper'
 require 'ransack'
 require 'ckeditor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,20 +25,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.6
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -239,46 +225,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rakismet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: marked-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -439,6 +385,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.20
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -550,6 +510,7 @@ files:
 - app/forms/backend/email_template_translation_form.rb
 - app/forms/backend/navigation_item_translation_form.rb
 - app/forms/backend/page_translation_form.rb
+- app/forms/backend/snippet_form.rb
 - app/forms/backend/snippet_translation_form.rb
 - app/helpers/backend/dropdown_helper.rb
 - app/helpers/backend/pagination_helper.rb