fuel 0.3.26 → 0.3.27

data/app/views/layouts/fuel/application.html.erb

@@ -17,5 +17,8 @@
     </main>
     <%= javascript_include_tag "fuel/application" %>
     <%= javascript_include_tag "application" %>
+
+    <%= render 'fuel/admin/posts/editor' %>
+
   </body>
 </html>

data/lib/fuel.rb

@@ -11,12 +11,21 @@ require "paperclip"
 require "bourbon"
 require "neat"
 require "pickadate-rails"
-require "wysiwyg-rails"
+require "aws-sdk"
+require "jquery-fileupload-rails"
+require "fuel/aws"
 
 module Fuel
 
   def self.configure(&block)
     block.call(configuration)
+    configure_aws
+    Rails.application.config.assets.precompile += %w( fuel/wysihtml.css )
+  end
+
+  def self.configure_aws
+    AWS.config( access_key_id:     configuration.aws_access_key,
+                secret_access_key: configuration.aws_secret_access_key )
   end
 
   def self.configuration

data/lib/fuel/configuration.rb

@@ -3,7 +3,7 @@ module Fuel
 
     # What kind of comments do you want to add to your blog ? (:active_record, :disqus or :no)
     attr_accessor :layout, :blog_title, :disqus_name, :twitter, :username, :password, :helpers, :paginates_per,
-        :featured_image_settings, :avatar_settings, :facebook_app_id, :site_name, :blog_description, :tags, :logo
+        :featured_image_settings, :avatar_settings, :facebook_app_id, :site_name, :blog_description, :tags, :logo, :aws_bucket, :aws_access_key, :aws_secret_access_key, :paperclip_defaults
 
     def initialize
       @layout = "application"
@@ -29,7 +29,11 @@ module Fuel
       @site_name = nil
       @tags = ["Customize", "These", "Options", "In", "config/initializers/fuel.rb"]
       @logo = "fuel/logo.svg"
+      @aws_bucket = nil
+      @aws_access_key = nil
+      @aws_secret_access_key = nil
     end
 
+
   end
 end

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.26"
+  VERSION = "0.3.27"
 end

data/lib/generators/templates/fuel.rb

@@ -54,4 +54,9 @@ Fuel.configure do |config|
   # Add Twitter
   #config.twitter = true
 
+  # AWS S3 SETTINGS
+  config.aws_bucket = ENV['AWS_BUCKET']
+  config.aws_access_key = ENV["AWS_ACCESS_KEY"]
+  config.aws_secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuel
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.27
 platform: ruby
 authors:
 - Ryan Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wysiwyg-rails
+  name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -307,12 +307,13 @@ files:
 - app/assets/images/fuel/icons/navigation-icons.svg
 - app/assets/images/fuel/logo.svg
 - app/assets/javascripts/fuel/admin.js.erb
+- app/assets/javascripts/fuel/advanced_and_extended.js
 - app/assets/javascripts/fuel/application.js
 - app/assets/javascripts/fuel/datepicker.js
 - app/assets/javascripts/fuel/facebook.js
 - app/assets/javascripts/fuel/posts.js.erb
-- app/assets/javascripts/fuel/rich-text.js
 - app/assets/javascripts/fuel/sliding-panel.js
+- app/assets/javascripts/fuel/wysihtml5x-toolbar.min.js
 - app/assets/stylesheets/fuel/_page-layout.scss
 - app/assets/stylesheets/fuel/_post-editor.scss
 - app/assets/stylesheets/fuel/_post-list.scss
@@ -326,6 +327,7 @@ files:
 - app/assets/stylesheets/fuel/components/_buttons.scss
 - app/assets/stylesheets/fuel/components/_card.scss
 - app/assets/stylesheets/fuel/components/_components.scss
+- app/assets/stylesheets/fuel/components/_editor.scss
 - app/assets/stylesheets/fuel/components/_forms.scss
 - app/assets/stylesheets/fuel/components/_navbar.scss
 - app/assets/stylesheets/fuel/components/_navigation-icons.scss
@@ -341,6 +343,7 @@ files:
 - app/assets/stylesheets/fuel/settings/variables/_buttons.scss
 - app/assets/stylesheets/fuel/settings/variables/_colors.scss
 - app/assets/stylesheets/fuel/settings/variables/_typography.scss
+- app/assets/stylesheets/fuel/wysihtml.css
 - app/controllers/fuel/admin/admin_controller.rb
 - app/controllers/fuel/admin/authors_controller.rb
 - app/controllers/fuel/admin/posts_controller.rb
@@ -358,6 +361,7 @@ files:
 - app/views/fuel/admin/authors/index.html.erb
 - app/views/fuel/admin/authors/new.html.erb
 - app/views/fuel/admin/posts/_content.html.erb
+- app/views/fuel/admin/posts/_editor.html.erb
 - app/views/fuel/admin/posts/_form.html.erb
 - app/views/fuel/admin/posts/_post_preview.html.erb
 - app/views/fuel/admin/posts/_posts.html.erb
@@ -389,6 +393,7 @@ files:
 - lib/blog_importer.rb
 - lib/example_author.rb
 - lib/fuel.rb
+- lib/fuel/aws.rb
 - lib/fuel/configuration.rb
 - lib/fuel/engine.rb
 - lib/fuel/version.rb

data/app/assets/javascripts/fuel/rich-text.js

@@ -1,9 +0,0 @@
-$(function() {
-  $body = $("body");
-
-  if ($("body").hasClass("posts-controller")){
-    $('#fuel_post_content').editable({
-      inlineMode: false, theme: 'gray', height: '500'
-    })
-  };
-});