carraway 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2835e6706ba158bdd73017764ce14c198786f00c8fcb847f9b0b955e6d45278
-  data.tar.gz: b5194263701f9855de0bb342028e773fd3d07d2043e44e117045ca5940ece5e1
+  metadata.gz: 6b7a8962d89d229e36626b069fb9337244a15fca9439f489b9efbc97f001b33d
+  data.tar.gz: 7a43146ef527e3f6242aeb0a765d1817ff9f08772dca155f6579235c8f16de6c
 SHA512:
-  metadata.gz: 275c8a93d8630a376be4c7c901eb9e642bac85838bc05f8b6eca3780a003a0e867f92dfad10d43ae5b90269578bd3689a7aee4d326869e703ccf0af347f582b6
-  data.tar.gz: d933c705de0388d8727b0c63260be129c3f721e2dccf4bdb2d9071d8adedaef83ad38a6f86366de8f976587bf9488dd7823dee89f44a3d33e34dcd1ea48b7fe0
+  metadata.gz: 8560afff599524aa4b0aa4878dac9677904a0731ef884df4921e0669e9db8c7393afd432e2693b1f84286041b976aec3d5224f1cb3fcb782d1c485de1d29bbe5
+  data.tar.gz: '0682a499da758eba0eccf43b85471046bd0c4f3675d39052baa2c2f8d3e866b5037edd47e4bfc0a8e24a18db6145b9076b13c0c8a66c47d4ebc5eb82f86e3552'

data/.travis.yml

@@ -7,7 +7,7 @@ env:
   global:
     - CC_TEST_REPORTER_ID=6163381913794d34d745b65d61b589c603cda50fb74c94a54ab0c6305c249bc3
 before_install:
-  - gem install bundler -v 1.16.2
+  - gem install bundler -v 2.0.1
   - docker-compose -f docker/docker-compose.yml up -d
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v1.3.0](https://github.com/adorechic/carraway/tree/v1.3.0) (2019-03-15)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v1.2.0...v1.3.0)
+
+**Implemented enhancements:**
+
+- Show preview only if post has published [\#15](https://github.com/adorechic/carraway/pull/15) ([adorechic](https://github.com/adorechic))
+
 ## [v1.2.0](https://github.com/adorechic/carraway/tree/v1.2.0) (2019-03-11)
 [Full Changelog](https://github.com/adorechic/carraway/compare/v1.1.0...v1.2.0)
 

data/README.md

@@ -79,6 +79,16 @@ labels:
   label_key: 'Label title'
 ```
 
+### Customized views
+You can use your erb file as carraway views.
+If `views_dir` option is given, Carraway switches view root directory and use your erb file.
+Carraway just ignores unknown or different erb files.
+Please see default erb in https://github.com/adorechic/carraway/tree/master/lib/carraway/views
+
+```yaml
+views_dir: 'path/to/your/views'
+```
+
 ## Development
 
 ### Run DynamoDB Local

data/carraway.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack-flash3'
   spec.add_dependency 'redcarpet'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

data/lib/carraway/config.rb

@@ -27,6 +27,10 @@ module Carraway
       def labels
         @config['labels'] || {}
       end
+
+      def views_dir
+        @config['views_dir'] && ::File.expand_path(Dir.new(@config['views_dir']))
+      end
     end
   end
 end

data/lib/carraway/server.rb

@@ -6,11 +6,17 @@ require 'time'
 
 module Carraway
   class Server < Sinatra::Base
-    set :views, ::File.expand_path('../views', __FILE__)
     set :method_override, true
     enable :sessions
     use Rack::Flash
 
+    def view(template)
+      if Config.views_dir && ::File.exists?("#{Config.views_dir}/#{template}.erb")
+        return erb template, views: Config.views_dir
+      end
+      erb template
+    end
+
     get '/' do
       redirect '/carraway/'
     end
@@ -21,7 +27,7 @@ module Carraway
       @category_posts.each do |category, posts|
         posts.sort_by!(&:updated).reverse!
       end
-      erb :top
+      view :top
     end
 
     get '/carraway/api/posts' do
@@ -41,14 +47,14 @@ module Carraway
 
     get '/carraway/new' do
       @files = FileRepository.new.all.sort_by!(&:created).reverse!
-      erb :new
+      view :new
     end
 
     get %r{/carraway/edit/(\d+)} do |uid|
       @post = Post.find(uid)
       @files = FileRepository.new.all.sort_by!(&:created).reverse!
       # FIXME handle not found
-      erb :edit
+      view :edit
     end
 
     get %r{/carraway/preview/(\d+)} do |uid|
@@ -127,12 +133,12 @@ module Carraway
     get %r{/carraway/files/(\d+)} do |uid|
       # FIXME handle not found
       @file = FileRepository.new.find(uid)
-      erb :file_edit
+      view :file_edit
     end
 
     get '/carraway/files' do
       @files = FileRepository.new.all.sort_by!(&:created).reverse!
-      erb :files
+      view :files
     end
 
     patch %r{/carraway/files/(\d+)} do |uid|

data/lib/carraway/version.rb

@@ -1,3 +1,3 @@
 module Carraway
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GatsbyJS backend