signore 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfb842786a542e13dc3cdee1e74bc008dd789a4
-  data.tar.gz: 3f0c4e0cb4e27b390fd32b62cb59fe7317b9f58b
+  metadata.gz: 9b75dc357e994a66d6b3e1d8622244a16b8c4431
+  data.tar.gz: 645d959046b8c6a25da47aa7b0e041dbea08a622
 SHA512:
-  metadata.gz: 961505f7494b297608087821fb41c95f9d1fa4fa7cb9afb096467708cc036cf7011146fa9bac5aceaba0e4aab1d44fd90078917d5bdfe144841c103db415a14d
-  data.tar.gz: 5ffbfc986b267f701ddc91ba1bfcba3f9274c303b8fd7a24d0eb581357994532b04a918294e34e9bb5cce4efe2ff38ac5ed358e52b5b7afa465049f4d2dc1947
+  metadata.gz: 35d632d01c86f78b0401ee0c31a65b1aca323aa2c866d5bf5fab5dd3ff071bdeafffa8dbba1ab5831853a301caebdd4c390527e1dad2faeb143d266eecf012f1
+  data.tar.gz: 112cc070591a0d9dd986f1c1e919e6d08298921db663ea42f0f9d132727a020a38f5e481632a2ea9e52eb58d1932d9bc638aee12cad8dc0f7c60e8e4d3e2063b

data/.reek

@@ -0,0 +1,10 @@
+FeatureEnvy:
+  exclude:
+    - Signore::Settings#forbidden
+
+IrresponsibleModule:
+  enabled: false
+
+UtilityFunction:
+  exclude:
+    - Signore::Settings#repo_path

data/.rubocop.yml

@@ -1,3 +1,7 @@
+# FIXME: https://github.com/bbatsov/rubocop/pull/1871
+Performance/Sample:
+  Enabled: false
+
 Style/AndOr:
   Enabled: false
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    signore (0.3.3)
+    signore (0.4.0)
       lovely_rufus (~> 0.3.0)
-      private_attr (~> 1.0)
+      private_attr (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -24,54 +24,54 @@ GEM
       equalizer (~> 0.0.9)
     dependor (1.0.1)
     diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    ffi (1.9.6)
+    equalizer (0.0.11)
+    ffi (1.9.8)
     hitimes (1.2.2)
     ice_nine (0.11.1)
-    listen (2.8.5)
-      celluloid (>= 0.15.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lovely_rufus (0.3.0)
+    lovely_rufus (0.3.1)
       private_attr (~> 1.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.5.1)
-    minitest-focus (1.1.0)
+    minitest (5.6.1)
+    minitest-focus (1.1.1)
       minitest (>= 4, < 6)
-    parser (2.2.0.2)
+    parser (2.2.2.2)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
-    private_attr (1.0.0)
+    powerpack (0.1.1)
+    private_attr (1.1.0)
     procto (0.0.2)
     rainbow (2.0.0)
     rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (2.0.0)
+    reek (2.2.0)
       parser (~> 2.2)
       rainbow (~> 2.0)
       unparser (~> 0.2.2)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.29.0)
+    rubocop (0.31.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    thread_safe (0.3.4)
+    ruby-progressbar (1.7.5)
+    thread_safe (0.3.5)
     timers (4.0.1)
       hitimes
-    unparser (0.2.2)
+    unparser (0.2.3)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.2.5)
       equalizer (~> 0.0.9)
-      parser (~> 2.2.0.2)
+      parser (~> 2.2.2, >= 2.2.2.2)
       procto (~> 0.0.2)
 
 PLATFORMS
@@ -84,5 +84,5 @@ DEPENDENCIES
   rake (~> 10.1)
   reek (~> 2.0)
   rerun (~> 0.10.0)
-  rubocop (~> 0.29.0)
+  rubocop (~> 0.31.0)
   signore!

data/Rakefile

@@ -10,10 +10,12 @@ Rake::TestTask.new do |task|
 end
 
 Reek::Rake::Task.new do |task|
-  task.config_file   = 'config/reek.yml'
   task.fail_on_error = false
 end
 
 RuboCop::RakeTask.new do |task|
   task.options << '--display-cop-names'
+  if Gem.loaded_specs['rubocop'].version > Gem::Version.create('0.31.0')
+    fail 'remove Performance/Sample exclusion from .rubocop.yml'
+  end
 end

data/lib/signore/sig_finder.rb

@@ -1,23 +1,13 @@
+require_relative 'signature'
 require_relative 'tags'
 
 module Signore
-  class SigFinder
-    def self.find(sigs, random: Random.new, tags: Tags.new)
-      new(sigs, random: random).find_tagged(tags: tags)
-    end
-
-    def initialize(sigs, random: Random.new)
-      @random = random
-      @sigs   = sigs
-    end
+  module SigFinder
+    module_function
 
-    def find_tagged(tags: Tags.new)
-      sigs
-        .select { |sig| tags.required.all?  { |tag| sig.tagged_with?(tag) } }
-        .reject { |sig| tags.forbidden.any? { |tag| sig.tagged_with?(tag) } }
-        .sample(random: random) or Signature.new
+    def find(sigs, random: Random.new, tags: Tags.new)
+      found = sigs.shuffle(random: random).find { |sig| tags.match?(sig.tags) }
+      found or Signature.new
     end
-
-    private_attr_reader :random, :sigs
   end
 end

data/lib/signore/signature.rb

@@ -7,10 +7,6 @@ module Signore
       each_pair { |key, value| self[key] = nil if value and value.empty? }
     end
 
-    def tagged_with?(tag)
-      tags and tags.include?(tag)
-    end
-
     def to_h
       super.map { |key, val| [key.to_s, val] }.to_h.keep_if { |_, value| value }
     end

data/lib/signore/tags.rb

@@ -3,5 +3,10 @@ module Signore
     def initialize(forbidden: [], required: [])
       super forbidden, required
     end
+
+    def match?(sig_tags)
+      sig_tags ||= []
+      (required & sig_tags) == required and (forbidden & sig_tags).empty?
+    end
   end
 end

data/lib/signore.rb

@@ -1,4 +1,2 @@
-require 'private_attr'
-Class.include PrivateAttr
-
+require 'private_attr/everywhere'
 require_relative 'signore/cli'

data/signore.gemspec

@@ -7,14 +7,14 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'signore'
   gem.summary     = 'signore: an email signature manager/randomiser'
-  gem.version     = '0.3.3'
+  gem.version     = '0.4.0'
 
   gem.files       = `git ls-files -z`.split "\0"
-  gem.executables = gem.files.grep(/^bin\//).map { |path| File.basename(path) }
-  gem.test_files  = gem.files.grep(/^test\/.*\.rb$/)
+  gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename(path) }
+  gem.test_files  = gem.files.grep(%r{^test/.*\.rb$})
 
   gem.add_dependency 'lovely_rufus', '~> 0.3.0'
-  gem.add_dependency 'private_attr', '~> 1.0'
+  gem.add_dependency 'private_attr', '~> 1.1'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.0'
@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake',           '~> 10.1'
   gem.add_development_dependency 'reek',           '~> 2.0'
   gem.add_development_dependency 'rerun',          '~> 0.10.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.29.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.31.0'
 end

data/test/signore/sig_finder_test.rb

@@ -13,14 +13,14 @@ module Signore
 
     describe '.find' do
       it 'returns a random Signature by default' do
-        SigFinder.find(sigs, random: Random.new(1981)).text
+        SigFinder.find(sigs, random: Random.new(0)).text
           .must_include 'Amateur fighter pilot ignores orders'
-        SigFinder.find(sigs, random: Random.new(2009)).text
+        SigFinder.find(sigs, random: Random.new(1)).text
           .must_equal '// sometimes I believe compiler ignores all my comments'
       end
 
       it 'returns a random signature if the tags are empty' do
-        SigFinder.find(sigs, tags: Tags.new, random: Random.new(2013)).text
+        SigFinder.find(sigs, tags: Tags.new, random: Random.new(1)).text
           .must_equal '// sometimes I believe compiler ignores all my comments'
       end
 

data/test/signore/signature_test.rb

@@ -27,19 +27,6 @@ module Signore
       end
     end
 
-    describe '#tagged_with?' do
-      it 'says whether a tagged signature is tagged with a given tag' do
-        sig = Signature.new(tags: %w(programming tech), text: '')
-        refute sig.tagged_with?('fnord')
-        assert sig.tagged_with?('programming')
-        assert sig.tagged_with?('tech')
-      end
-
-      it 'says that an untagged signature is not tagged with any tag' do
-        refute Signature.new.tagged_with?('fnord')
-      end
-    end
-
     describe '#to_h' do
       it 'returns a String-keyed Hash representation of the Signature' do
         text = 'For the sake of topic titles, I’d rather if Monty saved Python.'

data/test/signore/tags_test.rb

@@ -0,0 +1,20 @@
+require_relative '../test_helper'
+require_relative '../../lib/signore/tags'
+
+module Signore
+  describe Tags do
+    describe '#match?' do
+      it 'is a predicate whether the Tags match the given list of tags' do
+        tags = %w(programming tech)
+        assert Tags.new.match?(nil)
+        assert Tags.new(forbidden: %w(fnord)).match?(nil)
+        assert Tags.new.match?(tags)
+        assert Tags.new(required: %w(programming)).match?(tags)
+        assert Tags.new(required: %w(programming tech)).match?(tags)
+        refute Tags.new(required: %w(programming tech Ruby)).match?(tags)
+        refute Tags.new(forbidden: %w(programming)).match?(tags)
+        refute Tags.new(forbidden: %w(tech), required: %w(tech)).match?(tags)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.31.0
 description: signore helps manage email signatures and select random ones based on
   their tags
 email: chastell@chastell.net
@@ -144,6 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".reek"
 - ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
@@ -152,7 +153,6 @@ files:
 - README.md
 - Rakefile
 - bin/signore
-- config/reek.yml
 - lib/signore.rb
 - lib/signore/cli.rb
 - lib/signore/mapper.rb
@@ -173,6 +173,7 @@ files:
 - test/signore/sig_finder_test.rb
 - test/signore/sig_from_stream_test.rb
 - test/signore/signature_test.rb
+- test/signore/tags_test.rb
 - test/test_helper.rb
 homepage: http://github.com/chastell/signore
 licenses:
@@ -206,4 +207,6 @@ test_files:
 - test/signore/sig_finder_test.rb
 - test/signore/sig_from_stream_test.rb
 - test/signore/signature_test.rb
+- test/signore/tags_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/config/reek.yml

@@ -1,20 +0,0 @@
-DuplicateMethodCall:
-  exclude:
-    - Signore::SigFinder#find_tagged
-
-FeatureEnvy:
-  exclude:
-    - Signore::Mapper#from_h
-    - Signore::Mapper#to_h
-    - Signore::Settings#forbidden
-
-IrresponsibleModule:
-  enabled: false
-
-NestedIterators:
-  max_allowed_nesting: 2
-
-UtilityFunction:
-  exclude:
-    - Signore::Mapper#from_h
-    - Signore::Settings#repo_path