octodmin 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6dccbff614863c901ad602335672cdcc78ce8c0
-  data.tar.gz: 0a80dcc4385350ac55e396ed454a92013a587308
+  metadata.gz: 0bf286fc4c638a5552de1e48cae1442f6334202b
+  data.tar.gz: a7fcaa4243fb13481b1b7370efcdaafaff495882
 SHA512:
-  metadata.gz: b15e6eabb46c8b065a9979e8ed03d78db4de6f39291d6f775d390a145524db1a361396aaf5fc32a44c431f22f82c4cc68328b384d8a50b04d4f8c6456cce0698
-  data.tar.gz: a4174ef053834d5feb939e4a95131cb34275f48fac73eea2fbd57238977ce1ac85ddc1087c078d4ec92e75a72816d6dc4bfab3fb14de7517640ce6d66ec83e51
+  metadata.gz: 6afa97affb291815163e250291a0bc156d43d3bae6f7d8efcb9adba28a452c196a89a490e3314170791b0d40f532c84ce4d5842c7e835bdc7be8f737cbea6d11
+  data.tar.gz: a9edd643b252f7e11c7935e920a8c9923f59a4539ccd05ad621b2d295375177abce22bedbf77e8b7bc9792de4bbfc0233d9ecbc96320d1ad8bb0058c4ed1e2cc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.3.0
+------
+
+* Improve preview
+* Implement file uploads
+
 v0.2.1
 ------
 

data/app/assets/javascripts/app.js.coffee

@@ -4,6 +4,7 @@
 #= require bootstrap
 #= require bootstrap-markdown
 #= require bootstrap.growl/bootstrap-growl
+#= require marked
 #= require spin.js/spin.js
 #= require react
 #= require react-loader

data/app/assets/javascripts/components/header.js.cjsx

@@ -29,7 +29,7 @@
     $(document).trigger("fetchPosts")
 
   handleError: (error) ->
-    $.growl(error.responseJSON?.errors.join("\n").replace(/\n/g, "<br>"), growlError)
+    $.growl(error.responseJSON?.errors.join("\n").replace(/\n/g, "<br>") || error.statusText, growlError)
 
   render: ->
     <div>

data/app/assets/javascripts/components/posts.js.cjsx

@@ -79,7 +79,7 @@
     @transitionTo("post_edit", post_id: response.posts.identifier)
 
   handleError: (error) ->
-    $.growl(error.responseJSON?.errors.join(", "), growlError)
+    $.growl(error.responseJSON?.errors.join(", ") || error.statusText, growlError)
 
   render: ->
     <div className="panel panel-default">
@@ -211,6 +211,30 @@
     @setState(loading: true)
     $.getq("default", "/api/posts/#{@getParams().post_id}").always(@handleResponse).done(@handleSuccess).fail(@handleError)
 
+  handleUpload: (event)->
+    form = $("<form><input type='file' name='file' /></form>")
+    event.disableButtons("cmdUpload")
+
+    form.find("input").on("change", (->
+      data = new FormData(form[0])
+      $.ajaxq("default",
+        type: "POST"
+        url: "/api/posts/#{@state.post.identifier}/upload"
+        data: data
+        cache: false
+        contentType: false
+        processData: false
+      ).always(->
+        event.enableButtons("cmdUpload")
+      ).done(((result) ->
+        @handleUploadSuccess(event, result)
+      ).bind(this)).fail(@handleError)
+    ).bind(this))
+    form.find("input").click()
+
+  handleUploadSuccess: (event, response) ->
+    event.replaceSelection(response.uploads[0])
+
   handleBack: (event) ->
     event.preventDefault()
     @transitionTo("app")
@@ -237,7 +261,7 @@
     @transitionTo("post_edit", post_id: response.posts.identifier)
 
   handleError: (error) ->
-    $.growl(error.responseJSON?.errors.join(", "), growlError)
+    $.growl(error.responseJSON?.errors.join(", ") || error.statusText, growlError)
 
   componentWillMount: ->
     @fetchPost()
@@ -253,6 +277,17 @@
       resize: "vertical"
       fullscreen:
         enable: false
+      additionalButtons: [
+        [{
+          name: "customGroup"
+          data: [{
+            name: "cmdUpload"
+            title: "Upload"
+            icon: "fa fa-upload"
+            callback: @handleUpload
+          }]
+        }]
+      ]
     )
 
   render: ->

data/app/config/routes.rb

@@ -5,6 +5,7 @@ namespace "api" do
     member do
       patch :restore
       patch :revert
+      post  :upload
     end
   end
   resources :syncs, only: [:create]

data/app/controllers/posts/destroy.rb

@@ -1,13 +1,13 @@
+require_relative "manage"
+
 module Octodmin::Controllers::Posts
-  class Destroy
+  class Destroy < Manage
     include Octodmin::Action
     expose :post
 
     def call(params)
-      self.format = :json
+      super
 
-      @post = Octodmin::Post.find(params[:id])
-      halt 400, JSON.dump(errors: ["Could not find post"]) unless @post
       @post.delete
     end
   end

data/app/controllers/posts/manage.rb

@@ -0,0 +1,9 @@
+module Octodmin::Controllers::Posts
+  class Manage
+    def call(params)
+      self.format = :json
+      @post = Octodmin::Post.find(params[:id])
+      halt 400, JSON.dump(errors: ["Could not find post"]) unless @post
+    end
+  end
+end

data/app/controllers/posts/restore.rb

@@ -1,13 +1,13 @@
+require_relative "manage"
+
 module Octodmin::Controllers::Posts
-  class Restore
+  class Restore < Manage
     include Octodmin::Action
     expose :post
 
     def call(params)
-      self.format = :json
+      super
 
-      @post = Octodmin::Post.find(params[:id])
-      halt 400, JSON.dump(errors: ["Could not find post"]) unless @post
       @post.restore
     end
   end

data/app/controllers/posts/revert.rb

@@ -1,13 +1,13 @@
+require_relative "manage"
+
 module Octodmin::Controllers::Posts
-  class Revert
+  class Revert < Manage
     include Octodmin::Action
     expose :post
 
     def call(params)
-      self.format = :json
+      super
 
-      @post = Octodmin::Post.find(params[:id])
-      halt 400, JSON.dump(errors: ["Could not find post"]) unless @post
       @post.revert
     end
   end

data/app/controllers/posts/show.rb

@@ -1,13 +1,12 @@
+require_relative "manage"
+
 module Octodmin::Controllers::Posts
-  class Show
+  class Show < Manage
     include Octodmin::Action
     expose :post
 
     def call(params)
-      self.format = :json
-
-      @post = Octodmin::Post.find(params[:id])
-      halt 400, JSON.dump(errors: ["Could not find post"]) unless @post
+      super
     end
   end
 end

data/app/controllers/posts/upload.rb

@@ -0,0 +1,22 @@
+require_relative "manage"
+
+module Octodmin::Controllers::Posts
+  class Upload < Manage
+    include Octodmin::Action
+    expose :upload
+
+    def call(params)
+      super
+
+      site = Octodmin::Site.new
+      file = params[:file]
+      dir  = File.join(site.source, "octodmin", @post.identifier)
+      path = File.join(dir, file["filename"])
+
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp(file["tempfile"].path, path)
+
+      @upload = path.sub(site.source, "")
+    end
+  end
+end

data/app/controllers/syncs/create.rb

@@ -9,25 +9,14 @@ module Octodmin::Controllers::Syncs
       site = Octodmin::Site.new
       git = Git.open(Octodmin::App.dir)
 
-      # Add posts only to commit stage
+      # Add files to commit stage
       stage(site, git)
 
-      # Compute staged paths
-      staged = paths(site, git)
-
       # Pull changes
       git.pull
 
       # Commit and push changes if any
-      if staged.any?
-        @message  = "Octodmin sync for #{staged.count} file#{"s" if staged.count > 1}"
-        @message += "\n\n#{staged.join("\n")}"
-
-        git.commit(@message)
-        git.push
-      else
-        @message = "Everything is up-to-date"
-      end
+      commit(site, git)
     rescue Git::GitExecuteError => e
       halt 400, JSON.dump(errors: [e.message])
     ensure
@@ -37,26 +26,38 @@ module Octodmin::Controllers::Syncs
     private
 
     def stage(site, git)
+      # Posts
       deleted = site.status.deleted.keys.map { |path| File.join(Octodmin::App.dir, path) }
-
       site.posts.each do |post|
         path = File.join(site.source, post.path)
         git.add(path) unless deleted.include?(path)
       end
+
+      # Uploads
+      git.add(File.join(site.source, "octodmin"))
     end
 
     def paths(site, git)
       status = site.reset.status
+      keys = status.changed.keys + status.added.keys + status.deleted.keys
 
-      paths = (
-        status.changed.keys +
-        status.added.keys +
-        status.deleted.keys
-      ).map { |path| File.join(Octodmin::App.dir, path) }
+      keys.sort.reverse.map do |path|
+        File.join(Octodmin::App.dir, path).sub(File.join(site.source, ""), "")
+      end
+    end
+
+    def commit(site, git)
+      staged = paths(site, git)
 
-      site.posts.select do |post|
-        paths.any? { |path| path.end_with?(post.path) }
-      end.map(&:path)
+      if staged.any?
+        @message  = "Octodmin sync for #{staged.count} file#{"s" if staged.count > 1}"
+        @message += "\n\n#{staged.join("\n")}"
+
+        git.commit(@message)
+        git.push
+      else
+        @message = "Everything is up-to-date"
+      end
     end
   end
 end

data/app/octodmin.rb

@@ -31,7 +31,10 @@ module Octodmin
 
     # :nocov:
     configure :production do
-      assets << ["public"]
+      assets << [
+        "public",
+        Octodmin::Site.new.source
+      ]
       serve_assets true
       handle_exceptions false
     end

data/app/views/posts/upload.rb

@@ -0,0 +1,10 @@
+module Octodmin::Views::Posts
+  class Upload
+    include Octodmin::View
+    format :json
+
+    def render
+      JSON.dump(uploads: [upload])
+    end
+  end
+end

data/bower.json

@@ -7,6 +7,7 @@
     "bootstrap-sass": "~3.3.2",
     "bootstrap-markdown": "~2.8.0",
     "bootstrap.growl": "~2.0.1",
+    "marked": "~0.3.3",
     "spin.js": "~2.0.2",
     "react": "~0.12.0",
     "react-loader": "~1.1.0",

data/lib/octodmin/version.rb

@@ -1,3 +1,3 @@
 module Octodmin
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/api/posts_spec.rb

@@ -408,4 +408,22 @@ describe "posts" do
       end
     end
   end
+
+  describe "upload" do
+    context "valid" do
+      before do
+        post "/api/posts/2015-01-30-test/upload", {
+          file: Rack::Test::UploadedFile.new("spec/fixtures/ear.png")
+        }
+      end
+      after do
+        File.delete("sample/octodmin/2015-01-30-test/ear.png")
+      end
+      subject { parse_json(last_response.body)["posts"] }
+
+      specify do
+        expect(File.exists?("sample/octodmin/2015-01-30-test/ear.png")).to be_truthy
+      end
+    end
+  end
 end

data/spec/api/syncs_spec.rb

@@ -62,6 +62,11 @@ end
           # Delete post
           delete "/api/posts/2015-01-29-welcome-to-jekyll"
 
+          # Upload file
+          post "/api/posts/2015-01-30-test/upload", {
+            file: Rack::Test::UploadedFile.new("spec/fixtures/ear.png")
+          }
+
           post "/api/syncs"
         end
         after do
@@ -69,11 +74,18 @@ end
           git = Git.open(Octodmin::App.dir)
           git.checkout("sample/_posts/2015-01-30-test.markdown")
           git.checkout("sample/_posts/2015-01-29-welcome-to-jekyll.markdown")
+          File.delete("sample/octodmin/2015-01-30-test/ear.png")
         end
         subject { parse_json(last_response.body)["syncs"] }
 
         it "returns syncs" do
-          expect(subject).to eql(["Octodmin sync for 3 files\n\n_posts/#{date}-yo.markdown\n_posts/2015-01-30-test.markdown\n_posts/2015-01-29-welcome-to-jekyll.markdown"])
+          expect(subject).to eql([[
+            "Octodmin sync for 4 files\n",
+            "octodmin/2015-01-30-test/ear.png",
+            "_posts/#{date}-yo.markdown",
+            "_posts/2015-01-30-test.markdown",
+            "_posts/2015-01-29-welcome-to-jekyll.markdown",
+          ].join("\n")])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octodmin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress
@@ -101,10 +101,12 @@ files:
 - app/controllers/posts/create.rb
 - app/controllers/posts/destroy.rb
 - app/controllers/posts/index.rb
+- app/controllers/posts/manage.rb
 - app/controllers/posts/restore.rb
 - app/controllers/posts/revert.rb
 - app/controllers/posts/show.rb
 - app/controllers/posts/update.rb
+- app/controllers/posts/upload.rb
 - app/controllers/site/show.rb
 - app/controllers/syncs/create.rb
 - app/controllers/version/show.rb
@@ -185,6 +187,7 @@ files:
 - app/views/posts/revert.rb
 - app/views/posts/show.rb
 - app/views/posts/update.rb
+- app/views/posts/upload.rb
 - app/views/site/show.rb
 - app/views/syncs/create.rb
 - app/views/version/show.rb
@@ -220,6 +223,7 @@ files:
 - spec/api/site_spec.rb
 - spec/api/syncs_spec.rb
 - spec/api/version_spec.rb
+- spec/fixtures/ear.png
 - spec/frontend/assets_spec.rb
 - spec/frontend/home_spec.rb
 - spec/spec_helper.rb
@@ -254,6 +258,7 @@ test_files:
 - spec/api/site_spec.rb
 - spec/api/syncs_spec.rb
 - spec/api/version_spec.rb
+- spec/fixtures/ear.png
 - spec/frontend/assets_spec.rb
 - spec/frontend/home_spec.rb
 - spec/spec_helper.rb