slices 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e7962d1eb6d07caf9cf1aad9126223a9c191247
-  data.tar.gz: d37d49e3079bd5d224218accb94cbcd0c1c732ad
+  metadata.gz: 8f4968b6bc81c708989828fcbc0eb40ec6675c82
+  data.tar.gz: 0d8ff3c4a2bd832371719d01cd949eb66f20f2ce
 SHA512:
-  metadata.gz: cfb0c45a213c460c2c177d920fd5d20f7a09efd741b76e9c93d1f66553edaec50af3129f1c693e400b496a4e599887baa986f34e4c83554bd87c29ae6e4a0d4c
-  data.tar.gz: e4d5fc2155751c47264b16c7573b41ddcaa5b892ed9a943e6e9108facd1e644fb68be1d6347563c4a63eedf92852bb84dbe9106755448123ea28cdb85ede93e8
+  metadata.gz: 1cad25d7585e79096c3751e1a75f0aa143810288541ce2856254d648c3a1f759a075c8fa224c5ea60c5f512e21b15951a870498061f1ecad8561c87afd790dde
+  data.tar.gz: cc79cd57e8a0998b978ca0ea22ea9c5a66ba8d62ec34c913325f43981fad32ecca9db6df366e877aff6ea45db650a2b4c87cb840130725b9cc04951c13275934

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.3 / 2014-03-12
+
+* Put Page#as_json into its own module so it can be overridden in other modules
+* Add rails generate slices:install command
+* Upgrade Devise to 2.2.8
+
 # 1.0.2 / 2014-01-13
 
 * Fix (more) gem package issue

data/README.md

@@ -1,37 +1,26 @@
 # Slices CMS
 
-In-house CMS of [With Associates](http://withassociates.com/)
+In-house CMS of [With Associates](http://withassociates.com/).
 
 ## Starting a new Slices project
 
 Slices requires Ruby, MongoDB and ImageMagick. If you don't have them installed, follow this [guide](https://github.com/withassociates/slices/wiki/Installation.md) before beginning.
 
-We'll need to checkout the Slices project, install the relevant gems using Bundler and use a Rails template to create the new project:
-
-    $ cd ~/Projects     # or wherever you store git repositories
-    $ git clone git@github.com:withassociates/slices.git
-    $ cd slices
-    $ gem install bundler
-    $ bundle install
-
-Or if you have Slices already installed:
-
-    $ cd ~/Projects/slices  # or wherever you store git repositories
-    $ git pull
-    $ bundle install
-
 Now we're ready to create the Slices project:
 
     $ cd ~/Projects
-    $ gem install rails -v '~> 3.2.0'
-    $ rails new mywebsite -JOT -m ~/Projects/slices/lib/generators/templates/slices.rb
+    $ rails _3.2.16_ new mywebsite -O
+    $ cd ~/Projects/mywebsite
 
-At the end of this process we should have a new Slices project with a git repository created, gems installed, database seeded and ready to run:
+Add 'slices' to the Gemfile of your new project:
 
-    $ cd ~/Projects/mywebsite
-    $ foreman start
+    gem 'slices'
+
+Run `rails generate slices:install` in the terminal and follow the instructions.
+
+If you intend to deploy your Slices app to Heroku, run `rails generate slices:install --heroku` to make life easier.
 
-Visit http://localhost:5000/admin to begin using Slices.
+You're ready to go! Run `rails server` and visit http://localhost:3000/admin to begin using Slices.
 
 The next step is to create some [slices](https://github.com/withassociates/slices/wiki/Creating-Slices) - there are more guides in the [Wiki](https://github.com/withassociates/slices/wiki).
 

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

@@ -3,8 +3,8 @@ class Admin::Auth::OmniauthCallbacksController < ::Devise::OmniauthCallbacksCont
   helper 'admin/admin'
 
   def google_apps
-    domain = Slices::Config.google_apps_domain
-    @admin = Admin.find_for_domain(domain)
+    email = request.env['omniauth.auth']['info']['email']
+    @admin = Admin.find_for_google_apps(email)
 
     if @admin.persisted?
       sign_in_and_redirect @admin, event: :authentication

data/app/models/admin.rb

@@ -3,20 +3,38 @@ class Admin
   include MongoSearch::Searchable
 
   field :name
-  field :super_user, type: Boolean, :default => false
+  field :super_user,         type: Boolean, default: false
+
+  ## Database authenticatable
+  field :email,              type: String
+  field :encrypted_password, type: String
+
+  ## Recoverable
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
+
+  ## Rememberable
+  field :remember_created_at, type: Time
+
+  ## Trackable
+  field :sign_in_count,      type: Integer
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at,    type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip,    type: String
 
   text_search_in :name, :email
 
   validates_uniqueness_of :email, case_sensitive: false, scope: :site_id
-
   validates_presence_of :email
-  attr_accessible :email, :password, :password_confirmation, :name
+  validates_presence_of :encrypted_password
 
   devise :database_authenticatable, :recoverable, :rememberable,
-    :trackable, :validatable, :omniauthable
+    :trackable, :validatable
+  devise :omniauthable, omniauth_providers: [:google_apps]
 
-  def self.find_for_domain(domain)
-    where(email: /@#{domain}$/).first
+  def self.find_for_google_apps(email)
+    where(email: email).first || where(email: /@#{Slices::Config.google_apps_domain}$/).first
   end
 
   def super?

data/app/models/page.rb

@@ -4,6 +4,7 @@ class Page
   include MongoSearch::Searchable
 
   include Slices::Tree
+  include Slices::PageAsJSON
   include Slices::HasSlices
   include Slices::HasAttachments::PageInstanceMethods
 
@@ -146,19 +147,6 @@ class Page
     end
   end
 
-  def as_json(options = {})
-    options ||= {}
-
-    hash = attributes.symbolize_keys.except(:_id, :_type, :_keywords, :set_slices, :site_id).merge(
-      id:        id,
-      permalink: permalink,
-      slices:    ordered_slices_for(options[:slice_embed]).map {|slice| slice.as_json },
-      available_layouts: available_layouts
-    )
-
-    keys = options[:only]
-    keys ? hash.slice(keys) : hash
-  end
 
   # Added in merge or page & content
   def set_keywords

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

@@ -25,11 +25,13 @@
 
 </div>
 
-<% content_for :js_head do %>
-$(document).bind("keydown", function(e) {
-  if(e.keyCode == 187) {
-    window.location = "<%= admin_omniauth_authorize_path(:google_apps) %>";
-  }
-});
+<% 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/config/initializers/devise.rb

@@ -1,14 +1,11 @@
-require 'omniauth/openid'
-require 'openid/store/filesystem'
 require 'devise/orm/mongoid'
+require 'omniauth-google-apps'
 
 ActiveSupport::SecureRandom = SecureRandom
 
 Devise.setup do |config|
-  config.omniauth :google_apps,
-    OpenID::Store::Filesystem.new('/tmp'),
-    domain: Slices::Config.google_apps_domain
-
-  config.use_salt_as_remember_token = true
   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/routes.rb

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

data/lib/generators/slices/USAGE

@@ -0,0 +1,18 @@
+Description:
+    Installs Slices into your Rails 3.2 app.
+
+Example:
+    rails generate slices:install
+
+    This command will:
+        Create app/slices
+        Create a Slices initializer
+        Create an empty application layout
+
+Options:
+    [--mongoid]   # Add config/mongoid.yml
+                  # Default: false
+
+Tips:
+    Note the shorthand version `rails g slices:install`
+

data/lib/generators/slices/install_generator.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require 'rails/generators'
+require 'thor'
+
+module Slices
+  class InstallGenerator < ::Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    class_option :heroku, type: :boolean, default: false, desc: "Configure Slices for easy Heroku deployment."
+    include Thor::Actions
+
+    desc "This generator installs Slices within a Rails app."
+
+    def create_slices_dir
+      say "Running the Slices installer..."
+      create_file "app/slices/.gitkeep"
+    end
+
+    def create_initializer
+      copy_file "slices.rb", "config/initializers/slices.rb"
+    end
+
+    def create_application_layout
+      copy_file "application.html.erb", "app/views/layouts/default.html.erb"
+    end
+
+    def optionally_create_mongoid_yaml
+      copy_file "mongoid.yml", "config/mongoid.yml"
+    end
+
+    def delete_superfluous_files
+      remove_file "public/index.html"
+      remove_file "public/rails.png"
+      remove_dir "public/assets"
+    end
+
+    def heroku_options
+      if options.heroku?
+        say "Installing Slices for Heroku", :green
+        inject_into_file "#{Rails.root}/config/application.rb", "config.assets.initialize_on_precompile = false",
+          :after => "config.assets.enabled = true\n"
+
+        gsub_file "#{Rails.root}/config/environments/production.rb",
+          "config.assets.compile = false",
+          "config.assets.compile = true"
+      end
+    end
+
+    def finishing_up
+      say ""
+      say "---------------------------", :green
+      say "All done!", :green
+      say "---------------------------", :green
+      say ""
+      say "Next, run 'rake slices:seed' to create your Slices admin user and home page."
+      say "Then you can run 'rails server' and visit http://localhost:3000/admin to begin using Slices."
+      say "The next step is to create some slices. You can find the guides in the wiki:"
+      say "https://github.com/withassociates/slices/wiki"
+      say ""
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+  <head>
+    <title><%= @page.title %></title>
+    <meta name="description" content="<%= @page.meta_description %>">
+    <%= stylesheet_link_tag *%w[
+      application
+    ] %>
+    <%= javascript_include_tag *%w[
+      application
+    ] %>
+  </head>
+  <body class="layout-default">
+    <section id="main" role="main">
+      <%= container "content" %>
+    </section>
+  </body>
+</html>

data/lib/generators/slices/templates/mongoid.yml

@@ -0,0 +1,12 @@
+development:
+  host: localhost
+  database: myapp_development
+
+test:
+  host: localhost
+  database: myapp_test
+
+production:
+  host: localhost
+  database: myapp_development
+

data/lib/generators/slices/templates/slices.rb

@@ -0,0 +1,11 @@
+# Slices::Config.add_asset_styles(
+#   slice_full_width: '945x496>',
+#   avatar:           '30x30#',
+# )
+
+# Configure the Google Apps domain to use for quick auth.
+# Press the '=' key on the admin sign-in screen to authenticate via
+# a Google Apps account within the domain configured here.
+# Slices::Config.google_apps_domain = 'example.com'
+
+ActionView::Base.send(:include, AssetsHelper)

data/lib/slices.rb

@@ -22,6 +22,7 @@ module Slices
   autoload :GeneratorMacros,            'slices/generator_macros'
   autoload :HasSlices,                  'slices/has_slices'
   autoload :HasAttachments,             'slices/has_attachments'
+  autoload :PageAsJSON,                 'slices/page_as_json'
   autoload :Renderer,                   'slices/renderer'
   autoload :PositionHelper,             'slices/position_helper'
   autoload :SplitDateTimeField,         'slices/split_date_time_field'
@@ -55,9 +56,8 @@ require 'slices/will_paginate_mongoid'
 require 'slices/will_paginate'
 require 'set_link_renderer'
 
-if Rails.env.development?
-  Slices::Config.use_snippets!
-end
+Slices::Config.use_snippets!
+
 if Rails.env.test? || Rails.env.development?
   require 'standard_tree'
 end

data/lib/slices/page_as_json.rb

@@ -0,0 +1,18 @@
+module Slices
+  # We keep this method in here to facilate easier overriding when re-opening Page.
+  module PageAsJSON
+    def as_json(options = {})
+      options ||= {}
+
+      hash = attributes.symbolize_keys.except(:_id, :_type, :_keywords, :set_slices, :site_id).merge(
+        id:        id,
+        permalink: permalink,
+        slices:    ordered_slices_for(options[:slice_embed]).map {|slice| slice.as_json },
+        available_layouts: available_layouts
+      )
+
+      keys = options[:only]
+      keys ? hash.slice(keys) : hash
+    end
+  end
+end

data/lib/slices/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slices
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - With Associates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: oa-openid
+  name: omniauth-google-apps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.pre2
+        version: 3.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.pre2
+        version: 3.0.pre4
 description: A Rails 3 CMS that can be embedded within your own site.
 email:
 - hello@withassociates.com
@@ -378,7 +378,6 @@ files:
 - app/views/layouts/admin.html.erb
 - config/initializers/backtrace_silencers.rb
 - config/initializers/devise.rb
-- config/initializers/formtastic.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/secret_token.rb
@@ -401,6 +400,11 @@ 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/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/templates/slices.rb
 - lib/mongo_search.rb
 - lib/paperclip_validator.rb
@@ -420,6 +424,7 @@ files:
 - lib/slices/i18n.rb
 - lib/slices/i18n/backend.rb
 - lib/slices/i18n_backend.rb
+- lib/slices/page_as_json.rb
 - lib/slices/paperclip.rb
 - lib/slices/position_helper.rb
 - lib/slices/renderer.rb
@@ -441,7 +446,7 @@ files:
 - public/slices/templates/set_page_entry_content_main.hbs
 - public/slices/templates/set_page_entry_content_meta.hbs
 - public/slices/templates/slice.hbs
-homepage: http://www.withassociates.com
+homepage: http://slices.withassociates.com
 licenses:
 - MIT
 metadata: {}
@@ -461,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: slices
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Slices CMS, from With Associates

data/config/initializers/formtastic.rb

@@ -1,55 +0,0 @@
-# Set the default text field size when input is a string. Default is 50.
-# Formtastic::SemanticFormBuilder.default_text_field_size = 50
-
-# Set the default text area height when input is a text. Default is 20.
-# Formtastic::SemanticFormBuilder.default_text_area_height = 5
-
-# Should all fields be considered "required" by default?
-# Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
-# Defaults to true.
-# Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
-
-# Should select fields have a blank option/prompt by default?
-# Defaults to true.
-# Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
-
-# Set the string that will be appended to the labels/fieldsets which are required
-# It accepts string or procs and the default is a localized version of
-# '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
-# in your locale, it will replace the abbr title properly. But if you don't want to use
-# abbr tag, you can simply give a string as below
-# Formtastic::SemanticFormBuilder.required_string = "(required)"
-
-# Set the string that will be appended to the labels/fieldsets which are optional
-# Defaults to an empty string ("") and also accepts procs (see required_string above)
-# Formtastic::SemanticFormBuilder.optional_string = "(optional)"
-
-# Set the way inline errors will be displayed.
-# Defaults to :sentence, valid options are :sentence, :list and :none
-# Formtastic::SemanticFormBuilder.inline_errors = :sentence
-
-# Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is used without object. Defaults to :humanize.
-# Formtastic::SemanticFormBuilder.label_str_method = :humanize
-
-# Set the array of methods to try calling on parent objects in :select and :radio inputs
-# for the text inside each @<option>@ tag or alongside each radio @<input>@. The first method
-# that is found on the object will be used.
-# Defaults to ["to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-# Formtastic::SemanticFormBuilder.collection_label_methods = [
-#   "to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-
-# Formtastic by default renders inside li tags the input, hints and then
-# errors messages. Sometimes you want the hints to be rendered first than
-# the input, in the following order: hints, input and errors. You can
-# customize it doing just as below:
-# Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
-
-# Specifies if labels/hints for input fields automatically be looked up using I18n.
-# Default value: false. Overridden for specific fields by setting value to true,
-# i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-# Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
-
-# You can add custom inputs or override parts of Formtastic by subclassing SemanticFormBuilder and
-# specifying that class here.  Defaults to SemanticFormBuilder.
-# Formtastic::SemanticFormHelper.builder = MyCustomBuilder