blocky 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b7e1668b91af7bf97863d2b7a497c3ec6aed93
-  data.tar.gz: 6dbe4418ce56430a2290e9099b7e67a49affc6b9
+  metadata.gz: 41a6e1031128ac08f54c5c611c93c83b1c6dd8ce
+  data.tar.gz: 4c74e846ebbf5690f26abbbd9f568ad4a97717ea
 SHA512:
-  metadata.gz: 307f7f64c3c3a981ffbc880ad6f963960b0074150d017af089bb9d68053852045e8d5da638e82b232685e9d7d5adb8c470dd54e4ccb74ab798bc80ded91ec2df
-  data.tar.gz: b3eab1aa6791b4e7d478e257157fb3c519f60aa0549fa3dc1b7e36f709fe1d0d4efe484f33a1843cffd29162a2ab67a16a621f9f46c44deaff5e81b6393af89d
+  metadata.gz: 896ad606a905626b271650a0dbb7d3debc24912b23a16d9928733351effe42510c4aea37d4e1ab8180980407602e957c75358b12058c77a8d20ad9bd28b751ad
+  data.tar.gz: d8d37f05b441730738dba648bbed842ac8071f02495a6efa5a3c5a5f7d0458bf7e6df481994899d9b808b9d7d5a1558ae1b4adb2fbbc2b62b805ce4010fb885c

data/app/controllers/blocky/content_blocks_controller.rb

@@ -1,8 +1,9 @@
 module Blocky
   class ContentBlocksController < Blocky::ApplicationController
     before_action :authorize_user
-    before_action :set_content_block, only: [:edit, :update]
+    before_action :set_content_block, only: [:show, :edit, :update]
     layout "blocky/application"
+    respond_to :html, :json
 
     def edit
     end
@@ -10,25 +11,40 @@ module Blocky
     def index
       @global_content_blocks = Blocky::ContentBlock.global
       @content_blocks = Blocky::ContentBlock.per_page
+
+      respond_with @content_blocks
     end
 
     def show
-      redirect_to action: :edit
+      respond_to do |format|
+        format.html { redirect_to(action: :edit) }
+        format.json
+      end
     end
 
     def update
       if @content_block.update(content_block_params)
-        redirect_to content_blocks_url, notice: "Content block :#{@content_block.name} was updated successfully."
+        respond_to do |format|
+          format.html {
+            redirect_to(content_blocks_url, notice: "Content block :#{@content_block.name} was updated successfully.")
+          }
+          format.json
+        end
       else
-        render action: :edit
+        respond_to do |format|
+          format.html {
+            render action: :edit
+          }
+          format.json
+        end
       end
     end
 
   private
 
-  def authorize_user
-    authorize! :manage, Blocky::ContentBlock
-  end
+    def authorize_user
+      authorize! :manage, Blocky::ContentBlock
+    end
 
     # Use callbacks to share common setup or constraints between actions.
     def set_content_block

data/app/controllers/blocky/images_controller.rb

@@ -0,0 +1,43 @@
+module Blocky
+  class ImagesController < Blocky::ApplicationController
+
+    before_action :authorize_user
+
+    def create
+      if s3_bucket
+        file = params[:file]
+        time_file = create_filename(file)
+        s3_object = s3_bucket.objects.create(time_file, file.tempfile, {
+          acl: :public_read
+        })
+        render text: s3_object.public_url.to_s
+      else
+        throw Exception, "S3 not setup"
+      end
+    end
+
+    private
+
+    def authorize_user
+      authorize! :manage, Blocky::ContentBlock
+    end
+
+    def s3_bucket
+      if Blocky.s3_access_key_id && Blocky.s3_secret_access_key && Blocky.s3_bucket
+        s3 = AWS::S3.new(
+          access_key_id: Blocky.s3_access_key_id,
+          secret_access_key: Blocky.s3_secret_access_key
+        )
+        s3.buckets[Blocky.s3_bucket]
+      end
+    end
+
+    def create_filename(file)
+      file_ext = File.extname file.original_filename
+      file_base = File.basename file.original_filename, file_ext
+      time = Time.now.to_i
+      file_with_time = "#{file_base}_#{time}#{file_ext}"
+    end
+
+  end
+end

data/app/helpers/blocky_helper.rb

@@ -1,7 +1,7 @@
 module BlockyHelper
 
   def blocky(block_name, options={}, &block)
-    page_path = options[:global] ? nil : request.fullpath
+    page_path = options[:global] ? nil : request.path
 
     content_block = Blocky::ContentBlock.where({
       page_path: page_path,

data/app/views/blocky/content_blocks/edit.html.erb

@@ -19,6 +19,7 @@
 <% content_for :scripts do %>
   <script>
     $(function() {
+
       $('.content-editor').summernote({
         codemirror: {
           lineNumbers: true,
@@ -37,8 +38,25 @@
           ['table', ['table']],
           ['insert', ['link', 'picture', 'video']],
           ['code', ['codeview', 'fullscreen']]
-        ]
+        ],
+
+        onImageUpload: function(files, editor, welEditable) {
+          data = new FormData();
+          data.append("file", files[0]);
+          $.ajax({
+            data: data,
+            type: "POST",
+            url: "../images",
+            cache: false,
+            contentType: false,
+            processData: false,
+            success: function(url) {
+              editor.insertImage(welEditable, url);
+            }
+          });
+        }
       });
     });
   </script>
 <% end %>
+

data/app/views/blocky/content_blocks/index.json.jbuilder

@@ -0,0 +1,10 @@
+json.content_blocks @content_blocks do |content_block|
+  json.id content_block.id
+
+  json.content   content_block.content
+  json.name      content_block.name
+  json.page_path content_block.page_path
+
+  json.created_at content_block.created_at
+  json.updated_at content_block.updated_at
+end

data/app/views/blocky/content_blocks/show.json.jbuilder

@@ -0,0 +1,10 @@
+json.content_block do
+  json.id @content_block.id
+
+  json.content   @content_block.content
+  json.name      @content_block.name
+  json.page_path @content_block.page_path
+
+  json.created_at @content_block.created_at
+  json.updated_at @content_block.updated_at
+end

data/config/routes.rb

@@ -1,4 +1,5 @@
 Blocky::Engine.routes.draw do
   resources :content_blocks, path: "/"
+  resources :images
   root to: "content_blocks#index"
 end

data/lib/blocky.rb

@@ -1,4 +1,6 @@
+require "aws-sdk"
 require "cancan"
+require "jbuilder"
 require "tidy"
 require "blocky/engine"
 

data/lib/blocky/version.rb

@@ -1,3 +1,3 @@
 module Blocky
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blocky
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.40'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.40'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +360,7 @@ files:
 - app/assets/stylesheets/blocky/shared/typography/lists.scss
 - app/controllers/blocky/application_controller.rb
 - app/controllers/blocky/content_blocks_controller.rb
+- app/controllers/blocky/images_controller.rb
 - app/controllers/concerns/blocky/auth.rb
 - app/helpers/blocky/application_helper.rb
 - app/helpers/blocky_helper.rb
@@ -340,6 +369,8 @@ files:
 - app/views/blocky/content_blocks/_content_block.html.erb
 - app/views/blocky/content_blocks/edit.html.erb
 - app/views/blocky/content_blocks/index.html.erb
+- app/views/blocky/content_blocks/index.json.jbuilder
+- app/views/blocky/content_blocks/show.json.jbuilder
 - app/views/layouts/blocky/_flash_messages.html.erb
 - app/views/layouts/blocky/application.html.erb
 - config/jshint.json