hse 0.1.19 → 0.1.21

data/lib/hse/cli.rb

@@ -105,7 +105,7 @@ module Hse
     desc 'check [FILE]', 'check the correctness of module in FILE'
     def check(fname = 'default')
       doc = parse.build fname
-      if doc[:title].nil?
+      if doc[:ru].nil?
         say "error: title should be filled", :red
       elsif doc[:en].nil?
         say "error: English title should be filled", :red
@@ -133,13 +133,13 @@ module Hse
     desc 'push [FILE]', 'parse FILE, build json DOC and push DOC'
     def push(fname = false, env = 'default')
       doc = build fname
-      puts "BUILD DOC_ID = #{doc[:_id]}"
       revision = remote(env).get_doc_revision(doc)
       doc['_rev'] = revision if revision
       puts "rev ====== #{revision}"
-      post_body = JSON.generate doc
       puts "pushing document id #{doc[:_id]}"
-      remote(env).put(doc[:_id], post_body)
+      #post_body = JSON.generate doc
+      #remote(env).put(doc[:_id], post_body)
+      remote(env).push_docs doc
     end
 
     desc 'generate [APPDIR]', 'generates .couchapprc'
@@ -153,6 +153,11 @@ module Hse
       template('couchapprc.erb', '.couchapprc')
     end
 
+    desc 'version', 'print version'
+    def version
+      say Hse::VERSION
+    end
+
 
     private
 

data/lib/hse/parse.rb

@@ -8,8 +8,61 @@ module Hse
       #load_couchapprc
     end
 
-    def build fname
+    def readable path
+      fn = File.expand_path(File.join(app_dir, path))
+      puts "app_dir: #{app_dir}"
+      puts "readable: #{fn}"
+      File.readable?(fn) ? fn : false
+    end
+
+    def build path
+      readable_file = readable path
+      return false unless readable_file
+      doc = {type:"blog", body:""}
+      head = true
+      type = path.split("/").first.sub(/s$/,"")
+      return "path should start with posts or modules or events" unless %(post module event).include?(type)
+      doc[:type] = type
+      if type == "post"
+        time = Time.new
+        doc[:timestamp] = time.to_i #.strftime("%d/%m/%Y %H/%M/%S") # JS: "dd/MM/yyyy HH/mm/ss"
+        date = time.strftime("%d-%m-%Y")
+        doc[:date] = date
+      end
+      uuid = UUIDTools::UUID.sha1_create UUIDTools::UUID_DNS_NAMESPACE, path
+      doc[:_id] = uuid.to_s
+      lines = File.readlines readable_file
+      lines.each do |line|
+        line.strip!
+        next if line.empty?
+        if head && line.start_with?("---")
+          head = false
+          next
+        end
+        if head
+          parts = line.split(":")
+          key = parts[0].to_sym
+          val = parts[1..-1].join(":")
+          doc[key] = val.strip
+          next
+        end
+        line.gsub!("] (","](")
+        line += "\n\n"
+        doc[:body] += line
+      end
+      return "should be :ru, :en titles" unless doc[:en]
+      rawurl = doc[:en].split(":").first.gsub(" ", "-")
+      url = (type == "post") ? "#{date}-#{rawurl}" : rawurl
+      doc[:url] = url
+      doc
+    end
+
+    def build_ fname
       state = true
+      head = true
+      body = false
+      readable_file = readable path
+      return false unless readable_file
       document = {body:[], more:[]}
       type = fname.split("/").first.sub(/s$/,"")
       document[:type] = type
@@ -27,6 +80,11 @@ module Hse
       lines.each do |line|
         line.sub!("\n","").strip!
         next if line.empty?
+        if head && line.start_with?("---")
+          head = false
+          body = true
+          next
+        end
         if line.start_with? "."
           parts = line.split(":")
           key= parts.first

data/lib/hse/remote.rb

@@ -57,25 +57,35 @@ module Hse
     end
 
     def get_doc_revision doc
-      puts "getting current revision"
-      current = get_id doc
+      puts "getting current revision #{doc[:_id]}"
+      current = get_id doc[:_id] rescue nil
       if current
-        current_json = JSON.parse(current)
-        puts "current revision: #{current_json['_rev']}"
+        puts "current revision: #{current['_rev']}"
       end
-      current ? current_json['_rev'] : nil
+      current ? current['_rev'] : nil
     end
 
-    def put id, body = ""
-      path = "#{db_url}/#{id}"
-      puts "remote: PUT path #{path}"
-      puts "remote: PUT body: #{body[0..80]} ..."
-      #response = Typhoeus::Request.put(path, :body => body)
-      puts "PUT Response: #{response.code} #{response.body[0..200]}"
-      response
+    # def put id, body = ""
+    #   path = "#{db_url}/#{id}"
+    #   puts "remote: PUT path #{path}"
+    #   puts "remote: PUT body: #{body[0..80]} ..."
+    #   #response = Typhoeus::Request.put(path, :body => body)
+    #   puts "PUT Response: #{response.code} #{response.body[0..200]}"
+    #   response
+    # end
+
+    def push_docs docs
+      docs = docs.kind_of?(Array) ? docs : [docs]
+      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
 
 
 
+
   end
 end

data/lib/hse/version.rb

@@ -1,3 +1,3 @@
 module Hse
-  VERSION = "0.1.19"
+  VERSION = "0.1.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hse
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard