flex-station-data 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6814ca0e722e1da44873ec3cd5571864984f028be6bb098a548dc6b5a21af430
-  data.tar.gz: cf535779a83284369d3a406590edd9a055e53cbc24fdcb49384f8445e829f170
+  metadata.gz: 1763fb10b625dcca4d933df8282802bc385298724270981ce178cd8bc8ff61f5
+  data.tar.gz: 27a12f5bbe2ecedc562b8c710b2211a74ab02c7b5fb4e02a9c7be3017df647bd
 SHA512:
-  metadata.gz: 1ca3cbaa108a9bc868da418ad3c8393508b3ebe8e20db5a1a16427e5426981c07f3232329c3469f61cb2694feb08c8ded37225ed47af7dc0544b8c65941c6a68
-  data.tar.gz: dc49217f185e779075f9f11aa7f2ec85cf958d18644383fdb01ea7827cdce64ab5c5aead16ee3c4148b82a9377de2ef71eaf47497e61e6b9323ff2a20a7b29e4
+  metadata.gz: e4a73af64d380f23083a029a87592074f99fdc88b83235111815687915423fccd05949a8354d13ed6ad546f60f22aa96a1cd68771ab564e1930889c9cd0c0c9c
+  data.tar.gz: c508621a8a1b89770dac4fdf2b5ab2bb897020f4c25128b3b721433a667a21acc24750627a5acefc48a09900ba13282808e396310e0dfb36c1a090e962ba500c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.1
+
+* Miscellaneous refactoring.
+
 # 1.0.0
 
 * Removed option for sample data report and verbose linear regression report.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flex-station-data (1.0.0)
+    flex-station-data (1.0.1)
       activesupport
       linefit
 

data/bin/flex-station

@@ -1,16 +1,37 @@
 #!/usr/bin/env ruby
 
 require "pathname"
+require "flex_station_data/concerns/callable"
 
-case command = ARGV.first
-when "sample-data"
-  system(Pathname(__dir__).join("flex-station-sample-data").to_path, *ARGV.drop(1))
-when "linear-regression"
-  system(Pathname(__dir__).join("flex-station-linear-regression").to_path, *ARGV.drop(1))
-when nil
-  $stderr.puts "USAGE: flex-station <command>"
-  exit(1)
-else
-  $stderr.puts "Unrecognised command: #{command}"
-  exit(1)
+class App
+  include FlexStationData::Concerns::Callable[:run]
+
+  attr_reader :command, :args
+
+  def initialize(command = "help", *args)
+    @command = command
+    @args    = args
+  end
+
+  def dir_path
+    Pathname(__dir__)
+  end
+
+  def linear_regression_path
+    dir_path.join("flex-station-linear-regression")
+  end
+
+  def run
+    case command
+    when "linear-regression"
+      exec(linear_regression_path.to_path, *args)
+    when "help", "--help"
+      puts "USAGE: flex-station <command>"
+    else
+      $stderr.puts "Unrecognised command: #{command}"
+      exit(1)
+    end
+  end
 end
+
+App.run(*ARGV)

data/bin/flex-station-linear-regression

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
+require "flex_station_data/concerns/callable"
 require "flex_station_data/services/load_plates"
 require "flex_station_data/presenters/plates_hash"
 
 module FlexStationData
   class LinearRegressionApp
-    include Concerns::Service
+    include Concerns::Callable[:run]
 
     OPTION_RE = /\A--(\w+(?:-\w+)*)(?:=(.*))?\z/.freeze
 
@@ -78,7 +79,7 @@ module FlexStationData
       [ hash.keys, *hash.values.transpose ]
     end
 
-    def call
+    def run
       CSV do |out|
         csv.each do |row|
           out << row
@@ -88,4 +89,4 @@ module FlexStationData
   end
 end
 
-FlexStationData::LinearRegressionApp.call(*ARGV)
+FlexStationData::LinearRegressionApp.run(*ARGV)

data/lib/flex_station_data/concerns/callable.rb

@@ -0,0 +1,33 @@
+module FlexStationData
+  module Concerns
+    module Callable
+      class << self
+        def [](verb)
+          @@__callable_modules[verb] ||= Module.new.tap { |mod| __make_callable(mod, verb) }
+        end
+
+        private
+
+        def __make_callable(mod, verb)
+          class_methods = Module.new do
+            define_method verb do |*args, &block|
+              new(*args).send(verb, &block)
+            end
+
+            define_method :to_proc do
+              Proc.new(&method(verb))
+            end
+          end
+
+          mod.singleton_class.define_method :included do |base|
+            base.extend class_methods
+          end
+        end
+      end
+
+      __make_callable(self, :call)
+
+      @@__callable_modules = { call: self }
+    end
+  end
+end

data/lib/flex_station_data/concerns/presenter.rb

@@ -1,23 +1,7 @@
-require "active_support/concern"
+require_relative "callable"
 
 module FlexStationData
   module Concerns
-    module Presenter
-      extend ActiveSupport::Concern
-
-      def to_proc
-        Proc.new(&method(:present))
-      end
-
-      class_methods do
-        def present(*args, &block)
-          new(*args).present(&block)
-        end
-
-        def to_proc
-          Proc.new(&method(:present))
-        end
-      end
-    end
+    Presenter = Callable[:present]
   end
 end

data/lib/flex_station_data/concerns/service.rb

@@ -1,23 +1,7 @@
-require "active_support/concern"
+require_relative "callable"
 
 module FlexStationData
   module Concerns
-    module Service
-      extend ActiveSupport::Concern
-
-      def to_proc
-        Proc.new(&method(:call))
-      end
-
-      class_methods do
-        def call(*args, &block)
-          new(*args).call(&block)
-        end
-
-        def to_proc
-          Proc.new(&method(:call))
-        end
-      end
-    end
+    Service = Callable
   end
 end

data/lib/flex_station_data/version.rb

@@ -1,3 +1,3 @@
 module FlexStationData
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex-station-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Carney
@@ -117,6 +117,7 @@ files:
 - bin/flex-station-linear-regression
 - flex-station-data.gemspec
 - lib/flex_station_data.rb
+- lib/flex_station_data/concerns/callable.rb
 - lib/flex_station_data/concerns/presenter.rb
 - lib/flex_station_data/concerns/service.rb
 - lib/flex_station_data/default_sample_map.rb