octodmin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68161108fbd0f208b9fe379eaefc1638d8a07a40
-  data.tar.gz: 308e09d4fd3591b47d7a7621837aa12543e6f606
+  metadata.gz: 486c254e24ba8ecb343d9153f8a3fa520cc6fcf9
+  data.tar.gz: c4d51cf2c335bdeac72e50f7942c68f09b18ef40
 SHA512:
-  metadata.gz: a3c62874c57613363f2d4ae5e8bb8e63892ffd50a91e853d2012a19c9a2db48ced8388fc1d8cd8467904df0c89e7c1909048315046cb0b4719af5b7afd57d138
-  data.tar.gz: 11f6a5edc1cf7e8b057b45dbe9ab9581b00f2755c30e5c5cb5d60c679932d58e323c171bdeafd471dcf8a8b8e939a2508b81e9d206316cb82fa85caf69df7468
+  metadata.gz: 99d6b2bc5a38721a1ce9e10f6f270cb9041baf99353ed8a3a1669252266761140f26119d0362991c782ed819c839c1f52726cf946492901286a24caf76289983
+  data.tar.gz: de3ea218515c0c77229a62902a8848d570c4817f4b6db587e0bf312777d11b733fecd8dff3fd6cc3177b8533d29aee856a32ec79bdf7e5847d3ce0fb9ba4316e

data/.travis.yml

@@ -5,5 +5,6 @@ before_script:
 - bower install
 script: bundle exec rake spec:coverage
 rvm:
+  - 2.0
   - 2.1
   - 2.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+v0.2.0
+------
+
+* Support Ruby 2.0
+* Disable posts refreshing because of race conditions
+* Various UI fixes
+
 v0.1.0
 ------
 

data/README.md

@@ -14,7 +14,7 @@ Content management for Jekyll blogs
 Add this line to your Jekyll project's Gemfile:
 
 ```ruby
-gem 'octodmin', '~> 0.1.0'
+gem 'octodmin'
 ```
 
 And then execute:
@@ -76,15 +76,6 @@ post_ext: markdown
 post_layout: post
 ```
 
-Please note that Octodmin uses Octopress internally, so make sure you
-there is proper config, for example:
-
-```yaml
-# Octopress
-post_ext: markdown
-post_layout: post
-```
-
 ## Deployment
 
 Since Octodmin is a simple Rack app, use your favorite Ruby application server.
@@ -95,6 +86,17 @@ When deploying Octodmin to a remote server, make sure you're able to run
 `git pull`, `git push` and `octopress deploy` (if needed) successfully
 in the shell of your remote user.
 
+For basic HTTP authentication, use `Rack::Auth::Basic`.
+Example for your `config.ru`:
+
+```ruby
+use Rack::Auth::Basic, "Octodmin" do |username, password|
+  [username, password] == [ENV["USERNAME"], ENV["PASSWORD"]]
+end
+```
+
+Just set ENV variables and you're good to go.
+
 ## Development and testing
 
 You would need `npm` and `bower`. Run `bower install` to install asset

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

@@ -2,6 +2,7 @@
 #= require jquery-serialize-object
 #= require bootstrap
 #= require bootstrap-markdown
+#= require bootstrap.growl/bootstrap-growl
 #= require spin.js/spin.js
 #= require react
 #= require react-loader

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

@@ -5,7 +5,7 @@
     site: React.PropTypes.object.isRequired
 
   getInitialState: ->
-    { alert: null, success: null, loading: false }
+    { loading: false }
 
   handleSync: ->
     return if @state.loading
@@ -21,23 +21,15 @@
     @setState(loading: false)
 
   handleSyncSuccess: (response) ->
-    @setState(success: response.syncs.join("\n").replace(/\n/g, "<br>"))
-    setTimeout(@removeSuccess, 5000)
+    $.growl(response.syncs.join("\n").replace(/\n/g, "<br>"), growlSuccess)
     $(document).trigger("fetchPosts")
 
   handleDeploySuccess: (response) ->
-    @setState(success: response.deploys.join("\n"))
-    setTimeout(@removeSuccess, 5000)
+    $.growl(response.deploys.join("\n"), growlSuccess)
     $(document).trigger("fetchPosts")
 
   handleError: (error) ->
-    @setState(alert: error.responseJSON?.errors.join("\n").replace(/\n/g, "<br>"))
-
-  removeSuccess: ->
-    @setState(success: null) if @isMounted()
-
-  handleBlur: ->
-    @setState(alert: null, success: null) if @isMounted()
+    $.growl(error.responseJSON?.errors.join("\n").replace(/\n/g, "<br>"), growlError)
 
   render: ->
     <div>
@@ -47,13 +39,13 @@
             <Link to="app" className="navbar-brand"><i className="fa fa-fw fa-cog"></i> {@props.site.title}</Link>
           </div>
           <div className="navbar-right">
-            <button className="btn btn-primary navbar-btn #{'disabled' if @state.loading}" onClick={@handleSync} onBlur={@handleBlur}>
+            <button className="btn btn-primary navbar-btn #{'disabled' if @state.loading}" onClick={@handleSync}>
               <i className="fa fa-fw fa-refresh"></i> Sync
             </button>
             {if @props.site.octodmin.deploys
               deploy = @props.site.octodmin.deploys[0]
 
-              <button className="btn btn-primary navbar-btn #{'disabled' if @state.loading}" onClick={@handleDeploy} onBlur={@handleBlur}>
+              <button className="btn btn-primary navbar-btn #{'disabled' if @state.loading}" onClick={@handleDeploy}>
                 <i className="fa fa-fw fa-ship"></i> Deploy
               </button>
             }
@@ -63,7 +55,5 @@
           </div>
         </div>
       </nav>
-      {<div className="alert alert-danger"><span dangerouslySetInnerHTML={{__html: @state.alert }}></span></div> if @state.alert}
-      {<div className="alert alert-success"><span dangerouslySetInnerHTML={{__html: @state.success }}></span></div> if @state.success}
     </div>
 )

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

@@ -5,7 +5,7 @@
     site: React.PropTypes.object.isRequired
 
   getInitialState: ->
-    { alert: null, loading: false, posts: null }
+    { loading: false, posts: null }
 
   fetchPosts: ->
     return if @state.loading
@@ -16,23 +16,20 @@
     @setState(loading: false) if @isMounted()
 
   handleSuccess: (response) ->
-    @setState(alert: null, posts: response.posts) if @isMounted()
+    @setState(posts: response.posts) if @isMounted()
 
   handleError: (error) ->
-    @setState(alert: "Could not load posts: #{error.statusText} (#{error.status})") if @isMounted()
+    $.growl("Could not load posts: #{error.statusText} (#{error.status})", growlError)
 
   componentWillMount: ->
     @fetchPosts()
     $(document).on("fetchPosts", @fetchPosts)
-    @timer = setInterval(@fetchPosts, 5000)
 
   componentWillUnmount: ->
     $(document).off("fetchPosts", @fetchPosts)
-    clearInterval(@timer)
 
   render: ->
     <div>
-      {<div className="alert alert-danger">{@state.alert}</div> if @state.alert}
       <NewPostPartial site={@props.site} />
 
       <Loader loaded={!!@state.posts}>
@@ -59,7 +56,7 @@
     site: React.PropTypes.object.isRequired
 
   getInitialState: ->
-    { alert: null, loading: false }
+    { loading: false }
 
   form: ->
     $(@refs.form.getDOMNode())
@@ -75,19 +72,16 @@
     @setState(loading: false)
 
   handleSuccess: (response) ->
-    @setState(alert: null)
     @form()[0].reset()
     $(document).trigger("fetchPosts")
     @transitionTo("post_edit", post_id: response.posts.identifier)
 
   handleError: (error) ->
-    @setState(alert: error.responseJSON?.errors.join(", "))
+    $.growl(error.responseJSON?.errors.join(", "), growlError)
 
   render: ->
     <div className="panel panel-default">
       <div className="panel-body">
-        {<div className="alert alert-danger">{@state.alert}</div> if @state.alert}
-
         <form ref="form" className="form-inline" onSubmit={@handleSubmit}>
           <fieldset className="row" disabled={@state.loading}>
             <div className="col-sm-9 form-group form-group-lg">
@@ -110,7 +104,7 @@
     post: React.PropTypes.object.isRequired
 
   getInitialState: ->
-    { alert: null, loading: false }
+    { loading: false }
 
   panelClass: ->
     if @props.post.added
@@ -159,23 +153,20 @@
     @setState(loading: false)
 
   handleSuccess: (response) ->
-    @setState(alert: null)
     $(document).trigger("fetchPosts")
 
   handleError: (error) ->
-    @setState(alert: "Could not load post: #{error.statusText} (#{error.status})")
+    $.growl("Could not load post: #{error.statusText} (#{error.status})", growlError)
 
   render: ->
     <div className="panel panel-#{@panelClass()}">
       <div className="panel-heading clearfix">
         <h3 className="panel-title pull-left">{@props.post.title}</h3>
         <div className="pull-right">
-          {moment((new Date(@props.post.date)).toISOString()).format("LLL")}
+          {moment((new Date(@props.post.date.replace(/-/g, "/"))).toISOString()).format("LLL")}
         </div>
       </div>
       <div className="panel-body">
-        {<div className="alert alert-danger">{@state.alert}</div> if @state.alert}
-
         <div className="row">
           <div className="col-sm-9 excerpt" dangerouslySetInnerHTML={{__html: @props.post.excerpt }} />
           <div className="col-sm-3 buttons">
@@ -205,7 +196,7 @@
     site: React.PropTypes.object.isRequired
 
   getInitialState: ->
-    { alert: null, success: null, loading: false, post: null }
+    { loading: false, post: null }
 
   form: ->
     $(@refs.form.getDOMNode())
@@ -237,18 +228,14 @@
     @setState(loading: false)
 
   handleSuccess: (response) ->
-    @setState(alert: null, post: response.posts)
+    @setState(post: response.posts)
 
   handleFormSuccess: (response) ->
-    @setState(alert: null, success: "Post is updated")
-    setTimeout(@removeSuccess, 5000)
+    $.growl("Post is updated", growlSuccess)
     @transitionTo("post_edit", post_id: response.posts.identifier)
 
   handleError: (error) ->
-    @setState(alert: error.responseJSON?.errors.join(", "))
-
-  removeSuccess: ->
-    @setState(success: null) if @isMounted()
+    $.growl(error.responseJSON?.errors.join(", "), growlError)
 
   componentWillMount: ->
     @fetchPost()
@@ -268,9 +255,6 @@
 
   render: ->
     <Loader loaded={!!@state.post}>
-      {<div className="alert alert-danger">{@state.alert}</div> if @state.alert}
-      {<div className="alert alert-success">{@state.success}</div> if @state.success}
-
       {if @state.post
         <form ref="form" className="form-horizontal post-edit" onSubmit={@handleSubmit}>
           <fieldset disabled={@state.loading}>

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

@@ -7,6 +7,14 @@
 @DefaultRoute = Router.DefaultRoute
 @RouteHandler = Router.RouteHandler
 
+@growlSuccess =
+  type: "success"
+  delay: 10000
+
+@growlError =
+  type: "danger"
+  delay: 60000
+
 @Container = React.createClass(
   render: ->
     <div className="container">
@@ -26,7 +34,7 @@
     $("title").text("Octodmin – #{response.sites.title}")
 
   handleError: (error) ->
-    alert("Could not load site: #{error.statusText} (#{error.status})")
+    $.growl("Could not load site: #{error.statusText} (#{error.status})", growlError)
 
   componentWillMount: ->
     @fetchSite()
@@ -50,7 +58,6 @@ routes =
     <DefaultRoute handler={@Posts} />
   </Route>
 
-
 Router.run(routes, Router.HistoryLocation, (Handler) ->
   React.render(<Handler />, document.getElementById("app"))
 )

data/app/assets/stylesheets/app.scss

@@ -13,6 +13,10 @@ body {
   padding-bottom: 20px;
 }
 
+.growl-animated {
+  padding: 10px 35px 10px 15px;
+}
+
 a, button, input, textarea, *:focus {
   outline: 0 !important;
   outline-style: none !important;
@@ -31,6 +35,12 @@ a, button, input, textarea, *:focus {
 }
 
 .panel {
+  &:not(.panel-default) {
+    .panel-heading {
+      color: #fff;
+    }
+  }
+
   .panel-heading {
     line-height: 26px;
 

data/bower.json

@@ -5,6 +5,7 @@
     "jquery-serialize-object": "~2.4.5",
     "bootstrap-sass": "~3.3.2",
     "bootstrap-markdown": "~2.8.0",
+    "bootstrap.growl": "~2.0.1",
     "spin.js": "~2.0.2",
     "react": "~0.12.0",
     "react-loader": "~1.1.0",

data/lib/octodmin/post.rb

@@ -68,9 +68,9 @@ module Octodmin
         "force" => true,
       })
 
-      options = @site.config["octodmin"]["front_matter"].keys.map do |key|
+      options = Hash[@site.config["octodmin"]["front_matter"].keys.map do |key|
         [key, params[key]]
-      end.to_h
+      end]
 
       content = params["content"].gsub("\r\n", "\n").strip
       result = "---\n#{options.map { |k, v| "#{k}: \"#{v}\"" }.join("\n")}\n---\n\n#{content}\n"

data/lib/octodmin/version.rb

@@ -1,3 +1,3 @@
 module Octodmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octodmin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress