ascii_press 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f7edfe1b60ed197eec1d134ab544c9ea57770b3
-  data.tar.gz: 799c3949985b289238251be57f10e4151007d376
+  metadata.gz: dffcb104898a26201bd65d8ee065e16b277d7c9e
+  data.tar.gz: bcef3472d8592080fffa9f3508311dc841fb2e40
 SHA512:
-  metadata.gz: 2aa28ea027e775675c0ab012161db7c7ec1b2ff17e81a3e1448ab05ca5360f8021c1b72e0ea13410affa4c212f38e4d15c7cdd9d092d61e0c4c5e07e88ba189a
-  data.tar.gz: ba868c289bd75043f42198d8e9c8cc6bc75742bd6040855c5c3ecd823faa80fee27f00c8465b60bfdd4e6e987195c2a074a8fb2c8b2fe648762d885704972933
+  metadata.gz: 75673e806f48540665343e9ce1db0e5bf283ed4d94656f4af9ecade5e5f3d1f3222819d7d3e914e2a40aa1a5417a9e69d3f31cabfaf7b444800936cb189ff750
+  data.tar.gz: e7da91e2342a3124cf930015accaa915c507c5e20996a769b0ab7cc5b75c3af78bfa97a177af801bed21b95aa03bb186aa9035504a2acad17d58086a81d74b8a

data/ascii_press.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubypress', '~> 1.1.1'
   spec.add_dependency 'asciidoctor', '~> 1.5.4'
   spec.add_dependency 'activesupport', '>= 3.0'
+  spec.add_dependency 'colorize', '>= 0.7.7'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/ascii_press.rb

@@ -4,6 +4,7 @@ require 'rubypress'
 require 'asciidoctor'
 require 'logger'
 require 'stringio'
+require 'json'
 
 require 'active_support/core_ext/enumerable'
 
@@ -51,11 +52,22 @@ module AsciiPress
 
     def render(adoc_file_path)
       doc = nil
-      errors = capture_stderr { doc = Asciidoctor.load_file(adoc_file_path, @options) }
+      errors = capture_stderr do
+        document_text = File.read(adoc_file_path)
+        base_dir = ::File.expand_path(File.dirname(adoc_file_path))
+        if before_convertion = @options[:before_convertion]
+          document_text = before_convertion.call(document_text)
+        end
+        doc = Asciidoctor.load(document_text, @options.merge(base_dir: base_dir))
+      end
       puts errors.split(/[\n\r]+/).reject {|line| line.match(/out of sequence/) }.join("\n")
 
       html = doc.convert
 
+      if after_conversion = @options[:after_conversion]
+        html = after_conversion.call(html)
+      end
+
       data = doc.attributes.each_with_object({}) do |(key, value), result|
         result[key.to_sym] = value.to_s
       end
@@ -86,12 +98,13 @@ module AsciiPress
     def initialize(blog_id, username, password, renderer, options = {})
       @blog_id = blog_id
       @wp_client = Rubypress::Client.new(host: @blog_id, username: username, password: password)
-      @post_type = options[:post_type] || 'developer'
+      @post_type = options[:post_type] || 'faq'
       @logger = options[:logger] || AsciiPress.logger
       @renderer = renderer || Renderer.new
       @filter_proc = options[:filter_proc] || Proc.new { true }
       @delete_not_found = options[:delete_not_found]
       @generate_tags = options[:generate_tags]
+      @options = options
 
       all_pages = @wp_client.getPosts(filter: {post_type: @post_type, number: 1000})
       @all_pages_by_post_name = all_pages.index_by {|post| post['post_name'] }
@@ -134,14 +147,15 @@ module AsciiPress
 
       # log :info, "data: #{rendering.data.inspect}"
 
+      custom_fields_array = custom_fields.merge('adoc_attributes' => rendering.doc.attributes.to_json).map {|k, v| {key: k, value: v} }
       content = {
                   post_type:     @post_type,
                   post_date:     Time.now - 60*60*24*30,
                   post_content:  html,
                   post_title:    title,
                   post_name:     slug,
-                  post_status:   'publish',
-                  custom_fields: custom_fields
+                  post_status:   @options[:post_status] || 'draft',
+                  custom_fields: custom_fields_array
                 }
 
       content[:terms_names] = {post_tag: rendering.tags} if @generate_tags
@@ -168,8 +182,20 @@ module AsciiPress
       slug
     end
 
+
     private
 
+    def new_content_same_as_page?(content, page)
+      main_keys_different = %i(post_content post_title post_name post_status).any? do |key|
+        content[key] != page[key.to_s]
+      end
+
+      page_fields = page['custom_fields'].each_with_object({}) {|field, h| h[field['key']] = field['value'] }
+      content_fields = content[:custom_fields].each_with_object({}) {|field, h| h[field[:key].to_s] = field[:value] }
+
+      !main_keys_different && oyyyy
+    end
+
     def log(level, message)
       @logger.send(level, "WORDPRESS: #{message}")
     end
@@ -180,4 +206,45 @@ module AsciiPress
       end
     end
   end
+
+  DEFAULT_SLUG_RULES = {
+    'Cannot start with `-` or `_`' => -> (slug) { !%w(- _).include?(slug[0]) },
+    'Cannot end with `-` or `_`' => -> (slug) { !%w(- _).include?(slug[-1]) },
+    'Cannot have multiple `-` in a row' => -> (slug) { !slug.match(/--/) },
+    'Must only contain letters, numbers, hyphens, and underscores' => -> (slug) { !!slug.match(/^[a-z0-9\-\_]+$/) },
+  }
+
+  def self.slug_valid?(slug, rules = DEFAULT_SLUG_RULES)
+    rules.values.all? {|rule| rule.call(slug) }
+  end
+
+  def self.violated_slug_rules(slug, rules = DEFAULT_SLUG_RULES)
+    rules.reject do |desc, rule|
+      rule.call(slug)
+    end.map(&:first)
+  end
+
+  def self.verify_adoc_slugs!(adoc_paths, rules = DEFAULT_SLUG_RULES)
+    data = adoc_paths.map do |path|
+      doc = Asciidoctor.load(File.read(path))
+
+      slug = doc.attributes['slug']
+      if !slug_valid?(slug, rules)
+        violations = violated_slug_rules(slug, rules)
+        [path, slug, violations]
+      end
+    end.compact
+
+    if data.size > 0
+      require 'colorize'
+      data.each do |path, slug, violations|
+        puts 'WARNING!!'.red
+        puts "The document #{path.blue} has the #{slug.blue} which in invalid because:"
+        violations.each do |violation|
+          puts "  - #{violation.yellow}"
+        end
+      end
+      raise 'Invalid slugs.  Cannot continue'
+    end
+  end
 end

data/lib/ascii_press/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_press
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypress
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement