licensee 8.8.4 → 8.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6012b12186c521b06e61a5c531a8c0108fc24748
-  data.tar.gz: 19899fafe58d1b95443ac7c58a149748f1bd830f
+  metadata.gz: df6cb4b146e1145c45570486db954caccfa552b6
+  data.tar.gz: bf9255dd2536cc83a1a4f415a557d8e9c3578af3
 SHA512:
-  metadata.gz: fed7d6042454168d025c6550f0a0e0554c7be27863148ef4beb58997a5cf711d0aa5c5fd87d87042a88badc3ed8d4a18d3f4d840864e09ed38bc4b386a1802d0
-  data.tar.gz: be95eb2a1484569dc7c8f28ac7100aa3c6c5b16db7a529c683d2f33c1ef62ecd841d75767699fc6b29c8a365b6991e773e824a6be7f96be9aa999bf2a17946f8
+  metadata.gz: af41cfdf339dd0b50098f0c28b729ecb3a15f099cc2840c0ae02fdd3f2fdf47f53eaa3a849417e4374604e0167e2fd956c094402a10a368c4eff5b58a198f330
+  data.tar.gz: 955ff81195f0a39032bb35473e7f0985d5e1449799a04216f6b97178d2f1b7ff0741772978eb2f473e9cdf9551712878a6d0b96674e07421b029ffcc445e9a55

data/lib/licensee/license.rb

@@ -143,7 +143,9 @@ module Licensee
       @rules = {}
 
       Rule.groups.each do |group|
-        @rules[group] = meta[group].map { |tag| Rule.find_by_tag(tag) }
+        @rules[group] = meta[group].map do |tag|
+          Rule.find_by_tag_and_group(tag, group)
+        end
       end
 
       @rules

data/lib/licensee/rule.rb

@@ -27,9 +27,10 @@ module Licensee
         end.flatten
       end
 
-      def find_by_tag(tag)
-        Rule.all.find { |r| r.tag == tag }
+      def find_by_tag_and_group(tag, group = nil)
+        Rule.all.find { |r| r.tag == tag && (group.nil? || r.group == group) }
       end
+      alias find_by_tag find_by_tag_and_group
 
       def file_path
         dir = File.dirname(__FILE__)

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '8.8.4'.freeze
+  VERSION = '8.8.5'.freeze
 end

data/spec/licensee/license_spec.rb

@@ -232,4 +232,11 @@ RSpec.describe Licensee::License do
     expect(mit.rules['permissions'].first).to be_a(Licensee::Rule)
     expect(mit.rules.flatten.count).to eql(6)
   end
+
+  it 'returns rules by tag and group' do
+    expect(cc_by.rules).to have_key('limitations')
+    rule = cc_by.rules['limitations'].find { |r| r.tag == 'patent-use' }
+    expect(rule).to_not be_nil
+    expect(rule.description).to include('does NOT grant')
+  end
 end

data/spec/licensee/{rule.rb → rule_spec.rb}

@@ -36,8 +36,15 @@ RSpec.describe Licensee::Rule do
     expect(rule.tag).to eql('commercial-use')
   end
 
+  it 'loads a rule by tag and group' do
+    rule = described_class.find_by_tag_and_group('patent-use', 'limitations')
+    expect(rule).to be_a(described_class)
+    expect(rule.tag).to eql('patent-use')
+    expect(rule.description).to include('does NOT grant')
+  end
+
   it 'loads all rules' do
-    expect(described_class.all.count).to eql(13)
+    expect(described_class.all.count).to eql(16)
     rule = described_class.all.first
     expect(rule).to be_a(described_class)
     expect(rule.tag).to eql('commercial-use')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 8.8.4
+  version: 8.8.5
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -154,7 +154,7 @@ files:
 - spec/licensee/project_files/package_info_spec.rb
 - spec/licensee/project_files/readme_spec.rb
 - spec/licensee/project_spec.rb
-- spec/licensee/rule.rb
+- spec/licensee/rule_spec.rb
 - spec/licensee_spec.rb
 - spec/project_file_spec.rb
 - spec/spec_helper.rb