middleman-org 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2cda372c2e2651915077bfb548761d0ec832213
-  data.tar.gz: b25e56515d08b6a858414f159225c9c066601182
+  metadata.gz: a311d5390b08913e4ac82bcd7bb59531c3d4271f
+  data.tar.gz: 7eb15646043b8c664ddbd971ed0c6a0c55b5c66d
 SHA512:
-  metadata.gz: cb94d0dc36a263675e6f65a718523fed6ff48e5db5fbb2473ad295393d164671993fb8eb13d7855bb57bac78a441087d05eb16b60d7e30850bd17ea216d3edc8
-  data.tar.gz: e8cbe2ddae85763996df5eca673dafc8bf8cbb29acb110c0d1a58613ef2c51f298d9cc2eff9c058c34331149b086045639b706f79ea94e968f521515e50c809b
+  metadata.gz: 0d30c48667d5da0083fd65ea2692ba13e101fc467266679c5147d1a025bc2d5e04521f89bd52f02b559b13b797b92b4db784cf5a67e47d4db10b22ee71789695
+  data.tar.gz: 6d0e6436ea4300f2298a2f53484daa8c3b54c5a5c35bcd16c0aab0edfd27c8a34e26e372ab659e4ecf9344420b3d4875391faadac42971d47d9f55b084b92a52

data/lib/middleman-org/extension.rb

@@ -4,12 +4,18 @@ 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 :resources, 'resources', 'folder name for resources'
+
+    option :emacs, 'emacs', 'emacs executable'
+    option :load, nil, 'load elisp file'
 
     attr_reader :data
+    attr_reader :name
 
     self.defined_helpers = [Middleman::Org::Helpers]
     def initialize(app, options_hash = {}, &block)
@@ -17,13 +23,19 @@ module Middleman
       super
 
       # Require libraries only when activated
+      require 'emacs-ruby'
       require 'org-ruby'
       require 'middleman-org/org_data'
+      ::Tilt.prefer(Tilt::OrgTemplate, 'org')
 
-      options.root = File.join(options.prefix, options.root) if options.prefix
+      @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
+          ::Tilt.prefer(Tilt::EmacsRuby::OrgTemplate, 'org')
+        end
       end
 
       # set up your extension
@@ -31,7 +43,8 @@ module Middleman
     end
 
     def after_configuration
-      ::Middleman::Org.controller = self
+      @name ||= :"org#{::Middleman::Org.instances.keys.length}"
+      ::Middleman::Org.instances[@name] = self
 
       # Make sure ActiveSupport's TimeZone stuff has something to work with,
       # allowing people to set their desired time zone via Time.zone or

data/lib/middleman-org/helpers.rb

@@ -1,24 +1,38 @@
 module Middleman
   module Org
-
-    def self.controller
-      @controller ||= nil
+    def self.instances
+      @org_instances ||= {}
     end
 
-    def self.controller=(v)
-      @controller = v
+    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_controller
-        ::Middleman::Org.controller
+      def org_data(org_name = nil)
+        org_controller(org_name).data
       end
 
-      def org_data
-        org_controller.data
+      def org_article?
+        !current_article.nil?
       end
 
       def current_article
@@ -30,8 +44,8 @@ module Middleman
         end
       end
 
-      def articles
-        org_data.articles
+      def articles(org_name = nil)
+        org_data(org_name).articles
       end
     end
   end

data/lib/middleman-org/org_article.rb

@@ -42,7 +42,12 @@ module Middleman
           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
 
@@ -58,19 +63,27 @@ module Middleman
         in_buffer_setting['TITLE'] || File.basename(source_file, '.*')
       end
 
-      def tags
-        article_tags = in_buffer_setting['KEYWORDS']
-        return [] unless article_tags
+      def keywords
+        article_keywords = in_buffer_setting['KEYWORDS']
+        return [] unless article_keywords
 
-        if article_tags.is_a? String
-          article_tags.split(' ').map(&:strip)
+        if article_keywords.is_a? String
+          article_keywords.split(' ').map(&:strip)
         else
-          Array(article_tags).map(&:to_s)
+          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?
-        true
+        in_buffer_setting['DATE'] || false
       end
 
       def body
@@ -80,7 +93,8 @@ module Middleman
       def date
         return @_date if @_date
 
-        @_date = in_buffer_setting['DATE']
+        return nil unless in_buffer_setting['DATE']
+        @_date = Date.parse in_buffer_setting['DATE']
 
         # frontmatter_date = data['date']
 

data/lib/middleman-org/org_data.rb

@@ -28,15 +28,17 @@ module Middleman
         resources.each do |resource|
           next unless resource.path =~ /^#{options.root}/
 
-          resource.destination_path = resource.path.gsub(/^#{options.root}/,
-                                                         options.prefix)
+          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
-            puts article.source_file
             next unless publishable?(article)
             @_articles << article
           end
-
         end
       end
 

data/lib/middleman-org/version.rb

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

data/middleman-org.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('org-ruby', '~> 0.9.12')
   s.add_runtime_dependency('addressable', '~> 2.3')
   s.add_runtime_dependency('nokogiri', '~> 1.6')
+  s.add_runtime_dependency('emacs-ruby', '~> 0.1')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-org
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Xiaoxing Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: emacs-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Middleman extension for publishing org-mode project
 email:
 - dawnstar.hu@gmail.com