Merge branch 'master' into release

Author: mertkahyaoglu

.rubocop.yml

@@ -6,6 +6,8 @@ AllCops:
     - lib/jekyll-admin/public/**/*
     - src/**/*
     - node_modules/**/*
+    - Gemfile
+    - jekyll-admin.gemspec
 
 Metrics/BlockLength:
   Enabled: false

lib/jekyll-admin/server/collection.rb

@@ -2,7 +2,7 @@ module JekyllAdmin
   class Server < Sinatra::Base
     namespace "/collections" do
       get do
-        json site.collections.map { |c| c[1].to_api }
+        json(site.collections.map { |c| c[1].to_api })
       end
 
       get "/:collection_id" do

package.json

@@ -45,7 +45,7 @@
     "redux-logger": "2.6.1",
     "redux-thunk": "2.1.0",
     "simplemde": "1.11.2",
-    "slug": "0.9.1",
+    "slug": "git+https://[email protected]/180-g/node-slug",
     "sortablejs": "1.4.2",
     "underscore": "1.8.3"
   },

spec/jekyll-admin/apiable_spec.rb

@@ -1,5 +1,5 @@
 describe JekyllAdmin::APIable do
-  [:page, :post].each do |type|
+  %i(page post).each do |type|
     context type do
       subject do
         documents = Jekyll.sites.first.send("#{type}s".to_sym)

spec/jekyll-admin/server/collection_spec.rb

@@ -48,8 +48,8 @@ def app
     context "entries" do
       let(:entries) { last_response_parsed }
       let(:documents) do
-        entries.select do |entry|
-          !entry.key? "type"
+        entries.reject do |entry|
+          entry.key? "type"
         end
       end
       let(:first_document) { documents.first }

spec/jekyll-admin/server/page_spec.rb

@@ -16,8 +16,8 @@ def app
   context "page index" do
     let(:entries) { last_response_parsed }
     let(:pages) do
-      entries.select do |entry|
-        !entry.key? "type"
+      entries.reject do |entry|
+        entry.key? "type"
       end
     end
     let(:first_page) { pages.first }

spec/jekyll-admin/server_spec.rb

@@ -9,8 +9,8 @@ def app
     get "/pages"
     expect(last_response).to be_ok
     entries = last_response_parsed
-    first_page = entries.select do |entry|
-      !entry.key? "type"
+    first_page = entries.reject do |entry|
+      entry.key? "type"
     end.first
     expect(first_page["path"]).to eq("page.md")
   end