toggles 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667d45b0572c3986b8f26a65f9d875c29418fb5f
-  data.tar.gz: dcf2a50e338291a73cb2ce901a1eed0d5b12cdec
+  metadata.gz: 31164f56157983183da56700b347bb70a5373058
+  data.tar.gz: 9b258b42d5b7e8d7fdf95b91ec8c19ddfab5820f
 SHA512:
-  metadata.gz: 6b40d286dd30e05530d36cab7fde5cb9a1ac78fafb152130bd58428f0648099b44567d8b8b3ab23bcb2122142d819d5c08e251a3135c7d9e74671b217725ec5e
-  data.tar.gz: 7d8fb44ef3432bafbfe5a7e47eb75e59c7498f210bbca9ff092164654aba4e07dbce2aa411b1adc742c035c0022a5a8538e79b8751bf1eae02146b9cc2d00e7d
+  metadata.gz: 2f70ab0bda18fe55346c769b49eafcb1d67a7faf0e73eefbcf86686d8131fdc951ece6caf64f71722ab454211780b0525ab2fe6c2a6fdd781fe1ad87432adcae
+  data.tar.gz: fda41fa20f04da055008917544349718ca39b24ab6455e644651558f05cbcb5e50e5d85d2af73e8c2e47f33fd3881603e5776e0d6cfda4f979e6cb6f4f39d820

data/features/type.yml

@@ -0,0 +1,6 @@
+user_id:
+  not:
+    in:
+      range:
+        - 20
+        - 30

data/lib/toggles/feature.rb

@@ -2,17 +2,17 @@ require "find"
 
 require "toggles/feature/base"
 require "toggles/feature/subject"
+require "toggles/feature/operation"
 require "toggles/feature/permissions"
-require "toggles/feature/permissions/operation"
 
 module Feature
-  OPERATIONS = {and:   Permissions::Operation::And,
-                gt:    Permissions::Operation::GreaterThan,
-                in:    Permissions::Operation::In,
-                lt:    Permissions::Operation::LessThan,
-                not:   Permissions::Operation::Not,
-                or:    Permissions::Operation::Or,
-                range: Permissions::Operation::Range}
+  OPERATIONS = {and:   Operation::And,
+                gt:    Operation::GreaterThan,
+                in:    Operation::In,
+                lt:    Operation::LessThan,
+                not:   Operation::Not,
+                or:    Operation::Or,
+                range: Operation::Range}
 end
 
 # Dynamically create modules and classes within the `Feature` module based on

data/lib/toggles/feature/operation.rb

@@ -0,0 +1,8 @@
+require "toggles/feature/operation/and"
+require "toggles/feature/operation/attribute"
+require "toggles/feature/operation/gt"
+require "toggles/feature/operation/in"
+require "toggles/feature/operation/lt"
+require "toggles/feature/operation/not"
+require "toggles/feature/operation/or"
+require "toggles/feature/operation/range"

data/lib/toggles/feature/operation/and.rb

@@ -0,0 +1,11 @@
+module Feature
+  module Operation
+    class And
+      def self.call(entity, attr_name, expected)
+        expected.all? do |operation, value|
+          OPERATIONS[operation.to_sym].call(entity, attr_name, value)
+        end
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/attribute.rb

@@ -0,0 +1,19 @@
+module Feature
+  module Operation
+    class Attribute
+      def self.call(entity, attr_name, expected)
+        if expected.kind_of? Hash
+          expected.all? do |operation, rules|
+            if OPERATIONS.include? operation.to_sym
+              OPERATIONS[operation.to_sym].call(entity, attr_name, rules)
+            else
+              Operation::Attribute.call(entity.send(attr_name), operation, rules)
+            end
+          end
+        else
+          entity.send(attr_name) == expected
+        end
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/gt.rb

@@ -0,0 +1,9 @@
+module Feature
+  module Operation
+    class GreaterThan
+      def self.call(entity, attr_name, expected)
+        entity.send(attr_name) > expected
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/in.rb

@@ -0,0 +1,15 @@
+module Feature
+  module Operation
+    class In
+      def self.call(entity, attr_name, expected)
+        if expected.kind_of? Hash
+          expected = expected.reduce([]) do |list, (operation, args)|
+            OPERATIONS[operation.to_sym].call(args)
+          end
+        end
+
+        expected.include? entity.send(attr_name.to_sym)
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/lt.rb

@@ -0,0 +1,9 @@
+module Feature
+  module Operation
+    class LessThan
+      def self.call(entity, attr_name, expected)
+        entity.send(attr_name) < expected
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/not.rb

@@ -0,0 +1,15 @@
+module Feature
+  module Operation
+    class Not
+      def self.call(entity, attr_name, expected)
+        if expected.kind_of? Hash
+          expected.none? do |operation, value|
+            OPERATIONS[operation.to_sym].call(entity, attr_name, value)
+          end
+        else
+          entity.send(attr_name) != expected
+        end
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/or.rb

@@ -0,0 +1,11 @@
+module Feature
+  module Operation
+    class Or
+      def self.call(entity, attr_name, expected)
+        expected.any? do |operation, value|
+          OPERATIONS[operation.to_sym].call(entity, attr_name, value)
+        end
+      end
+    end
+  end
+end

data/lib/toggles/feature/operation/range.rb

@@ -0,0 +1,10 @@
+module Feature
+  module Operation
+    class Range
+      def self.call(args)
+        raise StandardError, "Invalid range operation" if args.size != 2
+        (args.first..args.last)
+      end
+    end
+  end
+end

data/lib/toggles/feature/permissions.rb

@@ -1,4 +1,4 @@
-require "toggles/feature/permissions/operation"
+require "ostruct"
 
 module Feature
   class Permissions
@@ -22,10 +22,15 @@ module Feature
       end
 
       rules.all? do |name, rule|
+        entity = entities[name.to_sym]
+
+        if entity.class.ancestors.find { |ancestor| ancestor == Comparable }
+          entity = OpenStruct.new(name => entity)
+          rule   = {name => rule}
+        end
+
         rule.all? do |key, value|
-          OPERATIONS.fetch(key, Operation::Attribute).call(
-            entities[name.to_sym], key, value
-          )
+          OPERATIONS.fetch(key, Operation::Attribute).call(entity, key, value)
         end
       end
     end

data/spec/toggles/feature/acceptance/collection_spec.rb

@@ -0,0 +1,9 @@
+describe Feature::Collection do
+  specify do
+    expect(Feature::Collection.enabled_for?(user: double(id: 1))).to eq true
+    expect(Feature::Collection.enabled_for?(user: double(id: 5))).to eq true
+    expect(Feature::Collection.enabled_for?(user: double(id: 10))).to eq true
+    expect(Feature::Collection.enabled_for?(user: double(id: 49))).to eq false
+    expect(Feature::Collection.enabled_for?(user: double(id: 51))).to eq true
+  end
+end

data/spec/toggles/feature/acceptance/multiple_subjects_spec.rb

@@ -0,0 +1,17 @@
+describe Feature::MultipleSubjects do
+  specify do
+    expect(Feature::MultipleSubjects.enabled_for?(
+      user: double(id: 1, logged_in?: true), widget: double(id: 2))).to eq true
+
+    expect(Feature::MultipleSubjects.enabled_for?(
+      user: double(id: 1, logged_in?: false), widget: double(id: 2))).to eq false
+    expect(Feature::MultipleSubjects.enabled_for?(
+      user: double(id: 1, logged_in?: true), widget: double(id: 3))).to eq false
+  end
+
+  specify "invalid permissions" do
+    expect { Feature::MultipleSubjects.enabled_for?(widget: double) }.
+      to raise_error Feature::Subject::Invalid,
+        "Invalid or missing subjects for permissions: [:user]"
+  end
+end

data/spec/toggles/feature/acceptance/nested_attributes_spec.rb

@@ -0,0 +1,13 @@
+describe Feature::NestedAttributes do
+  specify do
+    expect(Feature::NestedAttributes.enabled_for?(
+        foo: double(bar: :two, baz: double(id: 51)))).to eq true
+    expect(Feature::NestedAttributes.enabled_for?(
+        foo: double(bar: :two, baz: double(id: 10)))).to eq true
+
+    expect(Feature::NestedAttributes.enabled_for?(
+        foo: double(bar: :one, baz: double(id: 51)))).to eq false
+    expect(Feature::NestedAttributes.enabled_for?(
+        foo: double(bar: :two, baz: double(id: 50)))).to eq false
+  end
+end

data/spec/toggles/feature/acceptance/type_spec.rb

@@ -0,0 +1,6 @@
+describe Feature::Type do
+  specify do
+    expect(Feature::Type.enabled_for?(user_id: 1)).to eq true
+    expect(Feature::Type.enabled_for?(user_id: 25)).to eq false
+  end
+end

data/spec/toggles/feature/base_spec.rb

@@ -2,32 +2,9 @@ describe Feature::Base do
   let(:user)   { double(id: 1, logged_in?: true) }
   let(:widget) { double(id: 2) }
 
-  subject { Feature::Test.new(user: user, widget: widget) }
+  subject { Feature::MultipleSubjects.new(user: user, widget: widget) }
 
   its(:enabled?)              { is_expected.to eq true }
   its(:subjects)              { is_expected.to eq user: user, widget: widget }
   its("permissions.subjects") { is_expected.to eq [:user, :widget] }
-
-  describe "#enabled_for?" do
-    specify do
-      expect(Feature::Test.enabled_for?(user: double(id: 1, logged_in?: true),
-                                        widget: double(id: 2))).to eq true
-      expect(Feature::Test.enabled_for?(user: double(id: 1, logged_in?: false),
-                                        widget: double(id: 2))).to eq false
-    end
-
-    specify "invalid permissions" do
-      expect { Feature::Test.enabled_for?(widget: double) }.
-        to raise_error Feature::Subject::Invalid,
-          "Invalid or missing subjects for permissions: [:user]"
-    end
-
-    specify "collection" do
-      expect(Feature::Collection.enabled_for?(user: double(id: 1))).to eq true
-      expect(Feature::Collection.enabled_for?(user: double(id: 5))).to eq true
-      expect(Feature::Collection.enabled_for?(user: double(id: 10))).to eq true
-      expect(Feature::Collection.enabled_for?(user: double(id: 49))).to eq false
-      expect(Feature::Collection.enabled_for?(user: double(id: 51))).to eq true
-    end
-  end
 end

data/spec/toggles/feature/{permissions/operation → operation}/and_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::And do
+describe Feature::Operation::And do
   specify do
     [[60, true], [40, false], [80, false]].each do |(id, expected)|
       expect(

data/spec/toggles/feature/{permissions/operation → operation}/attribute_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::Attribute do
+describe Feature::Operation::Attribute do
   specify do
     expect(described_class.call(double(id: 50), :id, 50)).to eq true
     expect(described_class.call(double(id: 50), :id, 51)).to eq false

data/spec/toggles/feature/{permissions/operation → operation}/gt_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::GreaterThan do
+describe Feature::Operation::GreaterThan do
   specify do
     expect(described_class.call(double(id: 50), :id, 40)).to eq true
     expect(described_class.call(double(id: 50), :id, 60)).to eq false

data/spec/toggles/feature/{permissions/operation → operation}/in_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::In do
+describe Feature::Operation::In do
   specify do
     expect(described_class.call(double(id: 50), :id, {"range" => [40, 60]})).to eq true
     expect(described_class.call(double(id: 50), :id, [1])).to eq false

data/spec/toggles/feature/{permissions/operation → operation}/lt_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::LessThan do
+describe Feature::Operation::LessThan do
   specify do
     expect(described_class.call(double(id: 50), :id, 60)).to eq true
     expect(described_class.call(double(id: 50), :id, 40)).to eq false

data/spec/toggles/feature/{permissions/operation → operation}/not_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::Not do
+describe Feature::Operation::Not do
   specify do
     expect(described_class.call(double(id: 50), :id, {"in" => (10..20)})).to eq true
     expect(described_class.call(double(id: 50), :id, 50)).to eq false

data/spec/toggles/feature/{permissions/operation → operation}/or_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::Or do
+describe Feature::Operation::Or do
   specify do
     expect(described_class.call(double(id: 16), :id, {"in" => (10..20), "not" => 15})).to eq true
     expect(described_class.call(double(id: 15), :id, {"in" => (10..20), "not" => 15})).to eq true

data/spec/toggles/feature/{permissions/operation → operation}/range_spec.rb

@@ -1,4 +1,4 @@
-describe Feature::Permissions::Operation::Range do
+describe Feature::Operation::Range do
   specify do
     expect(described_class.call([10, 20])).to eq (10..20)
   end

data/spec/toggles/feature/permissions_spec.rb

@@ -1,5 +1,5 @@
 describe Feature::Permissions do
-  let(:path) { "features/test.yml" }
+  let(:path) { "features/multiple_subjects.yml" }
 
   subject { Feature::Permissions.new(path) }
 

data/toggles.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "toggles"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.authors = ["Andrew Tribone"]
   s.summary = "YAML backed feature toggles"
   s.email = "tribone@easypost.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggles
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrew Tribone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,33 +119,37 @@ files:
 - Gemfile
 - Rakefile
 - features/collection.yml
+- features/multiple_subjects.yml
 - features/nested_attributes.yml
-- features/test.yml
+- features/type.yml
 - lib/toggles.rb
 - lib/toggles/feature.rb
 - lib/toggles/feature/base.rb
+- lib/toggles/feature/operation.rb
+- lib/toggles/feature/operation/and.rb
+- lib/toggles/feature/operation/attribute.rb
+- lib/toggles/feature/operation/gt.rb
+- lib/toggles/feature/operation/in.rb
+- lib/toggles/feature/operation/lt.rb
+- lib/toggles/feature/operation/not.rb
+- lib/toggles/feature/operation/or.rb
+- lib/toggles/feature/operation/range.rb
 - lib/toggles/feature/permissions.rb
-- lib/toggles/feature/permissions/operation.rb
-- lib/toggles/feature/permissions/operation/and.rb
-- lib/toggles/feature/permissions/operation/attribute.rb
-- lib/toggles/feature/permissions/operation/gt.rb
-- lib/toggles/feature/permissions/operation/in.rb
-- lib/toggles/feature/permissions/operation/lt.rb
-- lib/toggles/feature/permissions/operation/not.rb
-- lib/toggles/feature/permissions/operation/or.rb
-- lib/toggles/feature/permissions/operation/range.rb
 - lib/toggles/feature/subject.rb
 - spec/spec_helper.rb
+- spec/toggles/feature/acceptance/collection_spec.rb
+- spec/toggles/feature/acceptance/multiple_subjects_spec.rb
+- spec/toggles/feature/acceptance/nested_attributes_spec.rb
+- spec/toggles/feature/acceptance/type_spec.rb
 - spec/toggles/feature/base_spec.rb
-- spec/toggles/feature/nested_attributes_spec.rb
-- spec/toggles/feature/permissions/operation/and_spec.rb
-- spec/toggles/feature/permissions/operation/attribute_spec.rb
-- spec/toggles/feature/permissions/operation/gt_spec.rb
-- spec/toggles/feature/permissions/operation/in_spec.rb
-- spec/toggles/feature/permissions/operation/lt_spec.rb
-- spec/toggles/feature/permissions/operation/not_spec.rb
-- spec/toggles/feature/permissions/operation/or_spec.rb
-- spec/toggles/feature/permissions/operation/range_spec.rb
+- spec/toggles/feature/operation/and_spec.rb
+- spec/toggles/feature/operation/attribute_spec.rb
+- spec/toggles/feature/operation/gt_spec.rb
+- spec/toggles/feature/operation/in_spec.rb
+- spec/toggles/feature/operation/lt_spec.rb
+- spec/toggles/feature/operation/not_spec.rb
+- spec/toggles/feature/operation/or_spec.rb
+- spec/toggles/feature/operation/range_spec.rb
 - spec/toggles/feature/permissions_spec.rb
 - spec/toggles/feature/subject_spec.rb
 - toggles.gemspec
@@ -175,15 +179,18 @@ specification_version: 4
 summary: YAML backed feature toggles
 test_files:
 - spec/spec_helper.rb
+- spec/toggles/feature/acceptance/collection_spec.rb
+- spec/toggles/feature/acceptance/multiple_subjects_spec.rb
+- spec/toggles/feature/acceptance/nested_attributes_spec.rb
+- spec/toggles/feature/acceptance/type_spec.rb
 - spec/toggles/feature/base_spec.rb
-- spec/toggles/feature/nested_attributes_spec.rb
-- spec/toggles/feature/permissions/operation/and_spec.rb
-- spec/toggles/feature/permissions/operation/attribute_spec.rb
-- spec/toggles/feature/permissions/operation/gt_spec.rb
-- spec/toggles/feature/permissions/operation/in_spec.rb
-- spec/toggles/feature/permissions/operation/lt_spec.rb
-- spec/toggles/feature/permissions/operation/not_spec.rb
-- spec/toggles/feature/permissions/operation/or_spec.rb
-- spec/toggles/feature/permissions/operation/range_spec.rb
+- spec/toggles/feature/operation/and_spec.rb
+- spec/toggles/feature/operation/attribute_spec.rb
+- spec/toggles/feature/operation/gt_spec.rb
+- spec/toggles/feature/operation/in_spec.rb
+- spec/toggles/feature/operation/lt_spec.rb
+- spec/toggles/feature/operation/not_spec.rb
+- spec/toggles/feature/operation/or_spec.rb
+- spec/toggles/feature/operation/range_spec.rb
 - spec/toggles/feature/permissions_spec.rb
 - spec/toggles/feature/subject_spec.rb

data/lib/toggles/feature/permissions/operation.rb

@@ -1,8 +0,0 @@
-require "toggles/feature/permissions/operation/and"
-require "toggles/feature/permissions/operation/attribute"
-require "toggles/feature/permissions/operation/gt"
-require "toggles/feature/permissions/operation/in"
-require "toggles/feature/permissions/operation/lt"
-require "toggles/feature/permissions/operation/not"
-require "toggles/feature/permissions/operation/or"
-require "toggles/feature/permissions/operation/range"

data/lib/toggles/feature/permissions/operation/and.rb

@@ -1,13 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class And
-        def self.call(entity, attr_name, expected)
-          expected.all? do |operation, value|
-            OPERATIONS[operation.to_sym].call(entity, attr_name, value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/attribute.rb

@@ -1,21 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class Attribute
-        def self.call(entity, attr_name, expected)
-          if expected.kind_of? Hash
-            expected.all? do |operation, rules|
-              if OPERATIONS.include? operation.to_sym
-                OPERATIONS[operation.to_sym].call(entity, attr_name, rules)
-              else
-                Operation::Attribute.call(entity.send(attr_name), operation, rules)
-              end
-            end
-          else
-            entity.send(attr_name) == expected
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/gt.rb

@@ -1,11 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class GreaterThan
-        def self.call(entity, attr_name, expected)
-          entity.send(attr_name) > expected
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/in.rb

@@ -1,17 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class In
-        def self.call(entity, attr_name, expected)
-          if expected.kind_of? Hash
-            expected = expected.reduce([]) do |list, (operation, args)|
-              OPERATIONS[operation.to_sym].call(args)
-            end
-          end
-
-          expected.include? entity.send(attr_name.to_sym)
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/lt.rb

@@ -1,11 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class LessThan
-        def self.call(entity, attr_name, expected)
-          entity.send(attr_name) < expected
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/not.rb

@@ -1,17 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class Not
-        def self.call(entity, attr_name, expected)
-          if expected.kind_of? Hash
-            expected.none? do |operation, value|
-              OPERATIONS[operation.to_sym].call(entity, attr_name, value)
-            end
-          else
-            entity.send(attr_name) != expected
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/or.rb

@@ -1,13 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class Or
-        def self.call(entity, attr_name, expected)
-          expected.any? do |operation, value|
-            OPERATIONS[operation.to_sym].call(entity, attr_name, value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toggles/feature/permissions/operation/range.rb

@@ -1,12 +0,0 @@
-module Feature
-  class Permissions
-    module Operation
-      class Range
-        def self.call(args)
-          raise StandardError, "Invalid range operation" if args.size != 2
-          (args.first..args.last)
-        end
-      end
-    end
-  end
-end

data/spec/toggles/feature/nested_attributes_spec.rb

@@ -1,25 +0,0 @@
-describe "nested_attributes.yml" do
-  specify do
-    expect(
-      Feature::NestedAttributes.enabled_for?(
-        foo: double(bar: :two, baz: double(id: 51))
-      )
-    ).to eq true
-    expect(
-      Feature::NestedAttributes.enabled_for?(
-        foo: double(bar: :two, baz: double(id: 10))
-      )
-    ).to eq true
-
-    expect(
-      Feature::NestedAttributes.enabled_for?(
-        foo: double(bar: :one, baz: double(id: 51))
-      )
-    ).to eq false
-    expect(
-      Feature::NestedAttributes.enabled_for?(
-        foo: double(bar: :two, baz: double(id: 50))
-      )
-    ).to eq false
-  end
-end