udongo 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8804f4bc7b8e851f44cccf95520180393c1edff7
-  data.tar.gz: 36301436a4b6eee426dd7515c33a7d1eaf03ae38
+  metadata.gz: f653f73b0217efa872c2c95ba0783abc619759c7
+  data.tar.gz: 11a751bfb31b7bb8ad63e61deff0d68d9ad981c9
 SHA512:
-  metadata.gz: 948078946e5c3c9cc5a00d9d9d04c81b40c14bd008653abf6b74f46739e7c2e07af9f23c46f1d0144d46a6a63ab93d42e46a79991a3bae4f04138f96a58a0760
-  data.tar.gz: c3d3e61d44fb48f3bf62dd8a8b6e487a171115f1e2e1d9d5deb26517531d1e856f3b8727fbdffbd57530bb4216c6f0dd9270004676a249ef0182cb87331bc442
+  metadata.gz: 6fd818e7d16aed0a1577018f55f3fa5986480ee41498e7c8e752be3a3f3b4feff0cece1575c8968ec7f70e902658628b61aae95bf0b202b2b9934c3761152591
+  data.tar.gz: a7651642f1ad02aa54039ad91326a1d1913b8dedd50a95548f16f639a2a18c28064af4917f9fe1e08fe222d511cbc398ea44438c5e9352d8e0c6e7ca0ddf909c

data/app/controllers/concerns/backend/content_type_controller.rb

@@ -25,7 +25,6 @@ module Concerns
         @model = model.find(params[:id]).decorate
       end
 
-      # TODO refactor?
       def content_path
         column = @model.column
         path = "edit_translation_backend_#{column.row.rowable.class.to_s.downcase}_path"

data/app/decorators/redirect_decorator.rb

@@ -8,6 +8,6 @@ class RedirectDecorator < Draper::Decorator
   end
 
   def summary
-    "#{I18n.t('b.from')} #{object.source_uri} #{I18n.t('b.to')} #{object.destination_uri}"
+    "#{I18n.t('b.from')} #{object.source_uri} #{I18n.t('b.to').downcase} #{object.destination_uri}"
   end
 end

data/app/forms/backend/page_translation_form.rb

@@ -13,5 +13,5 @@ class Backend::PageTranslationForm < Reform::Form
   property :seo_slug, on: :seo
 
   validates :title, presence: true
-  validates :seo_slug, presence: true # TODO only if necessary!
+  validates :seo_slug, presence: true
 end

data/app/models/concerns/cacheable.rb

@@ -7,19 +7,8 @@ module Concerns
       after_touch :flush_cache
 
       scope :find_in_cache, ->(value) {
-        Rails.cache.fetch([name, value]) do
-          o = find_by!(@cache_field => value)
-
-          # If the model is translatable, we want all the translation fields in
-          # every locale to be initialized. This way we avoid a separate query
-          # for each of the fields in the translation collection.
-          if o.respond_to?(:translatable?) && o.translatable?
-            Udongo.config.locales.each do |l|
-              name.constantize.translation_config.fields.each { |f| o.translation(l).send(f) }
-            end
-          end
-
-          o
+        Rails.cache.fetch [name, value]  do
+          find_by!(@cache_field => value)
         end
       }
     end

data/app/models/concerns/storable.rb

@@ -4,24 +4,32 @@ module Concerns
 
     included do
       has_many :stores, as: :storable, dependent: :destroy
-      after_save { store.save }
-    end
 
-    def store
-      @store_collection ||= Concerns::Storable::Collection.new(
-        self, self.class.store_config
-      )
+      after_save do
+        @store_collections.keys.each { |c| store(c).save } if @store_collections
+      end
     end
 
     def storable?
       true
     end
 
+    def store(collection = :default)
+      @store_collections = {} unless @store_collections
+
+      unless @store_collections[collection.to_sym]
+        @store_collections[collection.to_sym] = Concerns::Storable::Collection.new(
+          self, collection, self.class.store_config
+        )
+      end
+
+      @store_collections[collection.to_sym]
+    end
+
     module ClassMethods
-      def storable_field(name, klass, default = nil)
-        delegate name, to: :store
-        delegate "#{name}=", to: :store
-        store_config.add(name, klass, default)
+      def storable_field(name, type, default = nil)
+        delegate name, "#{name}=", to: :store
+        store_config.add name, type, default
       end
 
       def store_config

data/app/models/concerns/storable/collection.rb

@@ -1,116 +1,61 @@
 module Concerns
   module Storable
     class Collection
-      def initialize(parent, config)
+      def initialize(parent, category, config)
         @parent = parent
-        @config = config
-        @stores = {}
-      end
-
-      def method_missing(method_sym, *arguments, &block)
-        ascii_name = method_sym.to_s.gsub('=', '').to_sym
-
-        if @config.fields.keys.include?(ascii_name)
-          if method_sym.to_s.include?('=')
-            write(ascii_name, arguments.first)
-          else
-            read(method_sym)
-          end
-        else
-          super
-        end
-      end
-
-      def read(field)
-        field = field.to_sym
-        init_field(field.to_sym)
-        object = @stores[field]
-
-        unless object.value.nil?
-          return object.value if klasses_match(@config.fields[field][:klass], object.value)
-        end
-
-        object.value = Marshal.load(Marshal.dump(@config.fields[field][:default]))
-        object.value
-      end
-
-      def write(field, value)
-        field = field.to_sym
-        init_field(field)
-        value = transform_value(@config.fields[field][:klass], value)
+        @category = category
 
-        @stores[field].value = value
+        init_attributes(config)
+        init_values(config)
       end
 
       def save
-        @stores.map { |field,object| object.save }
-      end
-
-      private
-
-      def init_field(field)
-        unless @stores[field.to_sym]
-          raise "The field '#{field.to_s}' is not allowed." unless @config.allowed?(field)
-
-          @stores[field] = ::Store.find_or_create_by!(
+        attributes.each do |name,value|
+          tmp = ::Store.find_or_initialize_by(
+            collection: @category,
             storable_type: @parent.class.name,
             storable_id: @parent.id,
-            klass: @config.fields[field.to_sym][:klass],
-            name: field
+            name: name
           )
-        end
-      end
 
-      def klasses_match(klass, value)
-        Concerns::Storable::Config::KLASSES[klass].include? value.class
-      end
-
-      def transform_value(klass, value)
-        send("#{klass}_value", value)
+          tmp.value = value
+          tmp.save!
+        end
       end
 
-      def string_value(value)
-        value.to_s if value.is_a?(String) || value.is_a?(Symbol)
-      end
+      def delete
+        ::Store.where(
+          storable_type: @parent.class,
+          storable_id: @parent.id,
+          collection: @category,
+        ).each { |s| s.destroy }
 
-      def integer_value(value)
-        value if value.is_a?(Fixnum)
+        reset_values
       end
 
-      def float_value(value)
-        value if value.is_a?(Float)
-      end
+      private
 
-      def array_value(value)
-        value if value.is_a?(Array)
-      end
+      def init_attributes(config)
+        extend(Virtus.model)
 
-      def boolean_value(value)
-        if value === true || value == '1' || value == 1
-          true
-        elsif value === false || value == '0' || value == 0
-          false
+        config.fields.each do |field,options|
+          attribute field, options[:type], default: options[:default], lazy: true
         end
       end
 
-      def date_value(value)
-        return value if value.is_a?(Date)
-
-        begin
-          Date.parse(value)
-        rescue
-          nil
+      def init_values(config)
+        ::Store.where(
+          storable_type: @parent.class,
+          storable_id: @parent.id,
+          collection: @category,
+        ).pluck(:name, :value).each do |field, value|
+          send "#{field}=", value if config.allowed?(field)
         end
       end
 
-      def date_time_value(value)
-        return value if value.is_a?(DateTime)
-
-        begin
-          DateTime.parse(value)
-        rescue
-          nil
-        end
+      def reset_values
+        attributes.keys.each { |k| send("#{k}=", nil) }
+        true
       end
     end
   end

data/app/models/concerns/storable/config.rb

@@ -3,38 +3,17 @@ module Concerns
     class Config
       attr_reader :fields
 
-      KLASSES = {
-        array: [Array],
-        boolean: [TrueClass, FalseClass],
-        date: [Date],
-        date_time: [DateTime],
-        float: [Float],
-        integer: [Fixnum],
-        string: [String]
-      }
-
       def initialize
         @fields = {}
       end
 
-      def add(field, klass, default = nil)
-        raise "#{klass} is not a valid storable config klass" unless valid_klass?(klass)
-
-        @fields[field.to_sym] = {
-          klass: klass.to_sym,
-          default: default
-        }
+      def add(field, type, default = nil)
+        @fields[field.to_sym] = { type: type, default: default }
       end
 
       def allowed?(field)
         @fields.keys.include?(field.to_sym)
       end
-
-      private
-
-      def valid_klass?(value)
-        KLASSES.keys.include?(value.to_sym)
-      end
     end
   end
 end

data/app/models/concerns/translatable.rb

@@ -3,36 +3,48 @@
 module Concerns
   module Translatable
     extend ActiveSupport::Concern
+    include Concerns::Storable
 
     included do
       serialize :locales, Array
-      has_many :translations, as: :translatable, dependent: :destroy
-      scope :within_locale, ->(locale) { where('locales LIKE ?', "%#{locale}%")}
-    end
 
-    def translation(locale = I18n.locale)
-      @translation_collections = {} unless @translation_collections
-      @translation_collections[locale.to_sym] ||= Concerns::Translatable::Collection.new(
-        self, self.class.translation_config, locale
-      )
+      after_save do
+        locales = ::Store.where(
+          storable_type: self.class,
+          storable_id: self.id,
+          name: self.class.translatable_fields_list
+        ).pluck(:collection).uniq
+
+        update_column :locales, locales
+      end
+
+      scope :with_locale, ->(locale) { where('locales LIKE ?', "%#{locale}%")}
     end
 
     def translatable?
       true
     end
 
+    def translation(locale = I18n.locale)
+      store(locale)
+    end
+
     module ClassMethods
-      def translatable_field(name)
-        delegate name, to: :translation
-        translation_config.add(name)
+      def translatable_field(name, type = String, default = nil)
+        delegate name, "#{name}=", to: :translation
+        self.store_config.add name, type, default
+
+        unless translatable_fields_list.include?(name.to_sym)
+          translatable_fields_list << name.to_sym
+        end
       end
 
       def translatable_fields(*args)
         args.each { |name| translatable_field(name) }
       end
 
-      def translation_config
-        @translation_config ||= Concerns::Translatable::Config.new
+      def translatable_fields_list
+        @translatable_fields_list ||= []
       end
     end
   end

data/app/models/form_submission.rb

@@ -5,7 +5,6 @@ class FormSubmission < ActiveRecord::Base
   has_many :data, foreign_key: :submission_id, class_name: 'FormSubmissionData'
 
   validates :form, presence: true
-  # TODO: belongs_to :visitor
 
   def data_object
     data.inject(OpenStruct.new) do |stack, d|

data/app/models/store.rb

@@ -3,8 +3,8 @@ class Store < ActiveRecord::Base
 
   serialize :value
 
-  validates :name, :klass, presence: true
+  validates :collection, :name, presence: true
   validates :name,
             uniqueness: { case_sensitive: false,
-                          scope: [:storable_type, :storable_id] }
+                          scope: [:collection, :storable_type, :storable_id] }
 end

data/config/locales/en_backend.yml

@@ -0,0 +1,106 @@
+en:
+  b:
+    actions: Actions
+    add: Add
+    admins: Admins
+    advanced: Advanced
+    cancel: Cancel
+    content: Content
+    current_image: Current image
+    custom_title: Custom title
+    custom_url: Custom URL
+    delete: Delete
+    description: Description
+    destination: Destination
+    down: Down
+    edit: Edit
+    email: E-mail
+    emails: E-mails
+    email_template: E-mail template
+    email_templates: E-mail templates
+    enabled?: Enabled?
+    extra: Extra
+    first_name: First name
+    flexible_content: Flexible content
+    forms: Forms
+    from: From
+    general: General
+    html_content: HTML content
+    last_name: Last name
+    locale: Locale
+    login: Login
+    logout: Logout
+    move: Move
+    name: Name
+    navigation: Navigation
+    new: New
+    none: None
+    not_yet_sent: Not yet sent
+    page: Page
+    pages: Pages
+    password: Password
+    plain_content: Plain content
+    recipient: Recipient
+    redirect: Redirect
+    redirects: Redirects
+    restart_webserver: Restart webserver
+    save: Save
+    search: Search
+    sender: Sender
+    sent_at: Sent at
+    settings: Settings
+    snippet: Snippet
+    snippets: Snippets
+    source: Source
+    status: Status
+    status_code: Status code
+    subject: Subject
+    tags: Tags
+    title: Title
+    to: To
+    up: Up
+    used: Used
+    variables: Variables
+    view: View
+
+    msg:
+      added: '%s was added.'
+      admins:
+        account_details: Account details
+        added: The admin was added.
+        deleted: The admin was deleted.
+        personal_details: Personal details
+      changes_saved: The changes have been saved.
+      confirm: Are you sure?
+      content_types:
+        image: Image
+        text: Text
+      deleted: '%s was deleted.'
+      edited: '%s was edited.'
+      flexible_content:
+        add_column: Add column
+        add_row: Add row
+        add_text: Add text
+        delete_row: Delete row
+        edit_column: Edit column
+        edit_image: Edit image
+        edit_text: Edit text
+        explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
+      forgot_password: Forgot password?
+      help_texts:
+        status_code: More info about the use of status codes.
+      incorrect_login: Incorret login credentials.
+      navigation:
+        added: The navigation item was added.
+        custom: Custom
+        deleted: The navigation item was deleted.
+      no_items: There are no items.
+
+      saved: '%s was saved.'
+      seo: SEO
+      status_codes:
+        '301': 301 (Moved Permanently)
+        '303': 303 (See Other)
+        '307': 307 (Temporary Redirect)
+      webserver:
+        restarted: The webserver was restarted.

data/config/locales/en_forms.yml

@@ -0,0 +1,68 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: 'Please check the errors below:'
+
+    labels:
+      defaults:
+        caption: Caption
+        category: Category
+        content: Content
+        description: Description
+        disabled: Disabled
+        email: E-mail
+        extra: Extra
+        first_name: First name
+        html_content: HTML content
+        identifier: Internal name
+        label: Label
+        last_name: Last name
+        message: Message
+        name: Name
+        password: Password
+        password_confirmation: Password confirmation
+        phone: Phone
+        plain_content: Plain content
+        seo_title: Page title
+        seo_slug: Custom URL
+        seo_description: Description
+        seo_keywords: Keywords
+        seo_custom: Extra meta-tags
+        subject: Subject
+        subtitle: Subtitle
+        summary: Summary
+        title: Title
+        visible: Visible?
+        width: Width
+        url: URL
+
+      content_column:
+        content_type: Type
+        width_xs: Width (extra small)
+        width_sm: Width (small)
+        width_md: Width (medium)
+        width_lg: Width (large)
+        width_xl: Width (extra large)
+
+      email_template:
+        from_email: Sender e-mail address
+        from_name: Sender name
+
+      navigation_item:
+        page_id: Page
+        path: URL
+
+      page:
+        parent_id: Parent page
+
+      redirect:
+        destination_uri: Destination
+        source_uri: Source

data/db/migrate/20160601111729_add_collection_to_store.rb

@@ -0,0 +1,6 @@
+class AddCollectionToStore < ActiveRecord::Migration
+  def change
+    add_column :stores, :collection, :string, after: 'storable_id'
+    add_index :stores, :collection
+  end
+end

data/db/migrate/20160601115312_remove_klass_from_stores.rb

@@ -0,0 +1,6 @@
+class RemoveKlassFromStores < ActiveRecord::Migration
+  def change
+    remove_column :stores, :klass
+    add_index :stores, [:collection, :storable_id, :storable_type], name: 'idx_storable'
+  end
+end

data/db/migrate/20160601200049_remove_translation_model.rb

@@ -0,0 +1,5 @@
+class RemoveTranslationModel < ActiveRecord::Migration
+  def change
+    drop_table :translations
+  end
+end

data/lib/generators/udongo/form/form_generator.rb

@@ -28,7 +28,6 @@ class Udongo::FormGenerator < Rails::Generators::Base
 
     @fields.each do |field|
       field_object = f.fields.create!(locales: Udongo.config.locales, name: field.name, field_type: field.type)
-      # TODO: validations
       #field_object.validations.create!(locales: Udongo.config.locales, validation_class: 'Udongo::FormValidations::Required')
     end
 

data/lib/udongo.rb

@@ -1,4 +1,3 @@
-# TODO: Find a proper solution to autorequire (udongo) classes
 require 'udongo/engine'
 require 'udongo/config'
 require 'udongo/breadcrumb'
@@ -22,6 +21,7 @@ require 'ransack'
 require 'ckeditor'
 require 'responders'
 require 'will_paginate'
+require 'virtus'
 
 module Udongo
   PATH = File.expand_path('../../', __FILE__)

data/lib/udongo/object_path.rb

@@ -1,6 +1,4 @@
 class Udongo::ObjectPath
-  # TODO it would be better if this always expects an array, that way this could
-  # be rewritten a lot cleaner.
   def self.find(object)
     unless object.is_a?(Array)
       return cleanup("#{object.class.name.underscore}_path")

data/lib/udongo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -419,6 +419,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -567,8 +587,6 @@ files:
 - app/models/concerns/storable/config.rb
 - app/models/concerns/taggable.rb
 - app/models/concerns/translatable.rb
-- app/models/concerns/translatable/collection.rb
-- app/models/concerns/translatable/config.rb
 - app/models/concerns/visible.rb
 - app/models/content_column.rb
 - app/models/content_image.rb
@@ -594,7 +612,6 @@ files:
 - app/models/store.rb
 - app/models/tag.rb
 - app/models/tagged_item.rb
-- app/models/translation.rb
 - app/uploaders/ckeditor_attachment_file_uploader.rb
 - app/uploaders/ckeditor_picture_uploader.rb
 - app/uploaders/content_image_uploader.rb
@@ -663,6 +680,8 @@ files:
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/en_backend.yml
+- config/locales/en_forms.yml
 - config/locales/fr.yml
 - config/locales/nl.yml
 - config/locales/nl_backend.yml
@@ -725,6 +744,9 @@ files:
 - db/migrate/20160205132009_reoraganize_snippet_html_fields.rb
 - db/migrate/20160303141417_add_data_to_logs.rb
 - db/migrate/20160513110925_addd_more_column_widths.rb
+- db/migrate/20160601111729_add_collection_to_store.rb
+- db/migrate/20160601115312_remove_klass_from_stores.rb
+- db/migrate/20160601200049_remove_translation_model.rb
 - lib/generators/udongo/form/form_generator.rb
 - lib/generators/udongo/form/templates/form.rb
 - lib/tasks/task_extras.rb

data/app/models/concerns/translatable/collection.rb

@@ -1,60 +0,0 @@
-module Concerns
-  module Translatable
-    class Collection
-      def initialize(parent, config, locale)
-        @parent = parent
-        @config = config
-        @locale = locale
-        @translations = {}
-      end
-
-      def method_missing(method_sym, *arguments, &block)
-        ascii_name = method_sym.to_s.gsub('=', '').to_sym
-
-        if @config.fields.include?(ascii_name)
-          if method_sym.to_s.include?('=')
-            write(ascii_name, arguments.first)
-          else
-            read(method_sym)
-          end
-        else
-          super
-        end
-      end
-
-      def read(field)
-        init_field(field.to_sym)
-        @translations[field.to_sym].value
-      end
-
-      def write(field, value)
-        init_field(field.to_sym)
-        @translations[field.to_sym].value = value
-      end
-
-      def save
-        @translations.map { |field,object| object.save }
-
-        @parent.update_attribute(
-          :locales,
-          @parent.translations.where.not(value: nil).pluck(:locale).uniq.sort
-        )
-      end
-
-      private
-
-      def init_field(field)
-        unless @translations[field.to_sym]
-          raise "The field '#{field.to_s}' is not allowed." unless @config.allowed?(field)
-
-          @translations[field] = Translation.find_or_create_by!(
-            translatable_type: @parent.class.name,
-            translatable_id: @parent.id,
-            locale: @locale,
-            name: field
-          )
-        end
-      end
-    end
-  end
-end

data/app/models/concerns/translatable/config.rb

@@ -1,19 +0,0 @@
-module Concerns
-  module Translatable
-    class Config
-      attr_reader :fields
-
-      def initialize
-        @fields = []
-      end
-
-      def add(field)
-        @fields << field.to_sym unless @fields.include?(field.to_sym)
-      end
-
-      def allowed?(field)
-        @fields.include?(field.to_sym)
-      end
-    end
-  end
-end

data/app/models/translation.rb

@@ -1,10 +0,0 @@
-class Translation < ActiveRecord::Base
-  include Concerns::Locale
-
-  belongs_to :translatable, polymorphic: true, touch: true
-
-  validates :locale, :name, presence: true
-  validates :name,
-            uniqueness: { case_sensitive: false,
-                          scope: [:translatable_type, :translatable_id, :locale] }
-end