middleman-org 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a311d5390b08913e4ac82bcd7bb59531c3d4271f
-  data.tar.gz: 7eb15646043b8c664ddbd971ed0c6a0c55b5c66d
+  metadata.gz: bf5aaf69f1bc7cba22e779756677d0908873b125
+  data.tar.gz: 4b6cb340f6ddf4dc8b8454d8baf4e8e234d27341
 SHA512:
-  metadata.gz: 0d30c48667d5da0083fd65ea2692ba13e101fc467266679c5147d1a025bc2d5e04521f89bd52f02b559b13b797b92b4db784cf5a67e47d4db10b22ee71789695
-  data.tar.gz: 6d0e6436ea4300f2298a2f53484daa8c3b54c5a5c35bcd16c0aab0edfd27c8a34e26e372ab659e4ecf9344420b3d4875391faadac42971d47d9f55b084b92a52
+  metadata.gz: 32700033edf67993b760448be923258a9c6571df01a5a9a149ab542b174fe0045746daaad0b921b541f48bb3e32a69df47eec6f334460fea67ddad19ed3a89c0
+  data.tar.gz: 0da29da22f9d467a3c50268e8e2097fe20b159ad94813726ed917f92214e7318f569e3cccc22d02661c07695a403af781a95576ce6359a877402ae6dbde82abc

data/lib/middleman-org/extension.rb

@@ -1,65 +1,67 @@
-require 'middleman-org/org_data'
-require 'middleman-org/org_article'
-require 'middleman-org/helpers'
-
 module Middleman
   class OrgExtension < ::Middleman::Extension
-    self.supports_multiple_instances = true
-
-    option :name, nil, 'Unique ID for telling multiple orgs apart'
-    option :layout, 'layout', 'article specific layout'
-    option :root, 'org', 'source folder for org files'
-    option :prefix, nil, 'prefix on destination and root path'
 
     option :emacs, 'emacs', 'emacs executable'
     option :load, nil, 'load elisp file'
+    option :defaults, {}, 'default values if the keys do not exsist'
+    option :alias, {}, 'alias'
 
-    attr_reader :data
-    attr_reader :name
-
-    self.defined_helpers = [Middleman::Org::Helpers]
+    # self.defined_helpers = [Middleman::Org::Helpers]
     def initialize(app, options_hash = {}, &block)
       # Call super to build options from the options_hash
       super
 
       # Require libraries only when activated
-      require 'emacs-ruby'
       require 'org-ruby'
-      require 'middleman-org/org_data'
       ::Tilt.prefer(Tilt::OrgTemplate, 'org')
 
-      @name = options.name.to_sym if options.name
-      # options.root = File.join(options.prefix, options.root) if options.prefix
-
       app.after_configuration do
         template_extensions org: :html
         if config[:org_engine] == :emacs_ruby
+          require 'emacs-ruby'
           ::Tilt.prefer(Tilt::EmacsRuby::OrgTemplate, 'org')
         end
       end
-
-      # set up your extension
-      # puts options.my_option
     end
 
     def after_configuration
-      @name ||= :"org#{::Middleman::Org.instances.keys.length}"
-      ::Middleman::Org.instances[@name] = self
+      ::Middleman::Sitemap::Resource.send :include, OrgInstanceMethods
+    end
 
-      # Make sure ActiveSupport's TimeZone stuff has something to work with,
-      # allowing people to set their desired time zone via Time.zone or
-      # set :time_zone
-      Time.zone = app.config[:time_zone] if app.config[:time_zone]
-      time_zone = Time.zone || 'UTC'
-      zone_default = Time.find_zone!(time_zone)
-      unless zone_default
-        raise 'Value assigned to time_zone not recognized.'
+    module OrgInstanceMethods
+      def in_buffer_setting
+        @in_buffer_setting ||= extract_ibs source_file
       end
-      Time.zone_default = zone_default
 
-      @data = Org::OrgData.new(@app, self, options)
-      @app.sitemap.register_resource_list_manipulator(:"org_articles", @data, false)
-    end
+      def front_matter
+        # this code is from middleman-core
+        @enhanced_data ||= ::Middleman::Util.recursively_enhance(raw_data).freeze
+      end
 
+      def data
+        front_matter.merge(in_buffer_setting)
+      end
+
+      private
+
+      IN_BUFFER_SETTING_REGEXP = /^#\+(\w+):\s*(.*)$/
+
+      def extract_ibs(path)
+        ibs = {}
+        File.open(path, 'r') do |f|
+          f.each_line do |line|
+            if line =~ IN_BUFFER_SETTING_REGEXP
+              key = app.extensions[:org].options[:alias][$1.downcase] || $1.downcase
+              key = key.to_sym
+              ibs[key] = $2
+            end
+          end
+        end
+        app.extensions[:org].options[:defaults].each do |k, v|
+          ibs[k] = v unless ibs.has_key?(k)
+        end
+        ibs
+      end
+    end
   end
 end

data/lib/middleman-org/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Org
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/middleman-org.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ['dawnstar.hu@gmail.com']
   s.homepage    = 'http://github.com/xiaoxinghu/middleman-org'
   s.summary     = %q{org-mode extension for middleman}
-  s.description = %q{Middleman extension for publishing org-mode project}
+  s.description = %q{Use in buffer settings as front matter.}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-org
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Xiaoxing Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: Middleman extension for publishing org-mode project
+description: Use in buffer settings as front matter.
 email:
 - dawnstar.hu@gmail.com
 executables: []
@@ -94,9 +94,6 @@ files:
 - features/support/env.rb
 - lib/middleman-org.rb
 - lib/middleman-org/extension.rb
-- lib/middleman-org/helpers.rb
-- lib/middleman-org/org_article.rb
-- lib/middleman-org/org_data.rb
 - lib/middleman-org/version.rb
 - lib/middleman_extension.rb
 - middleman-org.gemspec
@@ -120,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: org-mode extension for middleman

data/lib/middleman-org/helpers.rb

@@ -1,52 +0,0 @@
-module Middleman
-  module Org
-    def self.instances
-      @org_instances ||= {}
-    end
-
-    def self.instances=(v)
-      @org_instances = v
-    end
-
-    module Helpers
-      def self.included(base)
-        ::Middleman::Org.instances = {}
-      end
-
-      def org_instances
-        ::Middleman::Org.instances
-      end
-
-      def org_controller(org_name = nil)
-        # Warn if a non-existent org name provided
-        if org_name && !org_instances.keys.include?(org_name.to_sym)
-          fail "Non-existent org name provided: #{org_name}."
-        end
-
-        org_name ||= org_instances.keys.first
-        org_instances[org_name.to_sym]
-      end
-
-      def org_data(org_name = nil)
-        org_controller(org_name).data
-      end
-
-      def org_article?
-        !current_article.nil?
-      end
-
-      def current_article
-        article = current_resource
-        if article && article.is_a?(OrgArticle)
-          article
-        else
-          nil
-        end
-      end
-
-      def articles(org_name = nil)
-        org_data(org_name).articles
-      end
-    end
-  end
-end

data/lib/middleman-org/org_article.rb

@@ -1,116 +0,0 @@
-require 'active_support/time_with_zone'
-require 'active_support/core_ext/time/acts_like'
-require 'active_support/core_ext/time/calculations'
-require 'nokogiri'
-
-module Middleman
-  module Org
-
-    module OrgArticle
-      def self.extended(base)
-        base.class.send(:attr_accessor, :org_controller)
-      end
-
-      def org_data
-        org_controller.data
-      end
-
-      def org_options
-        org_controller.options
-      end
-
-      IN_BUFFER_SETTING_REGEXP = /^#\+(\w+):\s*(.*)$/
-
-      def in_buffer_setting
-        return @_in_buffer_setting if @_in_buffer_setting
-
-        @_in_buffer_setting = {}
-        File.open(source_file, 'r') do |f|
-          f.each_line do |line|
-            if line =~ IN_BUFFER_SETTING_REGEXP
-              @_in_buffer_setting[$1] = $2
-            end
-          end
-        end
-        @_in_buffer_setting
-      end
-
-      def render(opts={}, locs={}, &block)
-        unless opts.has_key?(:layout)
-          opts[:layout] = org_options.layout if opts[:layout].nil?
-          # Convert to a string unless it's a boolean
-          opts[:layout] = opts[:layout].to_s if opts[:layout].is_a? Symbol
-        end
-
-        opts[:emacs] = org_options.emacs
-        opts[:load] = org_options.load
-
-        content = super(opts, locs, &block)
-        # testing
-        # content = export source_file
-        fix_links(content)
-      end
-
-      def fix_links(content)
-        html = ::Nokogiri::HTML(content)
-        html.xpath("//@src | //@href | //@poster").each do |attribute|
-          attribute.value = attribute.value.gsub(/^(.+)\.org$/, '\1.html')
-        end
-        html.to_s
-      end
-
-      def title
-        in_buffer_setting['TITLE'] || File.basename(source_file, '.*')
-      end
-
-      def keywords
-        article_keywords = in_buffer_setting['KEYWORDS']
-        return [] unless article_keywords
-
-        if article_keywords.is_a? String
-          article_keywords.split(' ').map(&:strip)
-        else
-          Array(article_keywords).map(&:to_s)
-        end
-      end
-
-      def description
-        in_buffer_setting['DESCRIPTION'] || 'no description'
-      end
-
-      def category
-        in_buffer_setting['CATEGORY'] || ''
-      end
-
-      def published?
-        in_buffer_setting['DATE'] || false
-      end
-
-      def body
-        render layout: false
-      end
-
-      def date
-        return @_date if @_date
-
-        return nil unless in_buffer_setting['DATE']
-        @_date = Date.parse in_buffer_setting['DATE']
-
-        # frontmatter_date = data['date']
-
-        # # First get the date from frontmatter
-        # if frontmatter_date.is_a? Time
-        #   @_date = frontmatter_date.in_time_zone
-        # else
-        #   @_date = Time.zone.parse(frontmatter_date.to_s)
-        # end
-
-        @_date
-      end
-
-      def slug
-      end
-
-    end
-  end
-end

data/lib/middleman-org/org_data.rb

@@ -1,58 +0,0 @@
-require 'middleman-core/util'
-
-module Middleman
-  module Org
-
-    class OrgData
-      attr_reader :options
-      attr_reader :controller
-
-      def initialize(app, controller, options)
-        @app = app
-        @options = options
-        @controller = controller
-
-        @_articles = []
-      end
-
-      def articles
-        @_articles
-      end
-
-      def tags
-        []
-      end
-
-      def manipulate_resource_list(resources)
-        @_posts = []
-        resources.each do |resource|
-          next unless resource.path =~ /^#{options.root}/
-
-          if options.prefix
-            resource.destination_path = resource
-              .path
-              .gsub(/^#{options.root}/,
-                    options.prefix)
-          end
-          if File.extname(resource.source_file) == '.org'
-            article = convert_to_article resource
-            next unless publishable?(article)
-            @_articles << article
-          end
-        end
-      end
-
-      def publishable?(article)
-        @app.environment == :development || article.published?
-      end
-
-      def convert_to_article(resource)
-        return resource if resource.is_a?(OrgArticle)
-        resource.extend OrgArticle
-        resource.org_controller = controller
-        resource
-      end
-
-    end
-  end
-end