dandify 0.0.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730fbffc3ec3adf78538bd7eb1b4230dedac95d2
-  data.tar.gz: 2bbdc174a33199b642b76acb2425d525c4384142
+  metadata.gz: 9988916c091150cb33eef88a2d266a68fda7b70e
+  data.tar.gz: af41fef4719e81b3a69425333cf64e0db326fa41
 SHA512:
-  metadata.gz: 37c676843579698efc0f98cac2623a4fd3bc0270d0e6bda298ea625670d55002f3495ccb490c851eec0f096ff645fd48d36c3733d556ddf2ecc4791f9289aa8c
-  data.tar.gz: ec7ae8bef9ccef09f630b5303d539dca25e60bbf8188b0837152900960afcc1f9c86264de6fd632daf184439aed6e3b4285828b12bfd44d5091b4ea947f0c581
+  metadata.gz: 2572fd2f9f9d52c4ef682a6f5e00aa45cce2f04de9fbbf7edf95a9ba80cf3d692da5b95237939c9a0831e9c6f81c6bcde5b3161be92b8c55694fa7196f42631b
+  data.tar.gz: 65f42e6a2fb2cf6f0760d70ca55bffd6d9243fe73ff0e4fe30a7bc9906dc615923d5cb72dfc62f491af04a7ef2d563255c72250a291409d73281767245b8fd71

data/README.md

@@ -1,25 +1,23 @@
 # Dandify
 
 [![Code Climate](https://codeclimate.com/github/groundctrl/dandify.png)](https://codeclimate.com/github/groundctrl/dandify)
+[![Build Status](https://travis-ci.org/groundctrl/dandify.svg?branch=master)](https://travis-ci.org/groundctrl/dandify)
 
 Dandify is not a theme. It is a theme helper that allows you to quickly apply versioned frontend style changes from the Spree admin. Dandify only works with stylesheets. Dandify is best used in conjunction with [Shopping Mall](https://github.com/groundctrl/shopping_mall).
 
+> More information at http://groundctrl.github.io/dandify
 
 ## Installation
 
 #### Gem
 
-Add this line to your Spree application's Gemfile:
+Add the following to your Gemfile:
 
-    gem 'dandify', github: 'groundctrl/dandify'
+    gem 'dandify', '~> 3.0.0'
 
-#### Bleeding edge
+If you are not on the lastest version of Spree you can specify a branch
 
-Add this line to your Spree application's Gemfile:
-
-    gem 'dandify', github: 'groundctrl/dandify', branch: 'master'
-
-> Note: The master branch is not guaranteed to be in a fully functioning state. It is unwise to use this branch in a production system.
+    gem 'dandify', github: 'groundctrl/dandify', branch: '2-4-stable'
 
 #### Generators
 
@@ -31,6 +29,7 @@ After installing Dandify you'll need to run the generator:
 
     bundle exec rails g dandify:install
 
+This will run migrations as well as install the styles for the admin.
 
 ## Testing
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require "spree/testing_support/extension_rake"
 
 RSpec::Core::RakeTask.new
 
@@ -11,5 +11,5 @@ task default: [:spec]
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'dandify'
-  Rake::Task['common:test_app'].invoke 'Spree::User'
+  Rake::Task['extension:test_app'].invoke 'Spree::User'
 end

data/app/assets/stylesheets/spree/backend/dandify.scss

@@ -0,0 +1,55 @@
+/* Icon rollover - Restore */
+
+.spree-ace-field {
+  position: relative;
+}
+#editor {
+  position: absolute;
+  top: 24px; right: 0; left: 0; bottom: 46px;
+}
+
+table th.actions,
+table td.actions {
+  .fa-history:hover {
+    background-color: #9fc820;
+    color: #ffffff;
+  }
+}
+
+table tbody tr {
+  &.highlight.action-restore td {
+    background-color: #f8fceb;
+    border-color: #e0f1a9;
+  }
+
+  &.before-highlight.action-restore td {
+    border-bottom-color: #e0f1a9;
+  }
+}
+
+/* PowerTip - Restore */
+#powerTip.restore {
+  background-color: #9fc820;
+
+  &.n:before,
+  &.ne:before,
+  &.nw:before {
+    border-top-color: #9fc820;
+  }
+
+  &.e:before,
+  &.nw:before,
+  &.sw:before {
+    border-right-color: #9fc820;
+  }
+
+  &.s:before,
+  &.se:before,
+  &.sw:before {
+    border-bottom-color: #9fc820;
+  }
+
+  &.w:before {
+    border-left-color: #9fc820;
+  }
+}

data/app/controllers/spree/admin/stylesheets_controller.rb

@@ -5,7 +5,7 @@ module Spree
 
       respond_to :html
 
-      before_action :set_style
+      before_action :set_style, except: [:restore]
 
       def create
         update_action :new
@@ -15,18 +15,31 @@ module Spree
         update_action :edit
       end
 
+      def destroy
+        @style.destroy
+
+        redirect_to admin_stylesheets_path, flash: {
+          success: Spree.t('dandify.admin.flash.destroyed')
+        }
+      end
+
       def restore
         response = rollback_version
 
         redirect_to admin_stylesheets_path, flash: {
-          response => Spree.t("dandify.restore.#{response}")
+          response => Spree.t("dandify.admin.flash.#{response}.restore")
         }
       end
 
+      def user_for_paper_trail
+        Spree::UserIdentifier.new(current_spree_user).id
+      end
+
       private
 
       def rollback_version
-        @style.versions.last.reify.save!
+        @style = PaperTrail::Version.find(params[:id]).reify
+        @style.save!
         :success
       rescue
         :error
@@ -35,7 +48,7 @@ module Spree
       def update_action(type)
         if @style.update(style_params)
           redirect_to admin_stylesheets_path, flash: {
-            success: Spree.t("dandify.#{type}.success")
+            success: Spree.t("dandify.admin.flash.success.#{type}")
           }
         else
           render type
@@ -49,10 +62,6 @@ module Spree
       def style_params
         params.require(:stylesheet).permit(:style_raw)
       end
-
-      def user_for_paper_trail
-        current_spree_user
-      end
     end
   end
 end

data/app/controllers/spree/stylesheets_controller.rb

@@ -8,8 +8,8 @@ module Spree
 
     private
 
-      def set_response_format
-        request.format = :css
-      end
+    def set_response_format
+      request.format = :css
+    end
   end
 end

data/app/helpers/spree/admin/navigation_helper_decorator.rb

@@ -1,9 +1,25 @@
 Spree::Admin::NavigationHelper.class_eval do
   def link_to_restore_url(url, options = {})
-    name = options[:name] || Spree.t('dandify.restore.name')
-    options[:class] = 'restore-resource'
-    options[:data] = { confirm: Spree.t('dandify.confirm.restore'),
-                       action:  'restore' }
+    name = options[:name] || Spree.t('dandify.admin.icons.restore')
+    options[:class] = 'restore-resource btn btn-sm btn-primary icon icon-clone'
+    options[:data] = { confirm: Spree.t('dandify.admin.confirm.restore'),
+                        action: 'restore' }
     link_to_with_icon('history', name, url, options)
   end
+
+  def link_to_destroy_url
+    options = {
+      class: 'btn btn-danger',
+      data: {
+        confirm: Spree.t('dandify.admin.confirm.destroy'),
+        action: 'delete'
+      },
+      method: :delete
+    }
+
+    link_to_with_icon 'delete',
+                      Spree.t('dandify.admin.icons.destroy'),
+                      admin_stylesheets_path,
+                      options
+  end
 end

data/app/helpers/spree/admin/stylesheet_helper.rb

@@ -1,8 +1,18 @@
 module Spree
   module Admin
     module StylesheetHelper
-      def dandify_version_email(user)
-        user.nil? ? Spree.t('dandify.unknown') : user.email
+      def dandify_version_email(user_id)
+        user = if user_id.nil? || user_id == Spree.t('dandify.admin.unknown')
+          UnknownUser.new
+        else
+          User.find(user_id)
+        end
+
+        user.email
+      end
+
+      def previous_versions
+        PaperTrail::Version.all
       end
     end
   end

data/app/models/spree/stylesheet_version.rb

@@ -1,5 +1,6 @@
 module Spree
   class StylesheetVersion < PaperTrail::Version
-    belongs_to :user, foreign_key: 'whodunnit'
+    belongs_to :user,
+               foreign_key: 'whodunnit'
   end
 end

data/app/models/spree/unknown_user.rb

@@ -0,0 +1,11 @@
+module Spree
+  class UnknownUser
+    def id
+      Spree.t('dandify.admin.unknown')
+    end
+
+    def email
+      Spree.t('dandify.admin.unknown')
+    end
+  end
+end

data/app/models/spree/user_decorator.rb

@@ -1,5 +1,5 @@
 Spree::User.class_eval do
   has_many :editions,
            foreign_key: 'whodunnit',
-           class_name: 'Spree::StylesheetVersion'
+           class_name:  'Spree::StylesheetVersion'
 end

data/app/models/spree/user_identifier.rb

@@ -0,0 +1,13 @@
+module Spree
+  class UserIdentifier
+    delegate :id, to: :user
+
+    def initialize(user)
+      @user = user || UnknownUser.new
+    end
+
+    private
+
+    attr_reader :user
+  end
+end

data/app/overrides/spree/admin/shared/{_configuration_menu → sub_menu/_configuration}/add_dandify_to_admin_configuration_sidebar.html.erb.deface

@@ -1,2 +1,2 @@
 <!-- insert_bottom '[data-hook="admin_configurations_sidebar_menu"], #admin_configurations_sidebar_menu[data-hook]' -->
-<%= configurations_sidebar_menu_item Spree.t('dandify.sidebar'), admin_stylesheets_path %>
+<%= configurations_sidebar_menu_item Spree.t('dandify.admin.sidebar'), admin_stylesheets_path %>

data/app/views/spree/admin/stylesheets/_form.html.erb

@@ -1,11 +1,33 @@
-<div data-hook="admin_style_form_fields" class="row">
-  <div class="alpha twelve columns">
-    <div data-hook="admin_stylesheet_form_style_raw" class="field">
-      <%= f.field_container :style_raw do %>
-        <%= f.label :style_raw, raw(Spree.t('dandify.form.label') + content_tag(:span, ' *', class: 'required')) %>
-        <%= f.text_area :style_raw, rows: '13', class: 'fullwidth style_raw' %>
-        <br/><span class="info"><%= Spree.t('dandify.form.notes.sass') %></span>
+<% content_for :head do %>
+  <%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js' %>
+  <%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/mode-css.js' %>
+<% end %>
+
+<div data-hook="admin_style_form_fields" class="col-md-12">
+  <div class="form-group 12-row">
+    <div data-hook="admin_stylesheet_form_style_raw" class="form-group field spree-ace-field">
+      <div id="editor"></div>
+      <%= f.field_container :style_raw, class: ['form-group'] do %>
+        <%= f.label :style_raw, Spree.t('dandify.admin.labels.style_raw') %>
+        <%= f.text_area :style_raw, rows: '13', class: 'form-control' %>
+        <br/><span class="help-block"><%= Spree.t('dandify.admin.notes.sass') %></span>
       <% end %>
     </div>
   </div>
 </div>
+
+<script>
+  (function() {
+    var cssEditor, stylesheetText = $("#stylesheet_style_raw");
+
+    $(function() {
+      cssEditor = ace.edit("editor");
+      cssEditor.getSession().setMode("ace/mode/css");
+      cssEditor.setValue(stylesheetText.text());
+    });
+
+    $('#new_stylesheet, .edit_stylesheet').submit(function(event) {
+      stylesheetText.text(cssEditor.getValue());
+    });
+  })();
+</script>

data/app/views/spree/admin/stylesheets/_versions.html.erb

@@ -1,30 +1,27 @@
-<table class="index responsive" id="listing_versions" data-hook="listing_style_versions">
-  <colgroup>
-     <col style="width: 22%;">
-     <col style="width: 60%;">
-     <col style="width: 10%;">
-     <col style="width: 8%;">
-  </colgroup>
+<h4>
+  <%= Spree.t('dandify.admin.headers.revisions') %>
+</h4>
+<table class="table" id="listing_versions" data-hook="listing_style_versions">
   <thead>
     <tr data-hook="stylesheets_show_index_headers">
-      <th><%= Spree.t('dandify.show.headers.created_at') %></th>
-      <th><%= Spree.t('dandify.show.headers.author') %></th>
-      <th><%= Spree.t('dandify.show.headers.action') %></th>
+      <th><%= Spree.t('dandify.admin.headers.on') %></th>
+      <th><%= Spree.t('dandify.admin.headers.author') %></th>
+      <th><%= Spree.t('dandify.admin.headers.action') %></th>
       <th data-hook="admin_stylesheets_show_header_actions" class="actions"></th>
     </tr>
   </thead>
   <tbody>
-  <% versions.reverse.each_with_index do |version, index| %>
+  <% versions.reverse.each_with_index do |version| %>
     <tr data-hook="admin_stylesheets_show_rows" class="<%= cycle('odd', 'even') %>">
-      <td class="align-center"><%= version.created_at.to_date %></td>
-      <td><%= link_to(dandify_version_email(version.user), admin_user_path(version.whodunnit.to_i)) %></td>
-      <td><%= version.event.capitalize %></td>
+      <td class="align-center">
+        <%= version.created_at.to_date %>
+      </td>
+      <td><%= link_to(dandify_version_email(version.whodunnit), admin_user_path(version.whodunnit.to_i)) %></td>
+      <td>
+        <%= Spree.t("dandify.admin.action.#{version.event}") %>
+      </td>
       <td class='actions align-center' data-hook="admin_stylesheets_show_row_actions">
-      <% if index == 0 %>
-        <%= link_to_edit_url edit_admin_stylesheets_path, title: 'admin_edit_stylesheet', no_text: true %>
-      <% elsif index == 1 %>
-        <%= link_to_restore_url restore_admin_stylesheets_path, title: 'admin_restore_stylesheet', no_text: true, method: :post %>
-      <% end %>
+        <%= link_to_restore_url restore_admin_stylesheets_path(id: version.id), title: 'admin_restore_stylesheet', no_text: true, method: :post %>
       </td>
     </tr>
   <% end %>

data/app/views/spree/admin/stylesheets/edit.html.erb

@@ -1,19 +1,18 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/sub_menu/configuration' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('dandify.edit.title') %>
+  <%= Spree.t('dandify.admin.title.edit') %>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: {target: @style} %>
 
 <%= form_for @style, url: admin_stylesheets_path do |f| %>
   <fieldset data-hook="edit_style">
-    <legend align="center"><%= Spree.t('dandify.form.fieldset') %></legend>
     <%= render partial: 'form', locals: {f: f} %>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'ok' %>
+      <%= button Spree.t('actions.update'), 'ok', 'submit', { class: 'btn-success' } %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_stylesheets_path, class: 'button' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_stylesheets_path, icon: 'remove' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/stylesheets/new.html.erb

@@ -1,19 +1,18 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/sub_menu/configuration' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('dandify.new.title') %>
+  <%= Spree.t('dandify.admin.title.new') %>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: {target: @style} %>
 
 <%= form_for @style, url: admin_stylesheets_path do |f| %>
   <fieldset data-hook="new_style">
-    <legend align="center"><%= Spree.t('dandify.form.fieldset') %></legend>
     <%= render partial: 'form', locals: {f: f} %>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.create'), 'ok' %>
+      <%= button Spree.t('actions.create'), 'ok', 'submit', { class: 'btn-success' } %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_stylesheets_path, class: 'button' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_stylesheets_path, icon: 'remove' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/stylesheets/show.html.erb

@@ -1,23 +1,37 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/sub_menu/configuration' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('dandify.show.title') %>
+  <%= Spree.t('dandify.admin.title.show') %>
 <% end %>
 
 <% content_for :page_actions do %>
-<li>
   <% if @style.persisted? %>
-    <%= button_link_to Spree.t('dandify.show.buttons.edit'), edit_admin_stylesheets_path, icon: 'edit', id: 'admin_edit_stylesheet_link' %>
+    <%= link_to_with_icon 'edit', Spree.t('dandify.admin.buttons.edit'), edit_admin_stylesheets_path, class: 'btn btn-success' %>
+    <%= link_to_destroy_url %>
   <% else %>
-    <%= button_link_to Spree.t('dandify.show.buttons.new'), new_admin_stylesheets_path, icon: 'plus', id: 'admin_new_stylesheet_link' %>
+    <%= link_to_with_icon 'plus', Spree.t('dandify.admin.buttons.new'), new_admin_stylesheets_path, class: 'btn btn-success' %>
   <% end %>
-</li>
+<% end %>
+
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/prism/0.0.1/prism.min.css' %>
+  <%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/prism/0.0.1/prism.min.js' %>
 <% end %>
 
 <p class="notice"><%= notice %></p>
 
 <% if @style.persisted? %>
-  <%= render partial: 'versions', locals: { versions: @style.versions } %>
+  <pre><code class="language-css"><%= @style.style_raw %></code></pre>
+
 <% else %>
-  <%= Spree.t('dandify.show.none') %>
+  <div class="no-objects-found">
+    <%= Spree.t('dandify.admin.no_resource_found') %>,
+    <%= link_to Spree.t('dandify.admin.create_one'), new_admin_stylesheets_path %>!
+  </div>
 <% end %>
+
+<div class="row">
+  <% if PaperTrail::Version.count > 1 %>
+    <%= render partial: 'versions', locals: { versions: previous_versions } %>
+  <% end %>
+</div>