weight-recorder 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877da1c39f46b47849815309a9b92379a6489cbd
-  data.tar.gz: 19ed5f3143e47d7c055ec05a205fa41cddc9abcc
+  metadata.gz: 0f6944195147fc778f858c2ac0fd38b33d3164ae
+  data.tar.gz: 4c70a8b41f2f92e2bf9ea15456cb3c9ba26dbb57
 SHA512:
-  metadata.gz: 365f6b7df0047810ea16234d62c8691fada29fd58b418a7ece19f1707b8438086745a9a05950f8e0a0eb5a5dde5f6bf8089aa4d360c17501f7bb837029f39638
-  data.tar.gz: 1f86ec64faf7dde1bf1ea84904071ddcdaa2abc60eec62c76febaba5002be3c50b7fb70422109fb936f0d3d53a7492671c4f329ab1564a7c1d71f4f6cd470f10
+  metadata.gz: 2419a8349fc7f277510ba97dfdde77b3f83b1c174eba4ecdcf3db603837d8c359ffecc89a9462db7833e89c6c218ab1160a73513868816126e83db22ebefae51
+  data.tar.gz: a6ef9c191b2b3e6a5f21a3deeb52e44d0484ba06ba9f4c8e78aa705fe328ee351f8990528e90e5966e4886a45c07962ee8f33ebc0ca925d6a01d983a0fbb9db3

data/.yardopts

@@ -0,0 +1,2 @@
+-
+**/*.md

data/README.md

@@ -1,6 +1,6 @@
-# Recorder
+# Weight Recorder
 
-Recording values, spcifically weight and fat, and display chart
+Recording weight and fat, and display chart
 
 ## Installation
 
@@ -12,11 +12,15 @@ gem 'recorder'
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install recorder
+```
+$ gem install recorder
+```
 
 ## Usage
 
@@ -46,4 +50,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/daddyg
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,6 +1,52 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'yard'
+require "rake/testtask"
+require 'fileutils'
+p base_path = File.expand_path('..', __FILE__)
+p basename = File.basename(base_path)
+
+task :default do
+  system 'rake -T'
+end
+
+desc "make documents by yard"
+task :yard => [:hiki2md] do
+  YARD::Rake::YardocTask.new
+end
+
+desc "transfer hikis/*.hiki to wiki"
+task :hiki2md do
+  files = Dir.entries('hikis')
+  files.each{|file|
+    name=file.split('.')
+    case name[1]
+    when 'hiki'
+      p command="hiki2md hikis/#{name[0]}.hiki > #{basename}.wiki/#{name[0]}.md"
+      system command
+    when 'gif','png','pdf'
+      p command="cp hikis/#{file} #{basename}.wiki/#{file}"
+#      system command
+      FileUtils.cp("hikis/#{file}","#{basename}.wiki/#{file}",:verbose=>true)
+      FileUtils.cp("hikis/#{file}","doc/#{file}",:verbose=>true)
+    end
+  }
+  readme_en="#{basename}.wiki/README_en.md"
+  readme_ja="#{basename}.wiki/README_ja.md"
+  if File.exists?(readme_en)
+    FileUtils.cp(readme_en,"./README.md",:verbose=>true)  
+  elsif File.exists?(readme_ja)
+    FileUtils.cp(readme_ja,"./README.md",:verbose=>true)
+    FileUtils.cp(readme_ja,"#{basename}.wiki/Home.md",:verbose=>true)
+  end
+end
+
+desc "transfer hikis/*.hiki to latex"
+task :latex do
+  target = 'handout_sample'
+  command = "hiki2latex --pre latexes/handout_pre.tex hikis/#{target}.hiki > latexes/#{target}.tex"
+  system command
+  command = "open latexes/#{target}.tex"
+  system command
+end
 
-RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec

data/Rakefile.orig

@@ -0,0 +1,16 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+desc "transfer hikis/*.hiki to latex"
+task :latex do
+  target = 'handout_sample'
+  command = "hiki2latex --pre latexes/handout_pre.tex hikis/#{target}.hiki > latexes/#{target}.tex"
+  system command
+  command = "open latexes/#{target}.tex"
+  system command
+end
+
+

data/exe/weight-recorder

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "weight-recorder"
+require "recorder"
 
-WeightRecorder::Command.run(ARGV)
+Recorder::Command.run(ARGV)

data/hikis/README_en.hiki

@@ -0,0 +1,49 @@
+! Weight Recorder
+
+Recording weight and fat, and display chart
+
+!! Installation
+
+Add this line to your application's Gemfile:
+
+<<<ruby
+gem 'recorder'
+>>>
+
+And then execute:
+
+ $ bundle
+
+Or install it yourself as:
+
+ $ gem install recorder
+
+!! Usage
+
+<<<
+bundle exec exe/recorder --help
+Usage: recorder [-h|--help] [-v|--version] <command> [<args>]
+    -v, --version                    show program version
+    -h, --help                       Show this message
+
+recorder Available Commands:
+     create -w weight -b bodyfat              Create Data
+     update id -w weiht -b bodyfat -d date    Update Data
+     delete id                                Delete Data
+>>>
+
+!! Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec recorder` to use the gem in this directory, ignoring other installed copies of this gem.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [[rubygems.org|https://rubygems.org]].
+
+!! Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/daddygongon/recorder. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [[Contributor Covenant|http://contributor-covenant.org]] code of conduct.
+
+
+!! License
+
+The gem is available as open source under the terms of the [[MIT License|http://opensource.org/licenses/MIT]].
+

data/hikis/modify_db.hiki

@@ -0,0 +1,129 @@
+!概要
+
+後でsqliteのデータを追加したくなった時の対処法
+
+!記述
+当初のデータは
+<<< ruby
+bob% cat lib/recorder/db.rb
+#encoding: utf-8
+
+require 'fileutils'
+require 'active_record'
+
+module Recorder
+
+  module DB
+
+    def self.create_table_if_not_exists(path)
+      create_database_path path
+
+      connection = ActiveRecord::Base.connection
+
+      return if connection.table_exists?(:data)
+
+      connection.create_table :data do |d|
+        d.column :weight,  :real, null: false
+        d.column :bodyfat, :real, null: true
+        d.column :date, :text, null: true
+        d.timestamps
+      end
+      connection.add_index :data, :created_at
+      connection.add_index :data, :date
+
+    end
+
+  end
+end
+>>>
+であったが，memoを追加したくなった．
+
+ActiveRecordで動的に追加することも可能なようであるが，railsによるmigrationを用いたやり方しか見つけられなかった．そこで，sqliteを直接いじって，関連するcodeを修正することにした．
+
+! sqlite3
+!! tableの確認
+<<<
+bob% sqlite3 ~/.recorder/recorder.sqlite3
+SQLite version 3.8.10.2 2015-05-20 18:17:19
+Enter ".help" for usage hints.
+sqlite> .tables
+data
+sqlite> .headers ON
+sqlite> .mode columns
+sqlite> PRAGMA  table_info(data);
+cid         name        type        notnull     dflt_value  pk
+----------  ----------  ----------  ----------  ----------  ----------
+0           id          INTEGER     1                       1
+1           weight      real        1                       0
+2           bodyfat     real        0                       0
+3           date        text        0                       0
+4           created_at  datetime    1                       0
+5           updated_at  datetime    1                       0
+sqlite> SELECT type, name, tbl_name FROM sqlite_master WHERE type='index';
+type        name                      tbl_name  
+----------  ------------------------  ----------
+index       index_data_on_created_at  data      
+index       index_data_on_date        data      
+sqlite> .quit
+>>>
+
+! memoの追加
+
+ sqlite> alter table data add column memo text;
+
+で追加できる．
+
+以下は，確認も含めた一連のコマンド．
+<<<
+sqlite> .schema data
+CREATE TABLE "data" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "weight" real NOT NULL, "bodyfat" real, "date" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
+CREATE INDEX "index_data_on_created_at" ON "data" ("created_at");
+CREATE INDEX "index_data_on_date" ON "data" ("date");
+sqlite> alter table data add column memo text;
+sqlite> .schema data
+CREATE TABLE "data" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "weight" real NOT NULL, "bodyfat" real, "date" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, memo text);
+CREATE INDEX "index_data_on_created_at" ON "data" ("created_at");
+CREATE INDEX "index_data_on_date" ON "data" ("date");
+sqlite> PRAGMA  table_info(data);
+cid         name        type        notnull     dflt_value  pk        
+----------  ----------  ----------  ----------  ----------  ----------
+0           id          INTEGER     1                       1         
+1           weight      real        1                       0         
+2           bodyfat     real        0                       0         
+3           date        text        0                       0         
+4           created_at  datetime    1                       0         
+5           updated_at  datetime    1                       0         
+6           memo        text        0                       0         
+sqlite> .quit
+>>>
+
+! weight-recorderの修正
+以降の修正は，
+ bundle exec rackup
+で確認しながらすべき．
+!! lib/recorder/db.rb
+ 	d.column :memo, :text, null: true
+!! lib/application.rb
+<<< ruby
+        data.update_attributes!(
+                                weight: params[:weight],
+                                bodyfat: params[:bodyfat],
+                                date: params[:date],
+                                memo: params[:memo]
+                              )
+>>>
+
+!! lib/view/index.html
+以下を追加．
+<<<
+      %th Memo
+         %td= d.memo
+>>>
+
+!! lib/view/_form.haml
+<<<
+.control-group
+  %label.col-sm-2.control-label(for='memo') Memo
+  .col-sm-4
+    %input.form-control(name='memo' placehoder='' type='text'){value: @data.memo}
+>>>

data/latexes/handout_pre.tex

@@ -0,0 +1,11 @@
+\documentclass[10pt,a4j,twocolumn]{jsarticle}
+
+\usepackage[dvipdfmx]{graphicx}
+
+\setlength{\textheight}{275mm}
+\headheight 5mm
+\topmargin -30mm
+\textwidth 185mm
+\oddsidemargin -15mm
+\evensidemargin -15mm
+\pagestyle{empty}

data/lib/application.rb

@@ -50,7 +50,8 @@ module Recorder
         data.update_attributes!(
                                 weight: params[:weight],
                                 bodyfat: params[:bodyfat],
-                                date: params[:date]
+                                date: params[:date],
+                                memo: params[:memo]
                               )
         redirect '/'
       rescue ActiveRecord::RecordInvalid => e
@@ -64,7 +65,9 @@ module Recorder
         date0 = Time.now.strftime('%Y/%m/%d %H:%M')
         Data.create!(weight: params[:weight],
                      bodyfat: params[:bodyfat],
-                     date: date0)
+                     date: date0,
+                     memo: params[:memo]
+                     )
 
         redirect '/'
       rescue ActiveRecord::RecordInvalid => e

data/lib/recorder/db.rb

@@ -30,6 +30,7 @@ module Recorder
         d.column :weight,  :real, null: false
         d.column :bodyfat, :real, null: true
         d.column :date, :text, null: true
+        d.column :memo, :text, null: true
         d.timestamps
       end
       connection.add_index :data, :created_at

data/lib/recorder/version.rb

@@ -1,3 +1,3 @@
 module Recorder
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/views/_form.haml

@@ -10,4 +10,8 @@
   %label.col-sm-2.control-label(for='date') Date
   .col-sm-4
     %input.form-control(name='date' placehoder='' type='text'){value: @data.date}
+.control-group
+  %label.col-sm-2.control-label(for='memo') Memo
+  .col-sm-4
+    %input.form-control(name='memo' placehoder='' type='text'){value: @data.memo}
 

data/lib/views/index.haml

@@ -8,6 +8,7 @@
       %th BodyFat[%]
       %th Measuring Time
       %th Created Time
+      %th Memo
       %th(colspan=2) Action
   %tbody
     - @data.each do |d|
@@ -17,6 +18,7 @@
         %td= d.bodyfat
         %td= d.date
         %td= d.created_at.strftime('%Y/%m/%d %H:%M')
+        %td= d.memo
         %td
           %button{class: ('btn btn-default navbar-btn')}
             %a(class="glyphicon glyphicon-edit"){href: uri("/data/#{d.id}/edit")} edit

data/weight-recorder.gemspec

@@ -37,4 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard", "~> 0.8"
   spec.add_development_dependency "redcarpet", "~> 2.2"
+  spec.add_development_dependency "hiki2md"
+  spec.add_development_dependency "mathjax-yard"
+  spec.add_development_dependency "hiki2latex"
 end

data/weight-recorder.wiki/README_en.md

@@ -0,0 +1,52 @@
+# Weight Recorder
+
+Recording weight and fat, and display chart
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'recorder'
+```
+
+And then execute:
+
+```
+$ bundle
+```
+
+Or install it yourself as:
+
+```
+$ gem install recorder
+```
+
+## Usage
+
+```
+bundle exec exe/recorder --help
+Usage: recorder [-h|--help] [-v|--version] <command> [<args>]
+    -v, --version                    show program version
+    -h, --help                       Show this message
+
+recorder Available Commands:
+     create -w weight -b bodyfat              Create Data
+     update id -w weiht -b bodyfat -d date    Update Data
+     delete id                                Delete Data
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec recorder` to use the gem in this directory, ignoring other installed copies of this gem.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/daddygongon/recorder. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/weight-recorder.wiki/modify_db.md

@@ -0,0 +1,135 @@
+# 概要
+
+後でsqliteのデータを追加したくなった時の対処法
+
+# 記述
+当初のデータは
+```ruby
+bob% cat lib/recorder/db.rb
+#encoding: utf-8
+
+require 'fileutils'
+require 'active_record'
+
+module Recorder
+
+  module DB
+
+    def self.create_table_if_not_exists(path)
+      create_database_path path
+
+      connection = ActiveRecord::Base.connection
+
+      return if connection.table_exists?(:data)
+
+      connection.create_table :data do |d|
+        d.column :weight,  :real, null: false
+        d.column :bodyfat, :real, null: true
+        d.column :date, :text, null: true
+        d.timestamps
+      end
+      connection.add_index :data, :created_at
+      connection.add_index :data, :date
+
+    end
+
+  end
+end
+```
+であったが，memoを追加したくなった．
+
+ActiveRecordで動的に追加することも可能なようであるが，railsによるmigrationを用いたやり方しか見つけられなかった．そこで，sqliteを直接いじって，関連するcodeを修正することにした．
+
+# sqlite3
+## tableの確認
+```
+bob% sqlite3 ~/.recorder/recorder.sqlite3
+SQLite version 3.8.10.2 2015-05-20 18:17:19
+Enter ".help" for usage hints.
+sqlite> .tables
+data
+sqlite> .headers ON
+sqlite> .mode columns
+sqlite> PRAGMA  table_info(data);
+cid         name        type        notnull     dflt_value  pk
+----------  ----------  ----------  ----------  ----------  ----------
+0           id          INTEGER     1                       1
+1           weight      real        1                       0
+2           bodyfat     real        0                       0
+3           date        text        0                       0
+4           created_at  datetime    1                       0
+5           updated_at  datetime    1                       0
+sqlite> SELECT type, name, tbl_name FROM sqlite_master WHERE type='index';
+type        name                      tbl_name  
+----------  ------------------------  ----------
+index       index_data_on_created_at  data      
+index       index_data_on_date        data      
+sqlite> .quit
+```
+
+# memoの追加
+
+```
+sqlite> alter table data add column memo text;
+```
+
+で追加できる．
+
+以下は，確認も含めた一連のコマンド．
+```
+sqlite> .schema data
+CREATE TABLE "data" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "weight" real NOT NULL, "bodyfat" real, "date" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
+CREATE INDEX "index_data_on_created_at" ON "data" ("created_at");
+CREATE INDEX "index_data_on_date" ON "data" ("date");
+sqlite> alter table data add column memo text;
+sqlite> .schema data
+CREATE TABLE "data" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "weight" real NOT NULL, "bodyfat" real, "date" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, memo text);
+CREATE INDEX "index_data_on_created_at" ON "data" ("created_at");
+CREATE INDEX "index_data_on_date" ON "data" ("date");
+sqlite> PRAGMA  table_info(data);
+cid         name        type        notnull     dflt_value  pk        
+----------  ----------  ----------  ----------  ----------  ----------
+0           id          INTEGER     1                       1         
+1           weight      real        1                       0         
+2           bodyfat     real        0                       0         
+3           date        text        0                       0         
+4           created_at  datetime    1                       0         
+5           updated_at  datetime    1                       0         
+6           memo        text        0                       0         
+sqlite> .quit
+```
+
+# weight-recorderの修正
+以降の修正は，
+```
+bundle exec rackup
+```
+で確認しながらすべき．
+## lib/recorder/db.rb
+```
+d.column :memo, :text, null: true
+```
+## lib/application.rb
+```ruby
+        data.update_attributes!(
+                                weight: params[:weight],
+                                bodyfat: params[:bodyfat],
+                                date: params[:date],
+                                memo: params[:memo]
+                              )
+```
+
+## lib/view/index.html
+以下を追加．
+```
+      %th Memo
+         %td= d.memo
+```
+
+## lib/view/_form.haml
+```
+.control-group
+  %label.col-sm-2.control-label(for='memo') Memo
+  .col-sm-4
+    %input.form-control(name='memo' placehoder='' type='text'){value: @data.memo}
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weight-recorder
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: hiki2md
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mathjax-yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hiki2latex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Recording weight and fat, and display chart
 email:
 - shigeto_nishitani@me.com
@@ -162,16 +204,21 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Rakefile.orig
 - bin/console
 - bin/setup
 - config.ru
 - exe/recorder
 - exe/weight-recorder
+- hikis/README_en.hiki
+- hikis/modify_db.hiki
+- latexes/handout_pre.tex
 - lib/application.rb
 - lib/public/chartkick.js
 - lib/public/css/bootstrap-theme.css
@@ -205,6 +252,8 @@ files:
 - lib/views/layout.haml
 - lib/views/new.haml
 - weight-recorder.gemspec
+- weight-recorder.wiki/README_en.md
+- weight-recorder.wiki/modify_db.md
 homepage: ''
 licenses:
 - MIT