tenon 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae1738be1ba3a5fd9e133bdd0ab21ff7aceafcc
-  data.tar.gz: 38e31b17de0dbef6d7eea5d008bde9359936834e
+  metadata.gz: 5d038aac13fadaa7aa5c313c3f6fae3a04b3dbe4
+  data.tar.gz: f6676fc0f4482456b33e0ef1c5f8f9aeaa89ff7f
 SHA512:
-  metadata.gz: 3c2fc53005195ed3c24e2e7dafb76e7e4e54548dfcad882ed496396ed1ce74dcab9942a3aa922dcaf7a5e3fedcd6a18c8da35765f771eb08082418ed89136dca
-  data.tar.gz: 50b2667b3f3d4e515373db2d2dc7b838232f41c056e06c41eaa44cdf1b3497f5ac2ffed10682617652525130368aea5c317d94654c18a16a2b73e19956d70076
+  metadata.gz: adbda739248022a53a9c728a062bbee68d970b50e8836b644b676b43ed38b54314dbdc744057e21ae32b3a5b225e53e181d39f9cb18e3e9be31d318066ccf6c4
+  data.tar.gz: b41cc35172c46ceaaa7c255f9120827128b9854c8462dd481f43723bcf78ff58e2d75e89f476e567f789b50cef008f43d6b3e46bcc677654f7c67db9dc273ddb

data/app/controllers/tenon/resources_controller.rb

@@ -1,5 +1,7 @@
 module Tenon
   class ResourcesController < BaseController
+    serialization_scope :view_context
+
     wrap_parameters format: [:json]
     respond_to :html, :json, :js
     after_action :verify_authorized
@@ -16,12 +18,19 @@ module Tenon
           self.collection = filterer.filter
           self.collection = collection.paginate(per_page: 50, page: params[:page])
           self.collection = Tenon::PaginatingDecorator.decorate(collection)
-          respond_with(
-            collection,
-            serializer: Tenon::PaginatingSerializer,
-            each_serializer: ActiveModel::Serializer.serializer_for(klass.new),
-            root: 'records'
-          )
+          render json: collection,
+                 each_serializer: serializer,
+                 root: 'records',
+                 adapter: :json,
+                 meta: {
+                  pagination: {
+                    current_page: collection.current_page,
+                    per_page: collection.per_page,
+                    offset: collection.offset,
+                    total_pages: collection.total_pages,
+                    total_entries: collection.total_entries
+                  }
+                }
         end
       end
     end
@@ -75,7 +84,7 @@ module Tenon
 
         format.json do
           if resource.valid?
-            render json: resource
+            render json: resource, root: 'record', adapter: :json
           else
             render status: 422, json: { errors: resource.errors }
           end
@@ -103,7 +112,7 @@ module Tenon
 
         format.json do
           if resource.valid?
-            render json: resource
+            render json: resource, root: 'record', adapter: :json
           else
             render status: 422, json: { errors: resource.errors }
           end
@@ -134,9 +143,8 @@ module Tenon
 
     private
 
-    # Serializer Setup Methods
-    def default_serializer_options
-      { root: 'record', scope: view_context }
+    def serializer
+      ActiveModel::Serializer.serializer_for(klass.new)
     end
 
     # Override these to execute code after resources are loaded

data/app/helpers/tenon/item_version_helper.rb

@@ -17,7 +17,7 @@ module Tenon
       css_class = 'draft'
       data = {
         'modal-remote' => true,
-        'modal-handler' => 'Tenon.features.NewItemVersionHandler',
+        'modal-handler' => 'NewItemVersionHandler',
         'modal-title' => 'Save Draft'
       }
       link_to path, class: css_class, data: data do
@@ -36,7 +36,7 @@ module Tenon
       data = {
         'modal-remote' => true,
         'modal-title' => 'Load Draft',
-        'modal-handler' => 'Tenon.features.ItemVersionIndexHandler'
+        'modal-handler' => 'ItemVersionIndexHandler'
       }
       link_to 'Load Draft', path, class: 'delete-link', data: data
     end

data/app/serializers/tenon/application_serializer.rb

@@ -16,7 +16,7 @@ module Tenon
       klass.to_s.underscore
     end
 
-    def attributes
+    def attributes(*args)
       super.merge(default_attributes)
     end
 
@@ -28,9 +28,9 @@ module Tenon
         title: object.title,
         to_param: object.to_param,
         resource_type: resource_type,
-        edit_path: scope.polymorphic_path([:edit, object]),
-        update_path: scope.polymorphic_path(object),
-        destroy_path: scope.polymorphic_path(object)
+        edit_path: view_context.polymorphic_path([:edit, object]),
+        update_path: view_context.polymorphic_path(object),
+        destroy_path: view_context.polymorphic_path(object)
       }
     end
   end

data/app/serializers/tenon/paginating_serializer.rb

@@ -1,7 +1,7 @@
 # Helpful serializer for including pagination meta
 # Source: http://stackoverflow.com/a/23002614/131208
 module Tenon
-  class PaginatingSerializer < ActiveModel::ArraySerializer
+  class PaginatingSerializer < ActiveModel::Serializer::CollectionSerializer
     def initialize(object, options = {})
       meta_key = options[:meta_key] || :meta
       options[meta_key] ||= {}

data/app/views/tenon/assets/index.html.haml

@@ -1,5 +1,6 @@
-= react_component 'ResourceIndexRoot',
+= react_component 'Tenon.RI.Root',
     title: 'Assets',
     breadcrumbs: breadcrumb_links,
     recordsPath: assets_path(format: 'json'),
-    newPath: new_asset_path
+    newPath: new_asset_path,
+    childComponentNames: { List: 'AssetList', Record: 'AssetRecord' }

data/app/views/tenon/shared/_breadcrumbs.html.haml

@@ -1 +1,2 @@
-= react_component 'Breadcrumbs', breadcrumbs: breadcrumb_links
+= react_component 'Tenon.reactComponents.Breadcrumbs',
+                  breadcrumbs: breadcrumb_links

data/app/views/tenon/tenon_content/piece_types/form/_background_image.html.haml

@@ -6,7 +6,7 @@
   - if f.object.image
     = backend_piece_image_tag(f.object)
   - else
-    = link_to(new_item_asset_path, class: 'add-image', data: {'modal-remote' => true, 'modal-title' => 'Select Image', 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment'}) do
+    = link_to(new_item_asset_path, class: 'add-image', data: {'modal-remote' => true, 'modal-title' => 'Select Image', 'modal-handler' => 'TenonContentAssetAttachment'}) do
       %span Add Image
 
   .medium-editor-toolbar.medium-toolbar-arrow-under.medium-editor-toolbar-active.image-controls{style: 'display: none; margin-top: -65px;'}
@@ -15,7 +15,7 @@
         %button{title: 'Crop', class: 'asset-crop medium-editor-action medium-editor-button-first', data: {'tooltip' => true, 'post-crop-handler' => 'Tenon.features.tenonContent.PostCropHandler', 'asset-id' => f.object.image_id}}
           %i.fa.fa-crop
       %li
-        %button{href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-action  medium-editor-button-last', data: {'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment', 'tooltip' => true}}
+        %button{href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-action  medium-editor-button-last', data: {'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'TenonContentAssetAttachment', 'tooltip' => true}}
           %i.fa.fa-picture-o
 
     .medium-editor-toolbar-form-anchor

data/app/views/tenon/tenon_content/piece_types/form/_embedded_content.html.haml

@@ -1,5 +1,5 @@
 .embedded-content
-  = link_to 'Edit Embed Code', '#', class: 'open-embed-modal', 'data-modal-target' => '.edit-embed-code', 'data-modal-title' => 'Edit Embed Code', 'data-modal-clone' => 'true', 'data-modal-handler' => 'Tenon.features.tenonContent.EmbeddedContentModalHandler'
+  = link_to 'Edit Embed Code', '#', class: 'open-embed-modal', 'data-modal-target' => '.edit-embed-code', 'data-modal-title' => 'Edit Embed Code', 'data-modal-clone' => 'true', 'data-modal-handler' => 'TenonContentEmbeddedContent'
   .embed= raw f.object.try(:embed_code)
 
 

data/app/views/tenon/tenon_content/piece_types/form/_image.html.haml

@@ -7,7 +7,7 @@
   - if f.object.image
     = backend_piece_image_tag(f.object)
   - else
-    = link_to(new_item_asset_path, class: 'tn-tc-fields__add-image', data: { 'modal-remote' => true, 'modal-title' => "Select Image", 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment' }) do
+    = link_to(new_item_asset_path, class: 'tn-tc-fields__add-image', data: { 'modal-remote' => true, 'modal-title' => "Select Image", 'modal-handler' => 'TenonContentAssetAttachment' }) do
       %span Add Image
 
   = f.super_text_area :caption, class: 'tn-tc-fields__caption', placeholder: 'Enter caption here...', data: { image_caption: true }, style: ("display: none;" unless f.object.show_caption)
@@ -50,7 +50,7 @@
         %button.add-link.medium-editor-toolbar__action{ title: 'Add Link', class: ('medium-editor-button-active' unless f.object.link_url.blank?), data: { tooltip: true } }
           %i.material-icon.material-icon--smaller-on-min link
       %li
-        %button{ href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-toolbar__action  medium-editor-button-last', data: { 'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment', 'tooltip' => true } }
+        %button{ href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-toolbar__action  medium-editor-button-last', data: { 'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'TenonContentAssetAttachment', 'tooltip' => true } }
           %i.material-icon.material-icon--smaller-on-min photo_library
 
     .medium-editor-toolbar-form-anchor

data/lib/tenon/engine.rb

@@ -3,6 +3,8 @@ require 'client_side_validations'
 require 'cocoon'
 require 'date_time_attribute'
 require 'draper'
+require 'factory_girl'
+require 'factory_girl_rails'
 require 'haml'
 require 'jquery-fileupload-rails'
 require 'jquery-rails'

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '2.0.8'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara-webkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +184,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.1.0
@@ -208,7 +194,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.1.0
@@ -218,14 +204,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: cocoon
   requirement: !ruby/object:Gem::Requirement