lab42_options 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc16f86cc55f71e19a7c41cd024131a53e2968db
-  data.tar.gz: 47887a14848a7d6c666f48a1d908c93577e152f9
+  metadata.gz: d60b9c90244ebc315786a02ad9273611b52169a9
+  data.tar.gz: 4c27dddfa798d3765a7edba5463c055cbcc9a88a
 SHA512:
-  metadata.gz: 777cf27a5727f4ce0484f72c3e2364a697b47732e748b2d6d1e6960305d4e237afeecdff4c500a4ee8ba420084a1842d6ef1d55d4868c4e4635f41212b556e25
-  data.tar.gz: e9f5f84c8b68bcc8cd44dbd9efd24517a198af1c6057f562df62ee34dff0571dc5f2bd3e2296cfadf9643d8637732612725924c091e54e972dc02eb1ca6ff257
+  metadata.gz: c75abdec7ecb175a6cbf31ea4c1b64b5e3450a4702f419a9cc1abad731d508d4bfe63663f596a8c46d90ecbb63b15f320a5a7188934cbaec39a85686f08e3581
+  data.tar.gz: 5f1f185f3203293be14cb4cb2a9c3c989d57c77875c00a3bd21408baaee517ef2d591c3e072c092e0fde33118dd18abdc8aa5f5792c57ec2b8538763ccaeb9b1

data/README.md

@@ -39,18 +39,27 @@ Will yield
     options.mixed # --> [true, "pickels"]
 ```
 
+## Required and Default Arguments
+
+```ruby
+  Lab42::Options.new greeting: "hello", target: :required
+```
+
+will parse as follows:
+
+```sh
+    greet target: "world"                     # target = "world", greeting = "hello"
+    greet target: "world" greeting: "cheerio" # target = "world", greeting = "cheerio"
+    greet greeting: "howdy"                   # error missing required argument :target"
+```
+
 ## Missing Features
 
 * Help Message Generation
   
     https://github.com/RobertDober/lab42_options/issues/3
 
-* Required Arguments
-
-    https://github.com/RobertDober/lab42_options/issues/2
-
-* Default Arguments
+* Typed Arguments
 
-    https://github.com/RobertDober/lab42_options/issues/2
+    https://github.com/RobertDober/lab42_options/issues/4
 
-* Typed Arguments

data/lib/lab42/options/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   class Options
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/lab42/options.rb

@@ -6,11 +6,51 @@ module Lab42
   class Options
     def parse *args
       args = args.first if Array === args.first
-      result = OpenStruct.new Lab42::Options::Parser.new.parse( args )
+      @parsed = Lab42::Options::Parser.new.parse( args )
+      set_defaults
+      check_required
+      issue_errors!
+      result = OpenStruct.new @parsed
       result.forwarding_to :kwds
     end
+
     private
-    def intialize *args
+    def initialize options={}
+      @registered = {}
+      @errors = []
+      options.each do | k, v |
+        register_option k, v
+      end
+    end
+
+    def check_required
+      required_options.each do |ro|
+        @errors << "Required option #{ro} was not provided" unless @parsed[:kwds].to_h.has_key? ro
+      end
+    end
+
+    def defaults
+      @__defaults__ =
+        @registered.select{|_,v| v != :required}
+    end
+
+    def issue_errors!
+      return if @errors.empty?
+      raise ArgumentError, @errors.join("\n")
+    end
+    def register_option k, v
+      @registered[k] = v
+    end
+
+    def required_options
+      @__required_options__ ||=
+        @registered.select{|_,v| v == :required}.keys
+    end
+
+    def set_defaults
+      defaults.each do |k, dv|
+        @parsed[:kwds][k] = dv unless @parsed[:kwds].to_h.has_key? k
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_options
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry