slaw 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ad1ae5e3d2aadfcf89800d91f16f0c0b38620f
-  data.tar.gz: c93431db28804db785afda0dae9684bad5a62dbd
+  metadata.gz: 017be61dfca724d0875193ce8043557300bb1a45
+  data.tar.gz: b42b32a4e9eb80761b856e343d0c2c278c934adb
 SHA512:
-  metadata.gz: 2a0881b4ba4225943bd4b491f7385ba7b70125301c0aed149f70144991c1fec5ee3bdee49d56123848abecd94fd6c9b73f06c15ca66b00e08e50d46dada2f6b3
-  data.tar.gz: fa04f689a4a136067fe4b22961d6d6b5597ded5807cddb2b9fa7e620a25982ef31ed830e50df8a30e62300b3e51c79df5478020d74a391262981a41d50ae1311
+  metadata.gz: b2654b2c2242caff29794f601bfcccd8b6898ed1879e0ccf35bbdebfc3ed511bf68cbf2d5ad63eb4c6b3c898cbe9674686c1e4233198aa4e8ae85192ac6c63d1
+  data.tar.gz: ffd5e6fa31da9d4fb9c3766fcd850994418a108fb364eac9eab873b394ea0c9ba50c039deeffd5abd94eeeee7c5068c4399faf8503006d4795aa3a5990e33528

data/README.md

@@ -31,12 +31,16 @@ Or install it with:
 To run PDF extraction you will also need [xpdf](http://www.foolabs.com/xpdf/) and
 If you're on a Mac, you can use:
 
-    brew install xpdf
+    $ brew install xpdf
 
 You may also need Ghostscript to remove password protection from PDF files. This is
 installed by default on most systems (including Mac). On Ubuntu you can use:
 
-    sudo apt-get install ghostscript
+    $ sudo apt-get install ghostscript
+
+The simplest way to use Slaw is via the commandline:
+
+    $ slaw convert myfile.pdf
 
 ## Overview
 

data/bin/slaw

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+require 'slaw'
+
+class SlawCLI < Thor
+  desc "convert FILE", "convert FILE into Akoma Ntoso XML"
+  option :input, enum: ['text', 'pdf'], desc: "Type of input, determined by file extension by default."
+  option :output, enum: ['text', 'xml'], default: 'xml', desc: "Type of output required."
+
+  # TODO: support different grammars and locales
+
+  def convert(name)
+    extractor = Slaw::Extract::Extractor.new
+
+    case options[:input]
+    when 'pdf'
+      text = extractor.extract_from_pdf(name)
+    when 'text'
+      text = extractor.extract_from_text(name)
+    else
+      text = extractor.extract_from_file(name)
+    end
+
+    case options[:output]
+    when 'text'
+      puts text
+    when 'xml'
+      generator = Slaw::ZA::BylawGenerator.new
+      bylaw = generator.generate_from_text(text)
+      puts bylaw.to_xml(indent: 2)
+    end
+  end
+end
+
+SlawCLI.start(ARGV)

data/lib/slaw/parse/builder.rb

@@ -85,9 +85,9 @@ module Slaw
         logger.info("Parsed!")
 
         if tree.nil?
-          raise Slaw::Parse::ParseError.new(parser.failure_reason || "Couldn't match to grammar",
-                                            line: parser.failure_line || 0,
-                                            column: parser.failure_column || 0)
+          raise Slaw::Parse::ParseError.new(@parser.failure_reason || "Couldn't match to grammar",
+                                            line: @parser.failure_line || 0,
+                                            column: @parser.failure_column || 0)
         end
 
         tree

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

data/slaw.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "treetop", "~> 1.5"
   spec.add_runtime_dependency "builder", "~> 3.2.2"
   spec.add_runtime_dependency "log4r", "~> 1.1.10"
+  spec.add_runtime_dependency "thor", "~> 0.19.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,11 +108,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 description: Slaw is a lightweight library for rendering and generating Akoma Ntoso
   acts from plain text and PDF documents.
 email:
 - greg@kempe.net
-executables: []
+executables:
+- slaw
 extensions: []
 extra_rdoc_files: []
 files:
@@ -122,6 +137,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/slaw
 - lib/slaw.rb
 - lib/slaw/act.rb
 - lib/slaw/bylaw.rb
@@ -175,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A lightweight library for using Akoma Ntoso acts in Ruby.