tins 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6415329fd693754648bcb8286b4e374e0f6f97e
-  data.tar.gz: b94c700c21e4b0c75b8e80f2a281737b197509ce
+  metadata.gz: e021337aa4ed20c3a4923e4ea6e4a1ed98d3318f
+  data.tar.gz: d37b9e4a07a0af742021d28ed2e8ac1961bc12c2
 SHA512:
-  metadata.gz: 448317d7bffd06d6ce7e86eb3ffc8db5e4c7780e51ff3b20169bfc487e08d07a878aac4f3d290d9169cdfed8afae7b35d5dbc3dd9e52428996518727e1620c84
-  data.tar.gz: 057feb9fc08db54c5ef9bf3063ae4f1cdf8ff0a74d4d3aeac7ce100adc97590d7054a219386db11e01b3b362e09f219ea068f0b1971f718bc26e8b3c7ed8107b
+  metadata.gz: 0be134266c51650540a04d94fc26babe6f607970e7c6536375d2649019a5cb8cf5c891f731869eb22f244bb78551e11e0f77b623798da949686fa449758fb73a
+  data.tar.gz: f7a896763c0a0f73926b251d5fd305101b53e2a220fa8bfafddcce2bd653c7ae9d19d9173e744d0b894cdf98cb7790306cbbec14382085d5989d30a6d1e70a60

data/.travis.yml

@@ -6,9 +6,6 @@ rvm:
   - ruby-head
   - rbx-head
 matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS="--2.0"
   allow_failures:
     - rvm: ruby-head
     - rvm: rbx-head

data/VERSION

@@ -1 +1 @@
-1.11.0
+1.12.0

data/lib/tins/unit.rb

@@ -16,6 +16,8 @@ module Tins::Unit
     '', 'm', 'µ', 'n', 'p', 'f', 'a', 'z', 'y',
   ].each_with_index.map { |n, i| Prefix.new(n.freeze, 1000, 1000 ** -i, true) }.freeze
 
+  class ParserError < ArgumentError; end
+
   module_function
 
   def prefixes(identifier)
@@ -34,7 +36,7 @@ module Tins::Unit
   def format(value, format: '%f %U', prefix: 1024, unit: ?b)
     prefixes = prefixes(prefix)
     first_prefix = prefixes.first or
-      raise ArgumentError, 'a non-empty of prefixes is required'
+      raise ArgumentError, 'a non-empty array of prefixes is required'
     prefix = prefixes[
       (first_prefix.fraction ? -1 : 1) * Math.log(value) / Math.log(first_prefix.step)
     ]
@@ -89,17 +91,15 @@ module Tins::Unit
 
     def scan_unit
       case
-      when unit = scan(@unit_re)
+      when scan(@unit_re)
         prefix = @unit_re.prefixes.find { |pre| pre.name == self[1] } or return
         @number *= prefix.multiplier
-      when unit = scan(@unit_lc_re)
+      when scan(@unit_lc_re)
         prefix = @unit_lc_re.prefixes.find { |pre| pre.name == self[1] } or return
         @number *= prefix.multiplier
-      when unit = scan(@unit_uc_re)
+      when scan(@unit_uc_re)
         prefix = @unit_uc_re.prefixes.find { |pre| pre.name == self[1] } or return
         @number *= prefix.multiplier
-      else
-        return
       end
     end
 
@@ -135,21 +135,21 @@ module Tins::Unit
         case
         when scan(/%f/)
           @unit_parser.scan_number or
-            raise ArgumentError, "\"%f\" expected at #{location}"
+            raise ParserError, "\"%f\" expected at #{location}"
         when scan(/%U/)
           @unit_parser.scan_unit or
-            raise ArgumentError, "\"%U\" expected at #{location}"
+            raise ParserError, "\"%U\" expected at #{location}"
         when scan(/%%/)
           @unit_parser.scan_char(?%) or
-            raise ArgumentError, "#{?%.inspect} expected at #{location}"
+            raise ParserError, "#{?%.inspect} expected at #{location}"
         else
           char = scan(/./)
           @unit_parser.scan_char(char) or
-            raise ArgumentError, "#{char.inspect} expected at #{location}"
+            raise ParserError, "#{char.inspect} expected at #{location}"
         end
       end
       unless eos? && @unit_parser.eos?
-        raise ArgumentError,
+        raise ParserError,
           "format #{string.inspect} and string "\
             "#{@unit_parser.string.inspect} do not match"
       end
@@ -157,8 +157,16 @@ module Tins::Unit
     end
   end
 
+  # Parse the string +string+ if it matches +format+ with the unit +unit+ and
+  # the prefixes specified by +prefix+.
   def parse(string, format: '%f %U', unit: ?b, prefix: nil)
     prefixes = prefixes(prefix)
     FormatParser.new(format, UnitParser.new(string, unit, prefixes)).parse
   end
+
+  def parse?(string, **options)
+    parse(string, **options)
+  rescue ParserError
+    nil
+  end
 end

data/lib/tins/version.rb

@@ -1,6 +1,6 @@
 module Tins
   # Tins version
-  VERSION         = '1.11.0'
+  VERSION         = '1.12.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/unit_test.rb

@@ -41,12 +41,17 @@ module Tins
       assert_in_delta 17_301_504, parse('16.5 Mb').to_i, 1e-5
       assert_in_delta 16_500_000, parse('16.5 mbps', unit: 'bps').to_i, 1e-5
       assert_in_delta 0.1234e-5, parse('1.234 µS', unit: ?S, prefix: :f).to_s, 1e-5
-      assert_raise(ArgumentError) { parse('16.5 nix', unit: ?b) }
-      assert_raise(ArgumentError) { parse('nix Mb') }
+      assert_raise(ParserError) { parse('16.5 nix', unit: ?b) }
+      assert_raise(ParserError) { parse('nix Mb') }
       assert_in_delta 17_301_504, parse('16.5 % Mb', format: '%f %% %U').to_i, 1e-5
-      assert_raise(ArgumentError) { parse('16.5 Mb', format: '%f %% %U') }
-      assert_raise(ArgumentError) { parse('16.5 Mb foo', format: '%f %U') }
-      assert_raise(ArgumentError) { parse('16.5 Mb', format: '%f %U foo') }
+      assert_raise(ParserError) { parse('16.5 Mb', format: '%f %% %U') }
+      assert_raise(ParserError) { parse('16.5 Mb foo', format: '%f %U') }
+      assert_raise(ParserError) { parse('16.5 Mb', format: '%f %U foo') }
+    end
+
+    def test_parse_predicate
+      assert_in_delta 17_301_504, parse?('16.5 Mb').to_i, 1e-5
+      assert_nil parse?('16.5 nix', unit: ?b)
     end
   end
 end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.11.0 ruby lib
+# stub: tins 1.12.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins"
-  s.version = "1.11.0"
+  s.version = "1.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-07-12"
+  s.date = "2016-08-04"
   s.description = "All the stuff that isn't good/big enough for a real library."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/dslkit.rb", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/spruz.rb", "lib/tins.rb", "lib/tins/alias.rb", "lib/tins/annotate.rb", "lib/tins/ask_and_send.rb", "lib/tins/attempt.rb", "lib/tins/bijection.rb", "lib/tins/case_predicate.rb", "lib/tins/complete.rb", "lib/tins/concern.rb", "lib/tins/count_by.rb", "lib/tins/date_dummy.rb", "lib/tins/date_time_dummy.rb", "lib/tins/deep_const_get.rb", "lib/tins/deep_dup.rb", "lib/tins/dslkit.rb", "lib/tins/duration.rb", "lib/tins/extract_last_argument_options.rb", "lib/tins/file_binary.rb", "lib/tins/find.rb", "lib/tins/generator.rb", "lib/tins/go.rb", "lib/tins/hash_symbolize_keys_recursive.rb", "lib/tins/hash_union.rb", "lib/tins/if_predicate.rb", "lib/tins/implement.rb", "lib/tins/limited.rb", "lib/tins/lines_file.rb", "lib/tins/memoize.rb", "lib/tins/method_description.rb", "lib/tins/minimize.rb", "lib/tins/module_group.rb", "lib/tins/named_set.rb", "lib/tins/null.rb", "lib/tins/once.rb", "lib/tins/p.rb", "lib/tins/partial_application.rb", "lib/tins/proc_compose.rb", "lib/tins/proc_prelude.rb", "lib/tins/range_plus.rb", "lib/tins/require_maybe.rb", "lib/tins/responding.rb", "lib/tins/secure_write.rb", "lib/tins/sexy_singleton.rb", "lib/tins/string_byte_order_mark.rb", "lib/tins/string_camelize.rb", "lib/tins/string_underscore.rb", "lib/tins/string_version.rb", "lib/tins/subhash.rb", "lib/tins/terminal.rb", "lib/tins/thread_local.rb", "lib/tins/time_dummy.rb", "lib/tins/to.rb", "lib/tins/to_proc.rb", "lib/tins/token.rb", "lib/tins/uniq_by.rb", "lib/tins/unit.rb", "lib/tins/version.rb", "lib/tins/write.rb", "lib/tins/xt.rb", "lib/tins/xt/annotate.rb", "lib/tins/xt/ask_and_send.rb", "lib/tins/xt/attempt.rb", "lib/tins/xt/blank.rb", "lib/tins/xt/case_predicate.rb", "lib/tins/xt/complete.rb", "lib/tins/xt/concern.rb", "lib/tins/xt/count_by.rb", "lib/tins/xt/date_dummy.rb", "lib/tins/xt/date_time_dummy.rb", "lib/tins/xt/deep_const_get.rb", "lib/tins/xt/deep_dup.rb", "lib/tins/xt/dslkit.rb", "lib/tins/xt/extract_last_argument_options.rb", "lib/tins/xt/file_binary.rb", "lib/tins/xt/full.rb", "lib/tins/xt/hash_symbolize_keys_recursive.rb", "lib/tins/xt/hash_union.rb", "lib/tins/xt/if_predicate.rb", "lib/tins/xt/implement.rb", "lib/tins/xt/irb.rb", "lib/tins/xt/method_description.rb", "lib/tins/xt/named.rb", "lib/tins/xt/null.rb", "lib/tins/xt/p.rb", "lib/tins/xt/partial_application.rb", "lib/tins/xt/proc_compose.rb", "lib/tins/xt/proc_prelude.rb", "lib/tins/xt/range_plus.rb", "lib/tins/xt/require_maybe.rb", "lib/tins/xt/responding.rb", "lib/tins/xt/secure_write.rb", "lib/tins/xt/sexy_singleton.rb", "lib/tins/xt/string.rb", "lib/tins/xt/string_byte_order_mark.rb", "lib/tins/xt/string_camelize.rb", "lib/tins/xt/string_underscore.rb", "lib/tins/xt/string_version.rb", "lib/tins/xt/subhash.rb", "lib/tins/xt/time_dummy.rb", "lib/tins/xt/time_freezer.rb", "lib/tins/xt/to.rb", "lib/tins/xt/uniq_by.rb", "lib/tins/xt/write.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar