tenon 1.1.8 → 2.0.0

data/lib/tenon/can_be_foreign.rb

@@ -6,7 +6,7 @@ module Tenon
 
     module ClassMethods
       def foreign_fields
-        Tenon::I18nFields[to_s.downcase.to_sym]
+        Tenon::I18nLookup.fields[to_s.downcase.to_sym]
       end
     end
   end

data/lib/tenon/engine.rb

@@ -1,45 +1,26 @@
-require 'font-awesome-rails'
-require 'awesome_nested_set'
-require 'bourbon'
-require 'neat'
-require 'cancan'
+require 'active_model_serializers'
+require 'client_side_validations'
 require 'cocoon'
-require 'coffee-rails'
-require 'daemons'
-require 'devise'
+require 'date_time_attribute'
 require 'draper'
-require 'dynamic_form'
-require 'eco'
-require 'gravatar_image_tag'
 require 'haml'
-require 'hpricot'
-require 'httparty'
-require 'humanizer'
-require 'jbuilder'
 require 'jquery-fileupload-rails'
 require 'jquery-rails'
-require 'jquery-ui-rails'
-require 'later_dude'
-require 'launchy'
-require 'lodash-rails'
-require 'mediaelement_rails'
-require 'medium-editor-rails'
 require 'mime-types'
-require 'nokogiri'
 require 'non-stupid-digest-assets'
-require 'normalize-rails'
 require 'paperclip'
-require 'rails-observers'
+require 'paperclip_processors/cropper'
+require 'pundit'
 require 'rails-settings-cached'
-require 'rdiscount'
-require 'resque/server'
-require 'sass-rails'
-require 'simple-rss'
-require 'uglifier'
+require 'react-rails'
 require 'uuidtools'
 require 'will_paginate'
-require 'yaml_db'
-require 'paperclip_processors/cropper'
+
+# Dummy app gems
+require 'humanizer'
+require 'awesome_nested_set'
+require 'gravatar_image_tag'
+require 'uglifier'
 
 module Tenon
   class Engine < ::Rails::Engine
@@ -48,8 +29,21 @@ module Tenon
       g.templates.unshift File.expand_path('../../templates', __FILE__)
     end
 
+    config.to_prepare do
+      ApplicationController.helper(Tenon::TenonHelper)
+      ApplicationController.helper(Tenon::BreadcrumbsHelper)
+    end
+
+    if Rails.env.test?
+      config.paths['app/views'] << "test/fixtures/views"
+    end
+
     initializer :assets do |config|
-      Rails.application.config.assets.precompile += ['tenon/tenon_manifest.js', 'tenon/tenon.css']
+      Rails.application.config.assets.precompile += [
+        'tenon/application.js',
+        'tenon/tenon_manifest.js',
+        'tenon/*.png'
+      ]
     end
   end
 end

data/lib/tenon/filterers/base_filterer.rb

@@ -0,0 +1,64 @@
+# Creates a base for building Tenon::<Model>Filterer classes.
+class Tenon::BaseFilterer
+  attr_reader :scope
+  attr_reader :params
+
+  def initialize(scope, params)
+    @scope = scope
+    @params = params
+  end
+
+  def filter
+    scope
+  end
+
+  private
+
+  def eq(field, value)
+    return scope unless value.present?
+    scope.where("#{field} IN (?)", value)
+  end
+
+  def ilike(field, value)
+    return scope unless value.present?
+    scope.where("#{field} ILIKE ?", "%#{value}%")
+  end
+
+  def lt(field, value)
+    return scope unless value.present?
+    scope.where("#{field} < ?", value)
+  end
+
+  def gt(field, value)
+    return scope unless value.present?
+    scope.where("#{field} > ?", value)
+  end
+
+  def lte(field, value)
+    return scope unless value.present?
+    scope.where("#{field} <= ?", value)
+  end
+
+  def gte(field, value)
+    return scope unless value.present?
+    scope.where("#{field} >= ?", value)
+  end
+
+  def order(field, direction)
+    direction ||= 'asc' # Do this manually in case nil is passed in
+    return scope unless field.in?(allowed_order_fields)
+    return scope unless direction.downcase.in?(['asc', 'desc'])
+    scope.order("#{field} #{direction}")
+  end
+
+  def reorder(field, direction)
+    direction ||= 'asc' # Do this manually in case nil is passed in
+    return scope unless field.in?(allowed_order_fields)
+    return scope unless direction.downcase.in?(['asc', 'desc'])
+    scope.reorder("#{field} #{direction}")
+  end
+
+  def allowed_order_fields
+    []
+  end
+end

data/lib/tenon/has_history/attr_serializer.rb

@@ -6,7 +6,7 @@ module Tenon
       end
 
       def initialize(attrs, item_version)
-        @attrs = attrs
+        @attrs = attrs || {}
         @item_version = item_version
         @item_class = item_version.item_type.constantize
         @item = @item_version.item
@@ -19,8 +19,8 @@ module Tenon
       private
 
       def filtered_attrs
-        @attrs.deep_reject_key!(:id)
-        @attrs.deep_reject_key!('id')
+        @attrs.to_h.deep_reject_key!(:id)
+        @attrs.to_h.deep_reject_key!('id')
         require_only_attrs! unless only.empty?
         remove_except_attrs! unless except.empty?
         remove_children!
@@ -28,15 +28,15 @@ module Tenon
       end
 
       def require_only_attrs!
-        @attrs = @attrs.select { |k, v| only.include?(k) }
+        @attrs = @attrs.select { |k, _| only.include?(k) }
       end
 
       def remove_except_attrs!
-        @attrs = @attrs.reject { |k, v| except.include?(k.to_sym) }
+        @attrs = @attrs.reject { |k, _| except.include?(k.to_sym) }
       end
 
       def remove_children!
-        @attrs = @attrs.reject do |k, v|
+        @attrs = @attrs.reject do |k, _|
           key = k.to_s
           relation = key.gsub(/_attributes$/, '')
           key.match(/_attributes$/) && !includes.include?(relation)

data/lib/tenon/proxy_attachment.rb

@@ -38,8 +38,8 @@ module Tenon
     end
 
     def named_url(style, *args)
-      if style.match(/^_.*/)
-        @attachment.url(style.to_s.gsub(/^_(.*)/, '\1'), *args)
+      if style.to_s.match(/^\_.*/)
+        @attachment.url(style.to_s.gsub(/^\_(.*)/, '\1'), *args)
       else
         @attachment.url("#{@style_prefix}_#{style}", *args)
       end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.1.8'
+  VERSION = '2.0.0'
 end

data/lib/tenon.rb

@@ -1,10 +1,9 @@
 require 'tenon/engine'
 require 'tenon/config/breakpoints.rb'
-require 'tenon/config/events.rb'
 require 'tenon/config/routing.rb'
 require 'tenon/config/grid.rb'
 require 'tenon/can_be_foreign.rb'
-require 'tenon/can_have_comments.rb'
+require 'tenon/filterers/base_filterer.rb'
 require 'tenon/has_asset.rb'
 require 'tenon/has_history.rb'
 require 'tenon/i18n_lookup.rb'
@@ -12,7 +11,6 @@ require 'tenon/proxy_attachment.rb'
 require 'tenon/asset_style_generator.rb'
 require 'tenon/reorderable.rb'
 require 'tenon/tenon_content.rb'
-require 'tenon/warning_generator.rb'
 
 module Tenon
   class << self

data/vendor/assets/javascripts/bootstrap.modal.js

@@ -243,4 +243,4 @@
     .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
-}(jQuery);
+}(jQuery);