yinx_st 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3d3d186fa2bba07b7314e6195b19a5df87ead5
-  data.tar.gz: 848bc6578b833a3ffa8267b17b81691a7e51c8a7
+  metadata.gz: 0b0deeefba377acfcc34856ffa6bd7ad58903312
+  data.tar.gz: 6dd56be4c22f6df1d08d2d88f3ca59aa70087d74
 SHA512:
-  metadata.gz: 1bd84662616f72ac877bc53241d3148fd7304169f08089d1b66037b78a7e1e19f97e1278a228a392645e78d870871e922d1f1d8cdcebf6c84a4893adc92348a1
-  data.tar.gz: f29e77e31b6d1c49a2d6c8abf3fdaeb56ce86d666403adc839308f6bfbb81767b80fb484c677994d0e9cbe4e5fb86f2e88c72a767b27d22e8378e03a469cfd3e
+  metadata.gz: 0b77671dea7ef76537d791d3b253766aeb5b0b7ef233261d085b2b6394edc54a7484f86297f4eb384130484892dc6477c9e8d8a0bc934fb39d22e51ea339af7c
+  data.tar.gz: 805f5f49cb9423bc8dd57c82bac8efef126cbbe14425c9b3d56d55685b5d20ed3dd2e361dd981aa6d56f42c2836269acacdb2e6dd2c0dc7019fe7d8676641c40

data/lib/yinx_st/note_meta.rb

@@ -38,4 +38,16 @@ class Yinx::NoteMeta
     prev_version and prev_version.tags.sort != self.tags.sort
   end
 
+  def stack_book
+    st = stack.nil? ? '' : "#{stack}/"
+    "#{st}#{book}"
+  end
+
+  def stack_name
+    stack ? stack : 'No Stack'
+  end
+
+  def tags_count
+    tags.count
+  end
 end

data/lib/yinx_st/version.rb

@@ -1,3 +1,3 @@
 module YinxSt
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/yinx_st.rb

@@ -1,14 +1,18 @@
 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
@@ -18,66 +22,94 @@ module YinxSt
       batches = Batches.new(n + 1)
       duration = "最近#{n}日"
 
-      @chart = MyChart.js do
-        material batches.all_notes
-        material batches.unwind_tags, name: :unwind_tags
-
-        select :yesterday do |note|
-          note.dump_id == batches.latest_id
-        end
-
-        select :yesterday, from: :unwind_tags do |note|
-          note.dump_id == batches.latest_id
-        end
-
-        select :changed_content do |note|
-          note.status != :remained
-        end
-
-        select :moved_book do |note|
-          note.moved_book?
-        end
-
-        select :changed_tags do |note|
-          note.changed_tags?
-        end
-
-        group_by :stack_book do |note|
-          stack = note.stack.nil? ? '' : "#{note.stack}/"
-          "#{stack}#{note.book}"
-        end
-
-        group_by(:stack){|note| note.stack or 'NO_STACK'}
-
-        group_by :number_of_tags do |note|
-          note.tags.count
-        end
-
-        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
-
-        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
-
-        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
-
-        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
+      time_line = batches.time_line
+
+      all = batches.all_notes
+      unwind_tags = batches.unwind_tags
+
+      yesterday = all.select{|note| note.dump_id == batches.latest_id}
+      yesterday_unwind_tags = unwind_tags.select{|note| note.dump_id == batches.latest_id}
+
+      changed_content = all.select{|note| note.status != :remained}
+      moved_book = all.select &:moved_book?
+      changed_tags = all.select &:changed_tags?
+
+      @chart = MyChartkick.bundle do |s|
+        s.my_line_chart all,
+          title: "#{duration}总数变化",
+          x: :dump_day,
+          min: 2400,
+          asc: :key,
+          last: n
+
+        s.my_line_chart changed_content,
+          title: "#{duration}新建/修改/删除",
+          x: :dump_day, y: :status,
+          keys: time_line,
+          asc: :key,
+          last: n
+
+        s.my_line_chart moved_book,
+          title: "#{duration}移动笔记本",
+          x: :dump_day,
+          keys: time_line,
+          asc: :key,
+          last: n
+
+        s.my_line_chart changed_tags,
+          title: "#{duration}更改标签",
+          x: :dump_day,
+          keys: time_line,
+          asc: :key,
+          last: n
+
+        s.my_column_chart yesterday,
+          title: "目前最大的10个笔记本",
+          x: :stack_book,
+          desc: :count,
+          first: 10
+
+        s.my_line_chart all,
+          title: "#{duration}笔记本体积变化",
+          x: :dump_day, y: :stack_book,
+          asc: :key,
+          height: '540px',
+          last: n
+
+        s.my_column_chart yesterday,
+          title: "目前最大的10个笔记本组",
+          x: :stack_name,
+          desc: :count,
+          first: 10
+
+        s.my_line_chart all,
+          title: "#{duration}笔记本组体积变化",
+          x: :dump_day, y: :stack_name,
+          asc: :key,
+          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

data/yinx_st.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "yinx", "~> 0.1.0"
   spec.add_dependency "yinx_sql", "~> 0.1.2"
-  spec.add_dependency "my_chart", "~> 0.1.0"
+  spec.add_dependency "my_chartkick", "~> 0.1.0"
   spec.add_dependency "time_seq", "~> 0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yinx_st
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: my_chart
+  name: my_chartkick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"