diglossa 0.2.24 → 0.2.27

data/README.md

@@ -20,19 +20,34 @@ The examples and descriptions below does not cover all the options available via
 Commands:
 
     dg help [COMMAND]          # Describe available commands or one specific command
-    dg author [NIC, push]      # get author by NIC
+    dg generate [APPDIR]      # generate .couchapprc
 
-book contents:
+get:
+    dg get [OBJ] [PARAM], ex:
+    dg get id _ID, i.e:  get id lib-tree or get id 05b33841744f209d3342bbfcf76cb574
+    dg get book by root file-path or url, i.e:
+    dg get book Greek/Plato/Dialogues (url) or get NT/Greek/Plato/Dialogues (file-path)
+    dg get texts by root path or url
+    dg get coms by root path or url
 
-    dg build [PATH]               # parse BOOK by root PATH(.json/.yml) and build hash, ex: dg build "NT/Palama/Triads"
-    dg warns [PATH]            # print errors and warns about BOOK by PATH
-    dg get [PATH/URL]         # get BOOK tree by root path or url, i.e. "Greek/Plato/Dialogues" or "NT/Greek/Plat...
-    dg push [PATH]               # builds, checks and pushes BOOK to couchdb by root PATH
+build:
+    dg build [OBJ] [PATH], ex:
+    dg build json obj, i.e.:   build json authors/psell.json
+    dg build book path, ex: dg build book NT/Palama/Triads
+    dg build urls path (array of the urls in a book)
+    no build for text and comments, use push and then get
 
-texts (paragraphs):
+warns:
+    dg warns book [PATH], ex:
+    dg warns book NT/Palama/Triads
+
+push:
+    dg push [OBJ] [PATH] env, ex:
+    dg push json/book/texts,
+    dg push book NT/Palama/Triads
+    dg push book NT/Palama/Triads production
+    dg push texts NT/Palama/Triads (pushes all texts and comms at once)
 
-    dg gettexts [URL, delete]  # get or delete! text docs by exact URL: dg gettexts "Psell/Chronographia/Part-1" N...
-    dg pushtexts [PATH]          # parse texts for root PATH, ex: dg docs "NT/Palama/Triads"
 
 
 ## .couchapprc
@@ -58,7 +73,7 @@ Do not forget to generate .couchapprc file with <tt>dg gen your_appname</tt> and
 
 ## ToDo
 
-    dg library         # library contents get/push
+    dg delete [OBJ] [PATH]
 
 ## Community
 

data/bin/dg-author

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'diglossa'
+
+Diglossa::Author.start

data/diglossa.gemspec

@@ -13,12 +13,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  #gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.executables = ["dg"]
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  #gem.add_development_dependency "redcarpet", "~> 1.17"
   gem.add_development_dependency "yard", "~> 0.7.5"
   gem.add_development_dependency "rspec-core", "~> 2.0"
   gem.add_development_dependency "rspec-expectations", "~> 2.0"
@@ -28,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
   #gem.add_runtime_dependency(%q<typhoeus>, ["~> 0.6.3"])
   gem.add_runtime_dependency(%q<rest-client>)
+  gem.add_runtime_dependency(%q<addressable>)
   gem.add_runtime_dependency(%q<thor>, ["~> 0.15"])
   #gem.add_runtime_dependency(%q<thor>, ["~> 0.15"])
   gem.add_runtime_dependency(%q<uuidtools>, ["~> 2.1"])

data/lib/diglossa/author.rb

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+require 'thor'
+require 'thor/actions'
+require 'uuidtools'
+require 'rest_client'
+require 'yaml'
+require 'pp'
+
+module Diglossa
+  class Author < ::Thor
+    include Thor::Actions
+
+    attr_accessor :appdir, :config_file, :debug
+    attr_reader :config
+
+    class_option "appdir",
+    :type => :string,
+    :banner => "set the application directory to work with. assumes the current directory"
+
+    method_option "appname",
+    :type => :string,
+    :banner => "set the name of the application for templating. defaults to the basename of the appdir"
+
+    default_task :help
+
+    desc 'get [PATH/URL]', 'get BOOK tree by root path or url, i.e. "Greek/Plato/Dialogues" or "NT/Greek/Plato/Dialogues" '
+    def get(path, env = 'default')
+      size = path.split("/").size
+      url = size < 3 ? path : path.to_url
+      resp = remote(env).get_book url
+      resp ? pp(resp) : say("no book by url #{url}", :red)
+    end
+
+    desc 'build [PATH]', 'parse author.json by PATH(.json/.yml) and build hash, ex: dg-author build "authors/psell"'
+    def build(path = 'authors/author')
+      fn = File.expand_path(File.join(appdir, path))
+      readable = File.readable?("#{fn}.json") ? "#{fn}.json" : File.readable?("#{fn}.yml") ? "#{fn}.yml" : false
+      if readable
+        hash = JSON.parse(File.read(readable))
+        pp hash
+      else
+        say "Could not find author.json or author.yml at '#{fn}'. "
+      end
+      #return nil unless fullname
+
+      # if File.readable?(config_path)
+      #   @config = JSON.parse(File.read(config_path))
+      # else
+      #   raise "Could not find config at '#{config_path}'. Run `soca init`"
+      # end
+
+      # #hash = parse.author_build path
+      # pp hash
+      #book = parse.seed_build path
+      #book ? pp(book) : say("can not build book by path #{path}", :red)
+    end
+
+    desc 'push [PATH]', 'builds, checks and pushes BOOK to couchdb by root PATH'
+    def push(path, env = 'default')
+      books = parse.build path, "book"
+      resp = remote(env).push_book books
+      resp ? pp(resp) : say("WARN: no book to push by #{path}", :red)
+    end
+
+    # choose seeds directory
+    desc 'author_ [NIC, push]', 'get author by NIC'
+    def author(nic, push=false, env = 'default')
+      response = remote(env).author nic
+      response.empty? ? say("WARN: no author #{nic}", :red) : pp(response)
+      return unless push
+      doc = parse.parse_author(nic)
+      dbdoc = response.find{|d|d["nic"] == nic}
+      if dbdoc
+        doc["_id"] = dbdoc["_id"]
+        doc["_rev"] = dbdoc["_rev"]
+      end
+      response = remote(env).push_docs doc
+      pp response
+    end
+
+    def initialize(*)
+      super
+      self.appdir      = options[:appdir] || File.expand_path(Dir.pwd)
+      # self.config_file = options[:config]
+      self.source_paths << File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    end
+
+    private
+
+    def remote(env)
+      Diglossa::Remote.new appdir, env
+    rescue => e
+      say e.message, :red
+      exit
+    end
+
+    def parse
+      Diglossa::Parse.new appdir
+    rescue => e
+      say e.message, :red
+      exit
+    end
+
+
+  end
+end

data/lib/diglossa/cli.rb

@@ -6,7 +6,8 @@ require 'uuidtools'
 require 'rest_client'
 require 'yaml'
 require 'pp'
-#require 'redcarpet'
+#require 'addressable'
+require "addressable/uri"
 
 module Diglossa
   class CLI < ::Thor
@@ -26,64 +27,109 @@ module Diglossa
 
     default_task :help
 
-
-    desc 'get [PATH/URL]', 'get BOOK tree by root path or url, i.e. "Greek/Plato/Dialogues" or "NT/Greek/Plato/Dialogues" '
-    def get(path, env = 'default')
+    desc 'get [OBJ] [PARAM]', 'get author nic
+get id _ID, i.e:
+get id lib-tree or get id 05b33841744f209d3342bbfcf76cb574
+get book by root file-path or url, i.e:
+get book Greek/Plato/Dialogues (url) or get NT/Greek/Plato/Dialogues (file-path)
+get texts by root path or url
+get coms by root path or url
+'
+    def get(obj, path, env = 'default')
       size = path.split("/").size
       url = size < 3 ? path : path.to_url
-      resp = remote(env).get_book url
-      resp ? pp(resp) : say("no book by url #{url}", :red)
-    end
-
-    desc 'build [PATH]', 'parse BOOK by root PATH(.json/.yml) and build hash, ex: dg build "NT/Palama/Triads"'
-    def build(path = 'default', push = "book")
-      book = parse.build path, "book"
-      book ? pp(book) : say("can not build book by path #{path}", :red)
-    end
-
-    desc 'push [PATH]', 'builds, checks and pushes BOOK to couchdb by root PATH'
-    def push(path, env = 'default')
-      books = parse.build path, "book"
-      resp = remote(env).push_book books
-      resp ? pp(resp) : say("WARN: no book to push by #{path}", :red)
-    end
-
-    desc 'warns [PATH]', 'print errors and warns about BOOK by PATH'
-    def warns(path, env = 'default')
-      resp = parse.build path, "warns"
-      resp ? pp(resp) : say("WARN: no book to push by #{path}", :red)
+      puts "URL: #{url}" unless path == url
+      case obj
+      when "author"
+        resp = remote(env).author path
+      when "id"
+        resp = remote(env).get_id path
+      when "texts"
+        urls = build "urls", path, false
+        urls.each do |url|
+          resp = remote(env).get_texts url
+        end
+      when "coms"
+        urls = build "urls", path, false
+        urls.each do |url|
+          puts "get coms by url: #{url}"
+          resp = remote(env).get_coms url
+        end
+      when ""
+      when ""
+      when "book"
+        resp = remote(env).get_book url
+      end
+      resp ? pp(resp) : say("no #{obj} by PARAM #{path}", :red)
     end
 
-    desc 'pushtexts [PATH]', 'parse texts for root PATH, ex: dg docs "NT/Palama/Triads"'
-    def pushtexts(path = 'default')
-      fpaths = parse.build path, "docs"
-      fpaths ? pp(fpaths) : say("can not build texts by path #{path}", :red)
+    desc 'warns book [PATH]', 'warns book PATH, ex:
+dg warns book NT/Palama/Triads
+'
+    def warns(obj, path)
+      case obj
+        #when "blog"
+        #hash = parse.build_blog path
+      when "book"
+        hash = parse.build_book path, "warns"
+      when ""
+      else
+        hash = false
+      end
+      #hash ? pp(hash) : say("can not build OBJ by path #{path}", :red)
+      hash ? pp(hash) : say("use: warns _book_ path", :red)
     end
 
-    desc 'gettexts [URL, delete]', 'get or delete! text docs by exact URL: dg gettexts "Psell/Chronographia/Part-1" NB: defis'
-    def gettexts(url, delete=false, env = 'default') # 125037 rows
-      docs = remote(env).texts_get url
-      docs.empty? ? say("WARN: no docs by url: #{url}", :red) : pp(docs)
-      return unless delete == "delete!"
-      docs.each{|doc|doc["_deleted"] = true}
-      response = remote(env).push_docs docs
-      pp response
+    desc 'build [OBJ] [PATH]', 'build json obj, i.e.
+build json authors/psell.json
+build book path, ex: dg build book NT/Palama/Triads
+build urls path - array of the urls in a book
+no build for text and comments, use push and then get
+'
+    def build(obj, path, print = true)
+      case obj
+      when "blog"
+        hash = parse.build_blog path
+      when "json"
+        hash = parse.build_json path
+      when "book"
+        hash = parse.build_book path, "book"
+      when "urls"
+        hash = parse.build_book_urls path
+      when "texts"
+        hash = "use dg push texts PATH"
+      when ""
+      when ""
+      else
+        hash = false
+      end
+      if print
+        hash ? pp(hash) : say("can not build OBJ by path #{path}", :red)
+      else
+        hash
+      end
     end
 
-    # choose seeds directory
-    desc 'author [NIC, push]', 'get author by NIC'
-    def author(nic, push=false, env = 'default')
-      response = remote(env).author nic
-      response.empty? ? say("WARN: no author #{nic}", :red) : pp(response)
-      return unless push
-      doc = parse.parse_author(nic)
-      dbdoc = response.find{|d|d["nic"] == nic}
-      if dbdoc
-        doc["_id"] = dbdoc["_id"]
-        doc["_rev"] = dbdoc["_rev"]
+    desc 'push [OBJ] [PATH] env', 'push json/book/texts,
+dg push book NT/Palama/Triads
+dg push book NT/Palama/Triads production
+dg push texts NT/Palama/Triads (pushes all texts and comms at once)
+
+'
+    def push(obj, path, env = 'default')
+      case obj
+      when "blog"
+        #resp = remote(env).push_docs docs
+      when "json"
+        resp = remote(env).push_docs docs
+      when "book"
+        docs = parse.build_book path, "book"
+        resp = remote(env).push_book docs
+      when "texts"
+        resp = parse.build_book path, "texts"
+      else
       end
-      response = remote(env).push_docs doc
-      pp response
+      resp ? pp(resp) : say("ERR: no book to push by #{path}", :red)
     end
 
     def initialize(*)
@@ -93,25 +139,7 @@ module Diglossa
       self.source_paths << File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
     end
 
-    # desc 'consts [ENV]', 'outputs the app CONSTS for the ENV'
-    # def consts(env = 'default')
-    #   say DIGLOSSA::lib
-    # end
-
-
-    # desc 'blog [FILE]', 'parse blog FILE.en or FILE.ru'
-    # def blog(fname = 'default')
-    #   parse.blog fname
-    # end
-
-    # desc 'get [URL]', 'get URL'
-    # def get(url, env = 'default')
-    #   remote(env).get url
-    # end
-
-    # end
-
-    desc 'generate [APPDIR]', 'generates .couchapprc'
+    desc 'generate [APPDIR]', 'generate .couchapprc'
     def generate(to = nil)
       self.appdir = to if to
       self.destination_root = appdir

data/lib/diglossa/parse.rb

@@ -10,7 +10,7 @@ module Diglossa
 
     def initialize(app_dir) #, config_path = nil)
       self.app_dir = File.expand_path(app_dir) + '/'
-      @warns = {file:[], size:[]}
+      @warns = {file:[], size:[], fn:[]}
       @counter = []
       #load_couchapprc
     end
@@ -24,7 +24,55 @@ module Diglossa
       doc
     end
 
-    def build root, push=false
+    def readable path
+      fn = File.expand_path(File.join(app_dir, path))
+      #File.readable?("#{fn}.json") ? "#{fn}.json" : File.readable?("#{fn}.yml") ? "#{fn}.yml" : File.readable?(fn) ? fn : false
+      puts "app_dir: #{app_dir}"
+      puts "readable: #{fn}"
+      File.readable?(fn) ? fn : false
+    end
+
+    def build_blog path
+      readable_file = readable path
+      return false unless readable_file
+      doc = {type:"blog", body:[], more:[]}
+      time = Time.new
+      date = time.strftime("%d-%m-%Y")
+      doc[:date] = date
+      uuid = UUIDTools::UUID.sha1_create UUIDTools::UUID_DNS_NAMESPACE, "#{path}-#{date}"
+      doc[:_id] = uuid.to_s
+      head = true
+      body = false
+      lines = File.readlines readable_file
+      lines.each do |line|
+        line.strip!
+        next if line.empty?
+        if head && line.start_with?("---")
+          head = false
+          body = true
+          next
+        end
+        if head
+          parts = line.split(":")
+          key = parts[0].to_sym
+          val = parts[1..-1].join(":")
+          doc[key] = val
+          next
+        end
+        body ? doc[:body].push(line) : doc[:more].push(line)
+        body = false if body && line.start_with?("---")
+
+      end
+      doc
+    end
+
+    def build_json path
+      readable_file = readable path
+      return false unless readable_file
+      JSON.parse(File.read(readable_file))
+    end
+
+    def build_book root, push=false
       remote = Diglossa::Remote.new(app_dir)
       data_dir = remote.config["data"]
       #puts "locales #{remote.config["locales"]}"
@@ -34,11 +82,13 @@ module Diglossa
       doc = fullname ? YAML.load_file(fullname) : "no .json or .yml file at #{root}"
       @nics = doc["authors"]
       @rpp = {}
-      @dbauthors = remote.author(doc["authors"])
+      @dbauthors = remote.author(doc["authors"]) rescue(return false) # return("no authors from server")
+      return false unless dbauthors
       @author_nic = root.split("/")[1].downcase
       #lang = root.split('/').first.downcase
       @locale = "ru"
       title = root.split("/").last # .gsub("_", " ")
+      title = false
       if push == "book"
         jsru = {isFolder:true, expand: true, children:[]}
         jsen = {isFolder:true, expand: true, children:[]}
@@ -47,13 +97,20 @@ module Diglossa
         end
         @locale = "en"
         traverse jsen, doc["tree"], root, title
-        [{type:"book", url:root.to_url, jstree:jsru, rpp:rpp, locale:"ru"},
-        {type:"book", url:root.to_url, jstree:jsen, rpp:rpp, locale:"en"}]
-      elsif push == "docs"
+        # traverse jsen, doc["tree"], root, title do |path|
+        #   parallels path # cause of rpp, alas
+        # end
+        ru = jsru[:title] ? {type:"book", url:root.to_url, jstree:jsru, rpp:rpp, locale:"ru"} : nil
+        en = jsen[:title] ? {type:"book", url:root.to_url, jstree:jsen, rpp:rpp, locale:"en"} : nil
+        # [{type:"book", url:root.to_url, jstree:jsru, rpp:rpp, locale:"ru"},
+        # {type:"book", url:root.to_url, jstree:jsen, rpp:rpp, locale:"en"}]
+        [ru, en]
+      elsif push == "texts"
         jsru = {url:root.to_url, isFolder:true, expand: true, children:[]}
         traverse jsru, doc["tree"], root, title do |path|
-          parallels path, true
+          parallels(path, true)
         end
+        return "texts pushed"
       elsif push == "warns"
         jsru = {url:root.to_url, isFolder:true, expand: true, children:[]}
         traverse jsru, doc["tree"], root, title do |path|
@@ -61,6 +118,12 @@ module Diglossa
         end
         warns
       end
+      #return true
+    end
+
+    def build_book_urls root
+      books = build_book root, "book"
+      books[0][:rpp].keys
     end
 
     private
@@ -72,39 +135,63 @@ module Diglossa
       return if File.directory?(dpath)
       @counter = []
       docs = []
+      coms = []
       nics.each do |nic|
         author = dbauthors.find{|a|a["nic"] == nic}
         fpath = "#{dpath}.#{nic}"
-        unless File.exist?(fpath)
+        unless File.readable?(fpath)
           warns[:file].push fpath
           next
         end
-        docs += paragraphs(fpath, path.to_url, nic, author["lang"], push)
+        docobj, comobj = paragraphs(fpath, path.to_url, nic, author["lang"])
+        docs += docobj
+        coms += comobj if comobj
       end
       if push
-        puts "pushing #{docs.size} - #{path}"
-        remote.texts_push path.to_url, nics, docs
+        comsize = coms ? coms.size : 0
+        puts "pushing path #{path} docs #{docs.size} coms #{comsize}"
+        remote.push_texts path.to_url, docs
+        remote.push_coms path.to_url, coms
       end
       # some stupid heuristique for rpp
       vol = docs.inject(0){|vol,doc| vol + doc[:text].size}
       rows_per_page = vol == 0 ? 25 : (10000*(docs.size)/vol).round
-      rpp[path.to_url] = rows_per_page #.to_s
+      rpp[path.to_url] = rows_per_page
 
       if (nics.size != counter.size) || (counter.uniq.size != 1)
         warns[:size].push "#{path} - #{counter.inspect}"
       end
     end
 
-    def paragraphs fpath, url, nic, lang, push
+    def paragraphs fpath, url, nic, lang
       docs = []
       lines = File.readlines fpath
       counter.push lines.size
       lines.each do |line|
         line.gsub!(/\s+/, " ").strip! #.gsub!("*", " *").gsub!(" /", "/")
         next if line.empty?
-          docs << {type:'text', url:url, nic:nic, lang:lang, text:line}
+        docs << {type:'text', url:url, nic:nic, lang:lang, text:line}
       end
       docs.each_with_index.map{|doc, index| doc[:pos] = index; doc}
+      return [docs] unless File.readable?("#{fpath}-com")
+      coms = []
+      comlines = File.readlines "#{fpath}-com"
+      comlines.each do |line|
+        line.gsub!(/\s+/, " ").strip!
+        x, anchor, comment = line.split(/(\*\d*) /)
+        next unless anchor
+        #puts "#{line.inspect}" unless anchor
+        #puts "a: #{anchor} => l: #{line}"
+        re_anchor = Regexp.new anchor.sub("*","\\*"), true
+        par = docs.detect{|doc| doc[:text].match(re_anchor)}
+        if par
+          pos = par[:pos]
+          coms << {type:'comment', url:url, nic:nic, lang:lang, pos:pos, anchor:anchor, text:comment}
+        else
+          warns[:fn] << "#{anchor} -> #{fpath}"
+        end
+      end
+      [docs, coms]
     end
 
     def parse_nics narrow = true, nics = nil
@@ -124,11 +211,14 @@ module Diglossa
       case doc
       when Hash
         hash = {}
-        if doc["title"] == title
+        #if doc["title"].gsub(" ","_") == title
+        unless title
           hash = jstree
           @nics = doc["authors"] if doc["authors"]
           hash["nics"] = parse_nics false
-          hash["title"] = doc[locale]
+          title = doc[locale]
+          return unless title
+          hash[:title] = title
         else
           path += "/#{doc["title"].gsub(" ","_")}"
           title = doc[locale]
@@ -136,7 +226,7 @@ module Diglossa
           authors = parse_nics nics
           dir = doc["children"].nil?
           hash = dir ? {url: path.to_url, title: title, nics: authors} : {url: path.to_url, title: title, isFolder: true, expand: true, children:[]}
-          jstree[:children].push hash unless doc["title"] == title
+          jstree[:children].push hash #unless doc["title"] == title
         end
         traverse(hash, doc["children"], path, title, &blk)
       when Array
@@ -146,42 +236,29 @@ module Diglossa
       end
     end
 
-    # def print_warns
-    #   unless warns_file.empty?
-    #     puts "NO FILE: " # тут непонятка - при отключении paragraphs выводятся warnings, что не нужно
-    #     pp warns_file
-    #   end
-    #   unless warns_size.empty?
-    #     puts "NON EQUAL SIZES: "
-    #     pp warns_size
-    #   end
-    # end
-
-
 
-
-    def json fname # это для блога
-      #
-      document = {}
-      puts "building DOC fname: #{fname}"
-      puts "APDIR.self #{self.app_dir}"
-      puts "APDIR #{app_dir}"
-      path = File.expand_path(File.join(app_dir, fname))
-      puts "path #{path}"
-      uuid = UUIDTools::UUID.sha1_create UUIDTools::UUID_DNS_NAMESPACE, "#{fname}"
-      puts "_ID = #{path} - #{uuid}"
-      lines = File.readlines path
-      lines.reject!{|c|c.empty? || c == "\n"}
-      document[:_id] = uuid.to_s
-      document[:title] = lines.shift.strip
-      document[:tags] = lines.shift.strip.split(/[[:punct:]]| /).reject!{|c|c.empty?}
-      #markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
-      #body = markdown.render lines.join("\n")
-      document[:body] = "body"
-      puts "----------"
-      pp document
-      document
-    end
+    # def json fname # это для блога
+    #   #
+    #   document = {}
+    #   puts "building DOC fname: #{fname}"
+    #   puts "APDIR.self #{self.app_dir}"
+    #   puts "APDIR #{app_dir}"
+    #   path = File.expand_path(File.join(app_dir, fname))
+    #   puts "path #{path}"
+    #   uuid = UUIDTools::UUID.sha1_create UUIDTools::UUID_DNS_NAMESPACE, "#{fname}"
+    #   puts "_ID = #{path} - #{uuid}"
+    #   lines = File.readlines path
+    #   lines.reject!{|c|c.empty? || c == "\n"}
+    #   document[:_id] = uuid.to_s
+    #   document[:title] = lines.shift.strip
+    #   document[:tags] = lines.shift.strip.split(/[[:punct:]]| /).reject!{|c|c.empty?}
+    #   #markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
+    #   #body = markdown.render lines.join("\n")
+    #   document[:body] = "body"
+    #   puts "----------"
+    #   pp document
+    #   document
+    # end
 
 
   end

data/lib/diglossa/remote.rb

@@ -25,7 +25,6 @@ module Diglossa
     # end
 
     def load_couchapprc
-      # тут есть теперь "data-dir", но она нужна в parse, а не здесь. Как загружать один раз эту хрень?
       @config ||= {}
       @config = JSON.parse(File.read(File.join(app_dir, '.couchapprc')))
       @config['couchapprc'] = JSON.parse(File.read(File.join(app_dir, '.couchapprc')))
@@ -41,10 +40,22 @@ module Diglossa
       end
     end
 
+    def get_id id
+      path = "#{db_url}/#{id}?include_docs=true"
+      response = RestClient.get path, :content_type => :json, :accept => :json #  rescue nil
+      return "no _id #{id}" unless response.code == 200
+      result = JSON.parse(response.body)
+      response.code == 200 ? result : nil
+    end
+
     def author(nic = "abelard")
+      # FIXME: для dbauthors нужен отдельный метод?
+      # gem needs authors info for building book-tree
       nics = nic.kind_of?(Array) ? nic : [nic]
-      path = "#{db_url}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"
-      response = RestClient.post path, {"keys"=> nics}.to_json, :content_type => :json, :accept => :json
+      #path = "#{db_url}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"
+      path = "http://diglossa.ru:5984/diglossa/_design/diglossa.coffee/_view/byAuthor?include_docs=true"
+      response = RestClient.post path, {"keys"=> nics}.to_json, :content_type => :json, :accept => :json rescue nil
+      return "no connection to diglossa.ru" unless response
       return "no authors with nics #{nics}" unless response.code == 200
       authors = JSON.parse(response.body)["rows"].map{|r|r['doc']}
       #pp authors
@@ -53,9 +64,12 @@ module Diglossa
 
     def push_docs docs
       docs = docs.kind_of?(Array) ? docs : [docs]
-      # http://stackoverflow.com/questions/4435538/ruby-rest-client-make-it-never-timeout
-      json = RestClient.post "#{db_url}/_bulk_docs", {"docs" => docs}.to_json, :content_type => :json, :accept => :json
-      JSON.parse(json)
+      docs.each_slice(1000) do |chunk|
+        json =RestClient.post "#{db_url}/_bulk_docs", {"docs" => chunk}.to_json, :content_type => :json, :accept => :json
+        JSON.parse(json)
+        puts "pushed #{chunk.size}"
+      end
+      true
     end
 
     def get_book url
@@ -77,46 +91,70 @@ module Diglossa
           book["_rev"] = dbbooks[index]["_rev"]
         end
       end
-      #pp books
       push_docs books
     end
 
-    def texts_get url
+    def get_texts url
       response = RestClient.get("#{db_url}/_design/diglossa.coffee/_view/byUrl?key=%22#{url}%22&include_docs=true")
       JSON.parse(response)['rows'].map{|r|r['doc']} || []
     end
 
-    def texts_delete url
-      dbdocs = texts_get url
+    def del_texts url
+      dbdocs = get_texts url
       return if dbdocs.empty?
       dbdocs.each{|doc|doc["_deleted"] = true}
       push_docs dbdocs
     end
 
-    def texts_push url, nics, docs
-      dbdocs = texts_get url
+    def push_texts url, docs
+      dbdocs = get_texts url
       if dbdocs.size == docs.size
         docs.each_with_index do |doc, index|
           doc["_id"] = dbdocs[index]["_id"]
           doc["_rev"] = dbdocs[index]["_rev"]
         end
       else
-        texts_delete url
+        del_texts url
       end
       push_docs docs
     end
 
-    def seeds(name = "authors", push = false)
-      path = "#{db_url}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"
-      response = RestClient.get "#{db_url}/_design/diglossa.coffee/_view/byAuthor?key=%22#{path.to_url}%22&include_docs=true", :content_type => :json, :accept => :json
-      #JSON.parse( RestClient.get( "#{Diglossa::DBD}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"))['rows'].map{|r|r['doc']} rescue nil
-      response = RestClient.post path, {"keys"=> nics}.to_json, :content_type => :json, :accept => :json
-      return "no authors with nics #{nics}" unless response.code == 200
-      authors = JSON.parse(response.body)["rows"].map{|r|r['doc']}
-      #pp authors
-      response.code == 200 ? authors : nil
+    def get_coms url
+      response = RestClient.get("#{db_url}/_design/diglossa.coffee/_view/comsByUrl?key=%22#{url}%22&include_docs=true")
+      JSON.parse(response)['rows'].map{|r|r['doc']} || []
+    end
+
+    def del_coms url
+      dbdocs = get_coms url
+      return if dbdocs.empty?
+      dbdocs.each{|doc|doc["_deleted"] = true}
+      push_docs dbdocs
     end
 
+    def push_coms url, docs
+      dbdocs = get_coms url
+      if dbdocs.size == docs.size
+        docs.each_with_index do |doc, index|
+          doc["_id"] = dbdocs[index]["_id"]
+          doc["_rev"] = dbdocs[index]["_rev"]
+        end
+      else
+        del_coms url
+      end
+      push_docs docs
+    end
+
+    # def seeds(name = "authors", push = false)
+    #   path = "#{db_url}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"
+    #   response = RestClient.get "#{db_url}/_design/diglossa.coffee/_view/byAuthor?key=%22#{path.to_url}%22&include_docs=true", :content_type => :json, :accept => :json
+    #   #JSON.parse( RestClient.get( "#{Diglossa::DBD}/_design/diglossa.coffee/_view/byAuthor?include_docs=true"))['rows'].map{|r|r['doc']} rescue nil
+    #   response = RestClient.post path, {"keys"=> nics}.to_json, :content_type => :json, :accept => :json
+    #   return "no authors with nics #{nics}" unless response.code == 200
+    #   authors = JSON.parse(response.body)["rows"].map{|r|r['doc']}
+    #   #pp authors
+    #   response.code == 200 ? authors : nil
+    # end
+
 
   end
 end

data/lib/diglossa/version.rb

@@ -1,3 +1,3 @@
 module Diglossa
-  VERSION = "0.2.24"
+  VERSION = "0.2.27"
 end

data/lib/diglossa.rb

@@ -9,5 +9,6 @@ end
 
 require "diglossa/classext"
 require 'diglossa/cli'
+#require 'diglossa/author'
 require 'diglossa/remote'
 require 'diglossa/parse'

data/nginx-last.conf

@@ -0,0 +1,201 @@
+worker_processes  10;
+
+#user michael;
+
+error_log   /var/log/nginx/error.log;
+
+events {
+	worker_connections  1024;
+}
+
+http {
+	proxy_temp_path /var/spool/nginx/tmp/proxy;
+	fastcgi_temp_path /var/spool/nginx/tmp/fastcgi;
+	client_body_temp_path /var/spool/nginx/tmp/client;
+
+	include       /etc/nginx/mime.types;
+	default_type  application/octet-stream;
+
+	sendfile  on;
+ 
+ 	gzip  on;
+	#types_hash_bucket_size 64;
+
+	# text/html don't need to be defined there, it always compressed
+	gzip_types text/plain text/css text/xml application/x-javascript application/atom+xml;
+	#gzip_types text/css text/xml application/x-javascript application/atom+xml;
+
+	# gzip_comp_level 9;
+
+
+
+	server {
+		#listen  localhost:80;
+		#isten  127.0.0.1:80;
+		#listen  ru.dig.loc:80;
+		#server_name ru.dig.loc en.dig.loc dev.dig.loc;
+		listen  195.54.209.42:80;
+		server_name ru.diglossa.org en.diglossa.org;
+
+                #rewrite  ^/js/(.*)$  /js/$1   last;
+                rewrite  ^/js/(.*)$  /diglossa/_design/diglossa.coffee/js/$1   last;
+                rewrite  ^/diglossa/(.*)$  /diglossa/$1   last;
+                rewrite  ^/css/(.*)$  /diglossa/_design/diglossa.coffee/css/$1   last;
+                rewrite  ^/templates/(.*)$  /diglossa/_design/diglossa.coffee/templates/$1   last;
+                rewrite  ^/_view/(.*)$  /diglossa/_design/diglossa.coffee/_view/$1   last;
+                rewrite  ^/(.*)$  /diglossa/_design/diglossa.coffee/_list/index/byUrl?key=%22$1%22&include_docs=true   last;
+
+	location / {
+ 	    proxy_pass http://127.0.0.1:5984;
+	    #proxy_redirect default;
+	    proxy_redirect off;
+            #proxy_set_header Accept-Encoding "";
+	    proxy_set_header   Host             $host;
+            proxy_set_header   X-Real-IP        $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            }
+	charset utf-8;
+	access_log  /var/log/nginx/diglossa.log;
+	}
+
+
+
+
+
+	# MAIN
+	server {
+		listen  195.54.209.42:80;
+		server_name ru1.diglossa.org en1.diglossa.org;
+
+	# location ~* ^.+\.(ogg|gz){
+	# 	 root /home/michael/web/diglossa.media/;
+	# }
+        # location ~* \.js$ {
+	#         #    # Some basic cache-control for static files to be sent to the browser
+	# 	expires max;
+	# 	add_header Pragma public;
+	# 	add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+	# 	root /home/michael/web/socadimo/diglossa.coffee;
+	# 	}
+	# 	#                                                               
+	location / {
+ 	    proxy_pass http://127.0.0.1:5984;
+	    #proxy_redirect default;
+            proxy_set_header Accept-Encoding "";
+	    proxy_set_header   Host             $host;
+            proxy_set_header   X-Real-IP        $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	    proxy_redirect off;
+	    }
+	charset utf-8;
+	access_log  /var/log/nginx/diglossa.log;
+	}
+
+
+	# DEVEL 
+	server {
+		listen  195.54.209.42:80;
+		server_name dev.diglossa.org;
+
+	# location ~* ^.+\.(ogg|gz){
+	# 	 root /home/michael/web/diglossa.media/;
+	# }
+        # location ~* \.js$ {
+	#         #    # Some basic cache-control for static files to be sent to the browser
+	# 	expires max;
+	# 	add_header Pragma public;
+	# 	add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+	# 	root /home/michael/web/diglossa.coffee;
+	# 	}
+	# 	#                                                               
+	location / {
+ 	    proxy_pass http://127.0.0.1:5984;
+	    #proxy_redirect default;
+            proxy_set_header Accept-Encoding "";
+	    proxy_set_header   Host             $host;
+            proxy_set_header   X-Real-IP        $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	    proxy_redirect off;
+	    }
+	charset utf-8;
+	access_log  /var/log/nginx/diglossa-coffee.log;
+	}
+
+
+# 	server {
+# 		listen 195.54.209.42:80;
+# 		server_name diglossa.org www.diglossa.org;
+# 	location /robots.txt {
+# 		 #alias /;
+# 		 #alias http://127.0.0.1:5984/diglossa/_design/diglossa/robots.txt;
+# 		 #root /diglossa/_design/diglossa;
+# 		 #root /;
+# 		 #rewrite ^/robots.txt$ /diglossa/_design/diglossa/robots.txt last;
+#  	    proxy_pass http://127.0.0.1:5984/diglossa/_design/diglossa/robots.txt;
+# 	    #proxy_redirect default;
+# 	    proxy_redirect off;
+# 	    #proxy_set_header   Host             $host;
+# 	    #proxy_set_header   X-Real-IP        $remote_addr;
+# 	}
+# 	location / {
+# 		rewrite ^/(.*)$ http://en.diglossa.org/$1 permanent;
+# 		}
+# 	}
+
+	server {
+		listen 195.54.209.42:80;
+		server_name diglossa.ru www.diglossa.ru;
+		rewrite ^/(.*)$ http://ru.diglossa.org/$1 permanent;
+	location / {
+		}
+	}
+	server {
+		listen 195.54.209.42:80;
+		server_name diglossa.org www.diglossa.org;
+		rewrite ^/(.*)$ http://en.diglossa.org/$1 permanent;
+	location / {
+		}
+	}
+
+
+ 	server {
+ 		listen  195.54.209.42:5984;
+ 		server_name diglossa.ru;
+	
+ 	location / {
+  	    proxy_pass http://127.0.0.1:5984/;
+	    proxy_redirect off;
+ 	}
+
+ 		access_log  /var/log/nginx/morpheus.log;
+ 	}
+
+
+	server {
+		listen  195.54.209.42:9001;
+		server_name diglossa.ru;
+
+	location / {
+ 	    proxy_pass http://127.0.0.1:9001/;
+ 	    #proxy_pass http://localhost:9001;
+	    proxy_redirect default;
+	    #proxy_redirect off;
+	    }
+	charset utf-8;
+	access_log  /var/log/nginx/morpheus.log;
+	}
+
+#  	server {
+#  		listen  195.54.209.42:9001;
+#  		server_name diglossa.ru;
+	
+#  	location / {
+#   	    proxy_pass http://127.0.0.1:9001/;
+# 	    proxy_redirect off;
+#  	}
+#  		access_log  /var/log/nginx/morpheus.log;
+#  	}
+
+
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diglossa
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -169,8 +185,10 @@ files:
 - README.md
 - Rakefile
 - bin/dg
+- bin/dg-author
 - diglossa.gemspec
 - lib/diglossa.rb
+- lib/diglossa/author.rb
 - lib/diglossa/classext.rb
 - lib/diglossa/cli.rb
 - lib/diglossa/parse.rb
@@ -179,6 +197,7 @@ files:
 - lib/diglossa/templates/blog/04-02-2013-blog
 - lib/diglossa/templates/couchapprc.erb
 - lib/diglossa/version.rb
+- nginx-last.conf
 - spec/spec_helper.rb
 homepage: ''
 licenses: []