yinx_st.rb in yinx_st-0.1.4

- old
+ new
@@ -1,83 +1,115 @@
 require "yinx_st/version"
 require 'yinx'
 require 'yinx_sql'
-require 'my_chart'
 require 'time_seq'
 
 require 'yinx_st/note_meta'
 require 'yinx_st/batches'
 
+require 'my_chartkick'
+
 module YinxSt
   class << self
+
+    attr_reader :chart
+
     def fetch *args
       Yinx::SQL.connect(*args)
       self
     end
 
     def last_n_days n
       batches = Batches.new(n + 1)
       duration = "最近#{n}日"
 
-      @chart = MyChart.js do
-        material batches.all_notes
-        material batches.unwind_tags, name: :unwind_tags
+      time_line = batches.time_line
 
-        select :yesterday do |note|
-          note.dump_id == batches.latest_id
-        end
+      all = batches.all_notes
+      unwind_tags = batches.unwind_tags
 
-        select :yesterday, from: :unwind_tags do |note|
-          note.dump_id == batches.latest_id
-        end
+      yesterday = all.select{|note| note.dump_id == batches.latest_id}
+      yesterday_unwind_tags = unwind_tags.select{|note| note.dump_id == batches.latest_id}
 
-        select :changed_content do |note|
-          note.status != :remained
-        end
+      changed_content = all.select{|note| note.status != :remained}
+      moved_book = all.select &:moved_book?
+      changed_tags = all.select &:changed_tags?
 
-        select :moved_book do |note|
-          note.moved_book?
-        end
+      @chart = MyChartkick.bundle do |s|
+        s.my_line_chart all,
+          title: "#{duration}总数变化",
+          x: :dump_day,
+          min: 2400,
+          asc: :key,
+          last: n
 
-        select :changed_tags do |note|
-          note.changed_tags?
-        end
+        s.my_line_chart changed_content,
+          title: "#{duration}新建/修改/删除",
+          x: :dump_day, y: :status,
+          keys: time_line,
+          asc: :key,
+          last: n
 
-        group_by :stack_book do |note|
-          stack = note.stack.nil? ? '' : "#{note.stack}/"
-          "#{stack}#{note.book}"
-        end
+        s.my_line_chart moved_book,
+          title: "#{duration}移动笔记本",
+          x: :dump_day,
+          keys: time_line,
+          asc: :key,
+          last: n
 
-        group_by(:stack){|note| note.stack or 'NO_STACK'}
+        s.my_line_chart changed_tags,
+          title: "#{duration}更改标签",
+          x: :dump_day,
+          keys: time_line,
+          asc: :key,
+          last: n
 
-        group_by :number_of_tags do |note|
-          note.tags.count
-        end
+        s.my_column_chart yesterday,
+          title: "目前最大的10个笔记本",
+          x: :stack_book,
+          desc: :count,
+          first: 10
 
-        plainBar :dump_day, name: "#{duration}总数变化", w: 1000, h:240, asc: :key, last: n
-        line :dump_day, :status, name: "#{duration}新建/修改/删除", from: :changed_content, w: 1000, h:240, asc: :key, keys: batches.time_line, last: n
-        line :dump_day, name: "#{duration}移动笔记本", from: :moved_book, w: 1000, h:240, asc: :key, keys: batches.time_line, last: n
-        line :dump_day, name: "#{duration}更改标签", from: :changed_tags, w: 1000, h:240, asc: :key, keys: batches.time_line, last: n
+        s.my_line_chart all,
+          title: "#{duration}笔记本体积变化",
+          x: :dump_day, y: :stack_book,
+          asc: :key,
+          height: '540px',
+          last: n
 
-        bar :stack_book, name: '目前最大的10个笔记本', from: :yesterday, w:1400 ,h: 540, desc: :count, first: 10
-        line :dump_day, :stack_book, name: "#{duration}笔记本体积变化", w: 1200, h:540, asc: :key, keys: batches.time_line, last: n
+        s.my_column_chart yesterday,
+          title: "目前最大的10个笔记本组",
+          x: :stack_name,
+          desc: :count,
+          first: 10
 
-        bar :stack, name: '目前最大的10个笔记本组', from: :yesterday, w:1400 ,h: 240, desc: :count, first: 10
-        line :dump_day, :stack, name: "#{duration}笔记本组体积变化", w: 1000, h:340, asc: :key, keys: batches.time_line, last: n
+        s.my_line_chart all,
+          title: "#{duration}笔记本组体积变化",
+          x: :dump_day, y: :stack_name,
+          asc: :key,
+          last: n
 
-        pie :tags, name: '目前使用最多的15个标签', from: :yesterday__from__unwind_tags, w:1400 ,h: 340, desc: :count, first: 15
-        bar :number_of_tags, name: '目前每篇笔记的标签数', from: :yesterday, w: 800, h: 240, asc: :key
-        line :dump_day, :tags, name: "#{duration}标签数变化", from: :unwind_tags, w: 1400, h:740, asc: :key, keys: batches.time_line, last: n
+        s.my_pie_chart yesterday_unwind_tags,
+          title: "目前使用最多的15个标签",
+          x: :tags,
+          desc: :count,
+          first: 15
 
+        s.my_column_chart yesterday,
+          title: "目前每篇笔记的标签数",
+          x: :tags_count,
+          asc: :key
+
+        s.my_line_chart unwind_tags,
+          title: "#{duration}标签数变化",
+          x: :dump_day, y: :tags,
+          asc: :key,
+          height: '740px',
+          last: n
+
       end
 
-      self
     end
 
-    attr_reader :chart
 
-    def generate_html(erb_file=File.expand_path('../yinx_st/chart.erb', __FILE__))
-      template = File.read erb_file
-      html = ERB.new(template).result(binding)
-    end
   end
 end