slices 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4968b6bc81c708989828fcbc0eb40ec6675c82
-  data.tar.gz: 0d8ff3c4a2bd832371719d01cd949eb66f20f2ce
+  metadata.gz: f7f84f08cfcea6705c4e9eb9cf65a7b1c2bd5335
+  data.tar.gz: 6aae0d719917c901b85cfc564b2a3abfaa23b16e
 SHA512:
-  metadata.gz: 1cad25d7585e79096c3751e1a75f0aa143810288541ce2856254d648c3a1f759a075c8fa224c5ea60c5f512e21b15951a870498061f1ecad8561c87afd790dde
-  data.tar.gz: cc79cd57e8a0998b978ca0ea22ea9c5a66ba8d62ec34c913325f43981fad32ecca9db6df366e877aff6ea45db650a2b4c87cb840130725b9cc04951c13275934
+  metadata.gz: e9f168301ebfcf8f5aa7e411b44017b7e48c7141c01b0d428f3195157e5a2aeee7f1386bf54cc13881393bebf62098f9e556dfeb2c6c72e4c0df763a82e789ca
+  data.tar.gz: 92ed514b8243831cb27b8386a793b479687b4577354b712b9d3f3580d54cc0713d9786cc2b7b9c25c6eb5aa86a07d67b34b87531402ac3ced856e080c376f346

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.4 / 2014-06-06
+
+* Remove omniauth
+
 # 1.0.3 / 2014-03-12
 
 * Put Page#as_json into its own module so it can be overridden in other modules

data/app/assets/javascripts/slices/app/backbones/entries.js

@@ -84,16 +84,12 @@ var EntriesBackbone = $.extend(true, {}, GenericBackbone, {
                      value();
 
       fields = _.map(fields, function(key) {
-        var string;
-        if (key == 'name') {
-          string = "<td class='"+key+"'><a href='<%= url %>'><%= "+key+" %></a></td>"
-        } else if ( key != 'url' ) {
-          string = "<td class='"+key+"'><%= "+key+" %></td>";
-        }
-        return string;
+        return slices.entryTemplate(key);
       });
+
       fields.push("<td><a href='#' class='delete'>Delete</a></td>");
-      var template = _.template(fields.join(''));
+
+      var template = Handlebars.compile(fields.join(''));
       this.view_prototype = this.view_prototype.extend({template: template});
       this.collection.unbind('reset', this.set_view_template);
     },

data/app/assets/javascripts/slices/app/helpers/assets.js

@@ -2,9 +2,16 @@
 //
 // Within the attachmentComposer, define the html for the fields the composer
 // should display. Here, we’re assuming there’s a field on the slice called
-// `myAttachments`.
+// `slides`.
 //
-//     {{#attachmentComposer myAttachments}}
+//     {{#attachmentComposer field="slides"}}
+//       <textarea name="caption" class="full-height">{{caption}}</textarea>
+//     {{/attachmentComposer}}
+//
+// By default, attachment composer does not allow the same asset to be added
+// twice. To allow duplicates, set the `allowDupes` option to true:
+//
+//     {{#attachmentComposer field="slides" allowDupes=true}}
 //       <textarea name="caption" class="full-height">{{caption}}</textarea>
 //     {{/attachmentComposer}}
 //
@@ -23,7 +30,8 @@ Handlebars.registerHelper('attachmentComposer', function(options) {
     id         : slices.fieldId(this, options.hash.field),
     collection : this[options.hash.field],
     fields     : options.fn,
-    autoAttach : true
+    autoAttach : true,
+    allowDupes : options.hash.allowDupes
   });
 
   // Return the placeholder. Don’t worry, this is replaced automatically later.

data/app/assets/javascripts/slices/app/helpers/entries.js

@@ -0,0 +1,41 @@
+slices.ENTRY_TEMPLATES = {
+  name: function(key) {
+    return '<td class="name"><a href="{{url}}">{{name}}</a></td>';
+  },
+
+  url: function(key) {
+    return null;
+  },
+
+  _default: function(key) {
+    return '<td class="{{' + key + '}}">{{' + key + '}}</td>';
+  }
+};
+
+
+/*
+ * Registers an entry template function for the given key.
+ * The function takes `key` and should return a string.
+ * Template compilation happens elsewhere.
+ *
+ * @param {String} key
+ * @param {Function} fun
+ */
+
+slices.registerEntryTemplate = function(key, fun) {
+  slices.ENTRY_TEMPLATES[key] = fun;
+}
+
+/*
+ * Returns the entry template for the given key.
+ *
+ * If not special templates are registered, the default
+ * template is returned.
+ *
+ * @return {String}
+ */
+
+slices.entryTemplate = function(key) {
+  var fun = slices.ENTRY_TEMPLATES[key] || slices.ENTRY_TEMPLATES['_default'];
+  return fun(key);
+}

data/app/assets/javascripts/slices/app/helpers/hooks.js

@@ -0,0 +1,24 @@
+slices.HOOKS = {};
+
+/*
+ * Register a slices hook function.
+ *
+ * @param {String} key
+ * @param {Function} fun
+ */
+
+slices.on = function(key, fun) {
+  slices.HOOKS[key] = slices.HOOKS[key] || [];
+  slices.HOOKS[key].push(fun);
+};
+
+/*
+ * Trigger hooks for key.
+ *
+ * @param {String} key
+ */
+
+slices.trigger = function(key) {
+  var hooks = slices.HOOKS[key];
+  if (hooks) _.invoke(hooks, 'call');
+};

data/app/assets/javascripts/slices/app/helpers/moment.js

@@ -0,0 +1,10 @@
+Handlebars.registerHelper('moment', function(date, options) {
+  var m = moment(date);
+  var format = options.hash.format;
+
+  if (format && format !== 'calendar') {
+    return m.format(format);
+  } else {
+    return m.calendar();
+  }
+});

data/app/assets/javascripts/slices/app/views/attachment_composer_view.js

@@ -302,7 +302,7 @@ slices.AttachmentComposerView = Backbone.View.extend({
         position = p ? p.index : this.collection.length;
 
     _.each(assets, function(asset) {
-      if (this.alreadyContains(asset)) return;
+      if (!this.options.allowDupes && this.alreadyContains(asset)) return;
       this.collection.add({ asset: asset, asset_id: asset.get('id') }, { at: position });
       position += 1;
     }, this);

data/app/assets/stylesheets/slices/admin.css.erb

@@ -122,6 +122,9 @@ textarea,
 button {
   -webkit-appearance: none
 }
+button {
+  outline: none;
+}
 
 /* Master button styles*/
 input[type="submit"],
@@ -169,7 +172,8 @@ Submit Button
 */
 
 button[type="submit"],
-input[type="submit"] {
+input[type="submit"],
+.button.submit {
   background-color: hsl(107, 40%, 46%);
   background: -webkit-linear-gradient(
     hsl(106, 42%, 57%) 17%,
@@ -375,16 +379,16 @@ header ul li a {
 header nav {
   -webkit-font-smoothing: antialiased;
 }
-header nav ul li:first-child a {
+#admin-nav-sitemaps a {
   background-image: url(<%= asset_path('slices/icon_sitemap.png') %>)
 }
-header nav ul li:nth-child(2) a {
+#admin-nav-assets a {
   background-image: url(<%= asset_path('slices/icon_assets.png') %>)
 }
-header nav ul li:nth-child(3) a {
+#admin-nav-snippets a {
   background-image: url(<%= asset_path('slices/icon_snippets.png') %>)
 }
-header nav ul li#admin-nav-administrators a {
+#admin-nav-administrators a {
   background-image: url(<%= asset_path('slices/icon_admins.png') %>)
 }
 header ul li:first-child {
@@ -446,7 +450,8 @@ header ul li,
   margin-left: 7px
 }
 .toolbar .actions a,
-.toolbar .actions input {
+.toolbar .actions input,
+.toolbar .actions button {
   position: relative;
   top: 8px;
   padding-top: 5px;
@@ -2235,3 +2240,13 @@ Date Field
 .composer .ui-sortable-helper [data-action="remove"] {
   display: none;
 }
+
+.page-history {
+  color: #888;
+}
+  .page-history li {
+    margin: 0 0 .5em 0;
+  }
+  .page-history time {
+    font-weight: normal;
+  }

data/app/controllers/admin/pages_controller.rb

@@ -17,8 +17,10 @@ class Admin::PagesController < Admin::AdminController
   end
 
   def create
-    @page = new_page_class.make(params[:page])
+    page_attrs = params[:page].merge(author: current_admin)
+    @page = new_page_class.make(page_attrs)
     @layouts = [['Default', 'default']]
+
     respond_with(:admin, @page) do |format|
       format.html { redirect_to admin_page_path(@page) }
     end

data/app/models/admin.rb

@@ -31,11 +31,6 @@ class Admin
 
   devise :database_authenticatable, :recoverable, :rememberable,
     :trackable, :validatable
-  devise :omniauthable, omniauth_providers: [:google_apps]
-
-  def self.find_for_google_apps(email)
-    where(email: email).first || where(email: /@#{Slices::Config.google_apps_domain}$/).first
-  end
 
   def super?
     self.super_user == true

data/app/models/page.rb

@@ -8,6 +8,8 @@ class Page
   include Slices::HasSlices
   include Slices::HasAttachments::PageInstanceMethods
 
+  DESCRIPTION_DEPRECATION_WARNING = "Page#description is now meta_description. If you are upgrading, run 'rake slices:migrate:meta_description' to update."
+
   field :name
   field :role  # only relevant for virtual pages
   field :active, type: Boolean, default: false
@@ -16,6 +18,8 @@ class Page
   field :title
   field :has_content, type: Boolean, default: false
 
+  belongs_to :author, class_name: 'Admin'
+
   index :_keywords, background: true
 
   has_slices :slices
@@ -164,12 +168,12 @@ class Page
   # End of added
 
   def description
-    ActiveSupport::Deprecation::warn "Page#description is now meta_description. If you are upgrading, run 'rake slices:migrate:meta_description' to update."
+    ActiveSupport::Deprecation::warn DESCRIPTION_DEPRECATION_WARNING
     meta_description
   end
 
   def description=(value)
-    ActiveSupport::Deprecation::warn "Page#description is now meta_description.  If you are upgrading, run 'rake slices:migrate:meta_description' to update."
+    ActiveSupport::Deprecation::warn DESCRIPTION_DEPRECATION_WARNING
     self.meta_description = value
   end
 

data/app/views/admin/auth/sessions/_form.html.erb

@@ -25,13 +25,3 @@
 
 </div>
 
-<% if Slices::Config.google_apps_domain %>
-  <% content_for :js_head do %>
-    $(document).bind("keydown", function(e) {
-      if(e.keyCode == 187) {
-        window.location = "<%= admin_omniauth_authorize_path(:google_apps) %>";
-      }
-    });
-  <% end %>
-<% end %>
-

data/app/views/admin/entries/index.html.erb

@@ -26,7 +26,9 @@
   </section>
 </div>
 <% content_for :js_head do %>
-$(function() {
   EntriesBackbone.boot('<%= @page.id %>', <%= raw @options.to_json %>);
-});
+  slices.trigger('entries:index');
+  <% @page.entry_types.each do |entry_type| %>
+    slices.trigger('entries:index:<%= entry_type %>');
+  <% end %>
 <% end %>

data/app/views/admin/pages/show.html.erb

@@ -46,5 +46,6 @@
 
 <% content_for :js_head do %>
   <%= render "slices" %>
+  slices.trigger('pages:show');
 <% end %>
 

data/app/views/layouts/admin.html.erb

@@ -12,7 +12,7 @@
 
   <meta name="robots" content="noindex, nofollow">
   <script type="text/javascript">
-    $(document).ready(function() {
+    $(function() {
       <%= yield :js_head %>
     });
   </script>

data/config/initializers/devise.rb

@@ -1,11 +1,7 @@
 require 'devise/orm/mongoid'
-require 'omniauth-google-apps'
 
 ActiveSupport::SecureRandom = SecureRandom
 
 Devise.setup do |config|
   config.mailer_sender = "hello@example.com"
-  if Slices::Config.google_apps_domain
-    config.omniauth :google_apps, domain: Slices::Config.google_apps_domain
-  end
 end

data/config/initializers/locales.rb

@@ -0,0 +1 @@
+I18n.enforce_available_locales = false

data/config/routes.rb

@@ -9,7 +9,6 @@ Rails.application.routes.draw do
   devise_for :admin, :path => "admin", :controllers => {
     :passwords          => "admin/auth/passwords",
     :sessions           => "admin/auth/sessions",
-    :omniauth_callbacks => "admin/auth/omniauth_callbacks",
   }
 
   namespace :admin do

data/lib/generators/slices/templates/application.html.erb

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
   <head>
-    <title><%= @page.title %></title>
+    <title><%= @page.name %></title>
     <meta name="description" content="<%= @page.meta_description %>">
     <%= stylesheet_link_tag *%w[
       application

data/lib/slices/page_as_json.rb

@@ -8,7 +8,8 @@ module Slices
         id:        id,
         permalink: permalink,
         slices:    ordered_slices_for(options[:slice_embed]).map {|slice| slice.as_json },
-        available_layouts: available_layouts
+        available_layouts: available_layouts,
+        author: author
       )
 
       keys = options[:only]

data/lib/slices/version.rb

@@ -1,4 +1,4 @@
 module Slices
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end
 

data/public/slices/templates/page_meta.hbs

@@ -41,3 +41,9 @@
   </ul>
 </li>
 
+<li>
+  <label>History</label>
+  <ul class="page-history">
+    <li>Created {{#if author}}by {{author.name}} {{/if}}<time datetime="{{created_at}}">{{moment created_at}}</time></li>
+  </ul>
+</li>

metadata

@@ -1,195 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: slices
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - With Associates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: mongoid-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
-- !ruby/object:Gem::Dependency
-  name: omniauth-google-apps
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
@@ -213,8 +199,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- README.md
 - app/assets/images/slices/ajax-loader.gif
 - app/assets/images/slices/asset-background.png
 - app/assets/images/slices/asset-spinner.gif
@@ -260,9 +244,12 @@ files:
 - app/assets/javascripts/slices/app/helpers/breadcrumbs.js
 - app/assets/javascripts/slices/app/helpers/composer.js
 - app/assets/javascripts/slices/app/helpers/date_field.js
+- app/assets/javascripts/slices/app/helpers/entries.js
 - app/assets/javascripts/slices/app/helpers/get_value.js
+- app/assets/javascripts/slices/app/helpers/hooks.js
 - app/assets/javascripts/slices/app/helpers/icon_upload_names.js.erb
 - app/assets/javascripts/slices/app/helpers/layout.js
+- app/assets/javascripts/slices/app/helpers/moment.js
 - app/assets/javascripts/slices/app/helpers/sitemap.js
 - app/assets/javascripts/slices/app/helpers/slice_preview.js
 - app/assets/javascripts/slices/app/helpers/tagging.js
@@ -317,7 +304,6 @@ files:
 - app/controllers/admin/admin_controller.rb
 - app/controllers/admin/admins_controller.rb
 - app/controllers/admin/assets_controller.rb
-- app/controllers/admin/auth/omniauth_callbacks_controller.rb
 - app/controllers/admin/auth/passwords_controller.rb
 - app/controllers/admin/auth/sessions_controller.rb
 - app/controllers/admin/entries_controller.rb
@@ -376,18 +362,10 @@ files:
 - app/views/admin/snippets/index.html.erb
 - app/views/admin/snippets/update.html.erb
 - app/views/layouts/admin.html.erb
-- config/initializers/backtrace_silencers.rb
-- config/initializers/devise.rb
-- config/initializers/inflections.rb
-- config/initializers/mime_types.rb
-- config/initializers/secret_token.rb
-- config/initializers/session_store.rb
-- config/routes.rb
 - lib/ext/file_store_cache.rb
-- lib/generators/humans/USAGE
 - lib/generators/humans/humans_generator.rb
 - lib/generators/humans/templates/humans.txt
-- lib/generators/slice/USAGE
+- lib/generators/humans/USAGE
 - lib/generators/slice/slice_generator.rb
 - lib/generators/slice/templates/main_fields.hbs
 - lib/generators/slice/templates/meta_fields.hbs
@@ -400,18 +378,17 @@ files:
 - lib/generators/slice/templates/show_slice.rb
 - lib/generators/slice/templates/slice.rb
 - lib/generators/slice/templates/slice_fields.hbs
-- lib/generators/slices/USAGE
+- lib/generators/slice/USAGE
 - lib/generators/slices/install_generator.rb
 - lib/generators/slices/templates/application.html.erb
 - lib/generators/slices/templates/mongoid.yml
 - lib/generators/slices/templates/slices.rb
+- lib/generators/slices/USAGE
 - lib/generators/templates/slices.rb
 - lib/mongo_search.rb
 - lib/paperclip_validator.rb
 - lib/rack_utf8_fix.rb
-- lib/sRGB.icc
 - lib/set_link_renderer.rb
-- lib/slices.rb
 - lib/slices/asset/maker.rb
 - lib/slices/asset/rename.rb
 - lib/slices/available_slices.rb
@@ -421,8 +398,8 @@ files:
 - lib/slices/generator_macros.rb
 - lib/slices/has_attachments.rb
 - lib/slices/has_slices.rb
-- lib/slices/i18n.rb
 - lib/slices/i18n/backend.rb
+- lib/slices/i18n.rb
 - lib/slices/i18n_backend.rb
 - lib/slices/page_as_json.rb
 - lib/slices/paperclip.rb
@@ -438,6 +415,8 @@ files:
 - lib/slices/version.rb
 - lib/slices/will_paginate.rb
 - lib/slices/will_paginate_mongoid.rb
+- lib/slices.rb
+- lib/sRGB.icc
 - lib/standard_tree.rb
 - public/slices/templates/page_main.hbs
 - public/slices/templates/page_main_extra.hbs
@@ -446,6 +425,16 @@ files:
 - public/slices/templates/set_page_entry_content_main.hbs
 - public/slices/templates/set_page_entry_content_meta.hbs
 - public/slices/templates/slice.hbs
+- config/routes.rb
+- config/initializers/backtrace_silencers.rb
+- config/initializers/devise.rb
+- config/initializers/inflections.rb
+- config/initializers/locales.rb
+- config/initializers/mime_types.rb
+- config/initializers/secret_token.rb
+- config/initializers/session_store.rb
+- CHANGELOG.md
+- README.md
 homepage: http://slices.withassociates.com
 licenses:
 - MIT
@@ -456,17 +445,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: slices
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Slices CMS, from With Associates

data/app/controllers/admin/auth/omniauth_callbacks_controller.rb

@@ -1,15 +0,0 @@
-class Admin::Auth::OmniauthCallbacksController < ::Devise::OmniauthCallbacksController
-  layout 'admin'
-  helper 'admin/admin'
-
-  def google_apps
-    email = request.env['omniauth.auth']['info']['email']
-    @admin = Admin.find_for_google_apps(email)
-
-    if @admin.persisted?
-      sign_in_and_redirect @admin, event: :authentication
-    else
-      redirect_to new_admin_session_path
-    end
-  end
-end