law-japan 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35013c851c57f4a9463eae7dd4edc48414ad4bb5
-  data.tar.gz: cfa5e29eb1a5e8f36474b8dda4d3e259e324fdbd
+  metadata.gz: 5e20792ff38fdcd20a8852d256e7b1d704ba28ef
+  data.tar.gz: 58d5cd169c6cbbb82fd1ed9c795895bc469451b7
 SHA512:
-  metadata.gz: 0f8f6bae3c58f198213337f344b3a4f8d0c3c215a1f5eb2e1718f1ecd0a8fab120fa4c7d9b1f1c7a08629ec279105111a468bcdea6af4e1a56ac1f91648e4b6b
-  data.tar.gz: b75ce8cc1fe7f348bc659836f250f96fc288d2fe8474f366ec8de1324468b808e578b16d48730b7fa59c46190bf1b861a2528f07f74913b2e10575c5e41e27dd
+  metadata.gz: f5abdf09ecda9d49492ce30c434b81a0a43e3e81237eb42a67732dc6437dd50e836b19323380a42354f767feacd829dca9359a52ca507981ef8120a106f9b7d9
+  data.tar.gz: f700e710471e50d18dcea55c20a451a232e04d3816889310337d0c82d10acc460def9cdbbe67bde857ca8539ad56945ce3da30745f92e52a381410e2e17bc753

data/bin/law-japan

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require "law/japan"
+require "law/japan/cli"
+
+Law::Japan::CLI.start(ARGV)

data/law-japan.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "git"
+  spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "mechanize"
-  spec.add_development_dependency "nokogiri"
 end

data/lib/law/japan.rb

@@ -2,7 +2,7 @@ require "law/japan/version"
 
 module Law
   module Japan
-    # Your code goes here...
+    HomeDir = File.join(Dir.home, ".law-japan")
   end
 end
 

data/lib/law/japan/cli.rb

@@ -0,0 +1,17 @@
+require "law/japan"
+
+require "thor"
+
+class Law::Japan::CLI < Thor
+  desc "install", "Install git repo"
+  def install
+    e_gov = Law::Japan::EGov::CLI.new
+    e_gov.install
+  end
+
+  desc "update", "Pull the latest data"
+  def update
+    e_gov = Law::Japan::EGov::CLI.new
+    e_gov.pull
+  end
+end

data/lib/law/japan/e_gov.rb

@@ -1,55 +1,22 @@
 require "law/japan"
+require "law/japan/git"
 
-require "git"
 require "logger"
 
 class Law::Japan::EGov
-  SourceDir = File.join(Dir.home, ".law-japan")
+  include Law::Japan::Git
 
-  HtmlRepoURL = "git@github.com:riywo/law-japan-e_gov-html.git"
-  TextRepoURL = "git@github.com:riywo/law-japan-e_gov-text.git"
+  HomeDir = File.join(Law::Japan::HomeDir, "e_gov")
+  RepoDir = File.join(HomeDir, "repo")
+  RepoURL = "https://github.com/riywo/law-japan-e_gov-text.git"
 
-  def initialize
-    FileUtils.mkdir_p SourceDir
+  def initialize(repo_dir: nil, repo_url: nil, logger: nil)
+    @repo_dir = repo_dir || RepoDir
+    @repo_url = repo_url || RepoURL
+    @logger   = logger   || Logger.new(STDOUT)
   end
 
-  def update!
-    html_git.pull
-    text_git.pull
-  end
-
-  def download!
-    Downloader.new(html_data_dir).download!
-  end
-
-  def convert!
-    Converter.new(html_data_dir, text_data_dir).convert!
-  end
-
-  private
-
-  def html_data_dir
-    File.join(html_git.dir.path, "data")
-  end
-
-  def text_data_dir
-    File.join(text_git.dir.path, "data")
-  end
-
-  def git_open_or_clone(repo_url, name)
-    Git.open(File.join(SourceDir, name), log: Logger.new(STDOUT))
-  rescue
-    Git.clone(repo_url, name, path: SourceDir, log: Logger.new(STDOUT))
-  end
-
-  def html_git
-    @html_git ||= git_open_or_clone(HtmlRepoURL, "html")
-  end
-
-  def text_git
-    @text_git ||= git_open_or_clone(TextRepoURL, "text")
+  class CLI < Law::Japan::EGov
+    include Law::Japan::Git::CLI
   end
 end
-
-require "law/japan/e_gov/downloader"
-require "law/japan/e_gov/converter"

data/lib/law/japan/git.rb

@@ -0,0 +1,54 @@
+require "law/japan"
+
+require "git"
+
+module Law::Japan::Git
+  def data_dir
+    @data_dir ||= File.join(git.dir.path, "data")
+  end
+
+  private
+
+  def git
+    unless @git
+      begin
+        @git ||= ::Git.open(repo_dir, log: logger)
+      rescue ArgumentError
+        raise "#{repo_dir} has not been ready yet"
+      end
+
+      origin_url = @git.remote("origin").url
+      if origin_url != repo_url
+        raise "origin url(#{origin_url}) must be #{repo_url}"
+      end
+    end
+    @git
+  end
+
+  def repo_dir
+    @repo_dir
+  end
+
+  def repo_url
+    @repo_url
+  end
+
+  def logger
+    @logger
+  end
+
+  module CLI
+    def install
+      FileUtils.rm_rf(repo_dir)
+
+      name = File.basename(repo_dir)
+      path = File.dirname(repo_dir)
+      FileUtils.mkdir_p(path)
+      ::Git.clone(repo_url, name, path: path)
+    end
+
+    def pull
+      git.pull
+    end
+  end
+end

data/lib/law/japan/version.rb

@@ -1,5 +1,5 @@
 module Law
   module Japan
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: law-japan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryosuke IWANAGA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -25,27 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +83,8 @@ dependencies:
 description: This is a library for Japanese laws
 email:
 - riywo.jp@gmail.com
-executables: []
+executables:
+- law-japan
 extensions: []
 extra_rdoc_files: []
 files:
@@ -107,11 +94,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/law-japan
 - law-japan.gemspec
 - lib/law/japan.rb
+- lib/law/japan/cli.rb
 - lib/law/japan/e_gov.rb
-- lib/law/japan/e_gov/converter.rb
-- lib/law/japan/e_gov/downloader.rb
+- lib/law/japan/git.rb
 - lib/law/japan/version.rb
 homepage: https://github.com/riywo/law-japan
 licenses:

data/lib/law/japan/e_gov/converter.rb

@@ -1,45 +0,0 @@
-require "law/japan/e_gov"
-require "find"
-require "nokogiri"
-require "logger"
-
-class Law::Japan::EGov::Converter
-  attr_reader :html_dir, :text_dir
-
-  def initialize(html_dir, text_dir)
-    @html_dir = html_dir
-    @text_dir = text_dir
-  end
-
-  def convert!
-    logger.info "Start converting all laws"
-    convert
-    logger.info "Finish converting all laws"
-  end
-
-  private
-
-  def logger
-    @logger ||= Logger.new STDOUT
-  end
-
-  def convert
-    Dir.chdir(html_dir) do
-      Dir.glob(File.join("**", "*.html")) do |path|
-        convert_html(path)
-      end
-    end
-  end
-
-  def convert_html(path)
-    dirname = File.dirname(path)
-    basename = File.basename(path, ".html")
-    target_dir = File.join(text_dir, dirname)
-    target_file = File.join(target_dir, "#{basename}.txt")
-    logger.info "Converting to #{target_file}"
-
-    FileUtils.mkdir_p target_dir
-    text = Nokogiri::HTML(open(path)).css("body").first.text
-    File.write(target_file, text)
-  end
-end

data/lib/law/japan/e_gov/downloader.rb

@@ -1,75 +0,0 @@
-require "law/japan/e_gov"
-require "mechanize"
-
-class Law::Japan::EGov::Downloader
-  module Mechanize::Form::Clearable
-    refine Mechanize::Form do
-      def clear_buttons
-        @clicked_buttons = []
-      end
-    end
-  end
-  using Mechanize::Form::Clearable
-
-  attr_reader :root_dir
-  def initialize(root_dir)
-    @root_dir = root_dir
-  end
-
-  def download!
-    logger.info "Start downloading all laws"
-    download
-    logger.info "Finish downloading all laws"
-  end
-
-  private
-
-  def logger
-    @logger ||= Logger.new STDOUT
-  end
-
-  def agent
-    unless @agent
-      @agent = Mechanize.new { |a| a.user_agent_alias = "Windows IE 9" }
-      @agent.log = Logger.new STDOUT
-    end
-    @agent
-  end
-
-  def index_page
-    @index_page ||= agent.get("http://law.e-gov.go.jp/cgi-bin/idxsearch.cgi")
-  end
-
-  def category_form
-    index_page.forms_with(name: "index")[2]
-  end
-
-  def download
-    category_form.buttons.each do |button|
-      category_name = button.node.next.text.gsub(/[ 　]+/, "")
-
-      category_form.clear_buttons
-      list_page = agent.submit(category_form, button)
-      sleep 1
-
-      list_page.links.each do |link|
-        law_name = link.text
-        h_file_name = CGI.parse(link.uri.query)["H_FILE_NAME"].first
-        if h_file_name =~ /^([MTSH]\d{2})/
-          law_url = "http://law.e-gov.go.jp/htmldata/#{$1}/#{h_file_name}.html"
-          law_file = File.join(root_dir, category_name, "#{h_file_name}.html")
-          if File.exists? law_file
-            logger.info "File already exists for #{law_name} (#{law_file})"
-          else
-            logger.info "Start downloading for #{law_name} (url: #{law_url}, file: #{law_file})"
-             agent.download(law_url, law_file)
-            logger.info "Finish downloading for #{law_name} (url: #{law_url}, file: #{law_file})"
-             sleep 2
-          end
-        else
-          logger.warn "Invalid H_FILE_NAME #{h_file_name} for #{law_file}"
-        end
-      end
-    end
-  end
-end