jekyll-admin 0.1.0.pre2 → 0.1.0

data/lib/jekyll-admin/server/page.rb

@@ -7,7 +7,7 @@ module JekyllAdmin
 
       get "/:page_id" do
         ensure_page
-        json page.to_api
+        json page.to_api(:include_content => true)
       end
 
       put "/:page_id" do
@@ -18,7 +18,8 @@ module JekyllAdmin
         end
 
         write_file(page_path, page_body)
-        json page.to_api
+        ensure_page
+        json page.to_api(:include_content => true)
       end
 
       delete "/:page_id" do

data/lib/jekyll-admin/server/static_file.rb

@@ -7,7 +7,7 @@ module JekyllAdmin
 
       get "/*" do
         if static_file
-          json static_file.to_api
+          json static_file.to_api(:include_content => true)
         elsif !static_files_for_path.empty?
           json static_files_for_path.map(&:to_api)
         else
@@ -17,7 +17,8 @@ module JekyllAdmin
 
       put "/*" do
         write_file(static_file_path, static_file_body)
-        json static_file.to_api
+        ensure_static_file_exists
+        json static_file.to_api(:include_content => true)
       end
 
       delete "/*" do

data/lib/jekyll-admin/urlable.rb

@@ -0,0 +1,60 @@
+module JekyllAdmin
+  # Abstract module to be included in Convertible and Document to provide
+  # additional, URL-specific functionality without duplicating logic
+  module URLable
+
+    # Absolute URL to the HTTP(S) rendered/served representation of this resource
+    def http_url
+      return if is_a?(Jekyll::Collection) || is_a?(JekyllAdmin::DataFile)
+      return if is_a?(Jekyll::Document) && !collection.write?
+      @http_url ||= Addressable::URI.new(
+        :scheme => scheme, :host => host, :port => port,
+        :path => path_with_base(JekyllAdmin.site.config["baseurl"], url)
+      ).normalize.to_s
+    end
+
+    # Absolute URL to the API representation of this resource
+    def api_url
+      @api_url ||= Addressable::URI.new(
+        :scheme => scheme, :host => host, :port => port,
+        :path => path_with_base("/_api", resource_path)
+      ).normalize.to_s
+    end
+
+    private
+
+    # URL path relative to `_api/` to retreive the given resource via the API
+    # Note: we can't use a case statement here, because === doesn't like includes
+    def resource_path
+      if is_a?(Jekyll::Document)
+        "/collections/#{relative_path.sub(%r!\A_!, "")}"
+      elsif is_a?(Jekyll::Collection)
+        "/collections/#{label}"
+      elsif is_a?(JekyllAdmin::DataFile)
+        relative_path.sub(%r!\A#{JekyllAdmin.site.config["data_dir"]}!, "/data")
+      elsif is_a?(Jekyll::StaticFile)
+        "/static_files/#{relative_path}"
+      elsif is_a?(Jekyll::Page)
+        "/pages/#{relative_path}"
+      end
+    end
+
+    # URI.join doesn't like joining two relative paths, and File.join may join
+    # with `\` rather than with `/` on windows
+    def path_with_base(base, path)
+      [base, path].join("/").squeeze("/")
+    end
+
+    def scheme
+      JekyllAdmin.site.config["scheme"] || "http"
+    end
+
+    def host
+      JekyllAdmin.site.config["host"].sub("127.0.0.1", "localhost")
+    end
+
+    def port
+      JekyllAdmin.site.config["port"]
+    end
+  end
+end

data/lib/jekyll-admin/version.rb

@@ -1,3 +1,3 @@
 module JekyllAdmin
-  VERSION = "0.1.0.pre2".freeze
+  VERSION = "0.1.0".freeze
 end

data/lib/jekyll/commands/serve.rb

@@ -20,6 +20,7 @@ module Jekyll
         def jekyll_admin_monkey_patch(server)
           server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
           server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
+          Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0
 platform: ruby
 authors:
 - Mert Kahyaoğlu
@@ -9,132 +9,146 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.35'
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Jekyll::Admin is a drop in administrative framework for Jekyll sites.
@@ -145,9 +159,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/jekyll-admin.rb
+- lib/jekyll/commands/serve.rb
 - lib/jekyll-admin/apiable.rb
 - lib/jekyll-admin/data_file.rb
 - lib/jekyll-admin/public/03945ac4fc7fdefc44bc110bf1ba2393.svg
@@ -170,15 +182,18 @@ files:
 - lib/jekyll-admin/public/index.html
 - lib/jekyll-admin/public/styles.css
 - lib/jekyll-admin/public/styles.css.map
-- lib/jekyll-admin/server.rb
 - lib/jekyll-admin/server/collection.rb
 - lib/jekyll-admin/server/configuration.rb
 - lib/jekyll-admin/server/data.rb
 - lib/jekyll-admin/server/page.rb
 - lib/jekyll-admin/server/static_file.rb
+- lib/jekyll-admin/server.rb
 - lib/jekyll-admin/static_server.rb
+- lib/jekyll-admin/urlable.rb
 - lib/jekyll-admin/version.rb
-- lib/jekyll/commands/serve.rb
+- lib/jekyll-admin.rb
+- LICENSE
+- README.md
 homepage: https://github.com/jekyll/jekyll-admin
 licenses:
 - MIT
@@ -190,17 +205,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: wp-admin for Jekyll, but better