libis-tools 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9120e1cf4cfed1f9bdfe8529383d4bda5e89e2e
-  data.tar.gz: ab3b461ff790ab4990b63fbc3e63166b8a38471b
+  metadata.gz: e2c6c77cfccd6c062ae90c8379432fddc206f414
+  data.tar.gz: 215cea5196e3827cd404b1e4152aeb31ef526e36
 SHA512:
-  metadata.gz: bbdcff4a1240c7c72d0aadea944b045b76c37a71f652515207b4f27c93addce312000efb2f601464f8a55bc5f354c799681111539ab89a19bfbdaee28bc1bc01
-  data.tar.gz: b7619f13ddc7423341ae4a81692e2eec5b52037acf830c828d5db783fd4888ba088b7c95d6e557f6f87583f34e2c1ac0f8cc0162bb334c7990371e5b8fec4681
+  metadata.gz: 166dbb502d7ddb353711dd3ca89566e054f2c0f10c47295c10bb20a869dd645ad41c7211a1682f2d995492e120b0dfcdf3c0584b77678a0aa1647a6913072db0
+  data.tar.gz: c8ddc3e402ae7b7e4a0671e1619d73da0c276b40ffbd9c1be824f4e6e07e644191b20b85e1379d4213accde18fad2a3f5e9699cb57d5d575bcc15a4e51f772e4

data/lib/libis/tools/parameter.rb

@@ -8,14 +8,35 @@ module Libis
     # noinspection RubyConstantNamingConvention
     Parameter = ::Struct.new(:name, :default, :datatype, :description, :constraint, :options) do
 
-      VALID_PARAMETER_KEYS = [:name, :default, :datatype, :description, :constraint, :options]
-
       def initialize(*args)
         # noinspection RubySuperCallWithoutSuperclassInspection
         super(*args)
         self.options = {} unless self.options
       end
 
+      def [](key)
+        # noinspection RubySuperCallWithoutSuperclassInspection
+        return super(key) if members.include?(key)
+        self[:options][key]
+      end
+
+      def []=(key,value)
+        # noinspection RubySuperCallWithoutSuperclassInspection
+        return super(key,value) if members.include?(key)
+        self[:options][key] = value
+      end
+
+      def self.from_hash(h)
+        h.each { |k,v| self[k.to_s.to_sym] = v }
+      end
+
+      def to_h
+        super.inject({}) do |hash, key, value|
+          key == :options ? value.each {|k,v| hash[k] = v} : hash[key] = value
+          hash
+        end
+      end
+
       TRUE_BOOL = %w'true yes t y 1'
       FALSE_BOOL = %w'false no f n 0'
 
@@ -116,7 +137,7 @@ module Libis
             name = param_def.first.to_s.to_sym
             default = param_def.last
             parameters[name] = Parameter.new(name, default) if parameters[name].nil?
-            VALID_PARAMETER_KEYS.each { |key| parameters[name][key] = options[key] if options[key] }
+            options.each { |key, value| parameters[name][key] = value if value }
           else
             parameters[options]
           end

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.1'
+    VERSION = '0.9.3'
   end
 end

data/spec/parameter_container_spec.rb

@@ -15,6 +15,7 @@ describe 'ParameterContainer' do
       parameter calendar: Date.new(2014, 01, 01)
       parameter clock: Time.parse('10:10')
       parameter timestamp: DateTime.new(2014, 01, 01, 10, 10)
+      parameter with_options: true, options: {a: 1, b: 2}, c: 3
 
     end
   end
@@ -80,4 +81,12 @@ describe 'ParameterContainer' do
     expect(@test_container.parameter(:timestamp).sec).to eq 23
   end
 
+  it 'should be able to define parameter with options' do
+    expect(@test_container.class.parameter(:with_options)[:options]).to eq a: 1, b: 2, c: 3
+    expect(@test_container.class.parameter(:with_options)[:options][:a]).to be 1
+    expect(@test_container.class.parameter(:with_options)[:a]).to be 1
+    expect(@test_container.class.parameter(:with_options)[:options][:c]).to be 3
+    expect(@test_container.class.parameter(:with_options)[:c]).to be 3
+  end
+
 end

data/spec/parameter_spec.rb

@@ -136,4 +136,13 @@ describe 'Parameter' do
 
   end
 
+  it 'should allow to set and get options' do
+
+    @bool_parameter[:my_value] = :dummy_value
+
+    expect(@bool_parameter[:my_value]).to be :dummy_value
+    expect(@bool_parameter[:options][:my_value]).to be :dummy_value
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler