tram-policy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb9b1d95aea1a9a93919d38150f6c65900e8247
-  data.tar.gz: 686439c0267b6637fdcc888f1be4aef673a4ef89
+  metadata.gz: 8e014f25ceab7b1bdbea2a67a4ba98245986689c
+  data.tar.gz: 0ed033ca9a5e8a695e78dc8b89e9d927a5373bcb
 SHA512:
-  metadata.gz: d3850a47c670108dba1c7c112aff4197bcf85a7ba41c1f4eac975c6e008e218e8bd4c4fa3eb3e871eaa9ab0e1604aed6a3484865104e21c357d993e813f89190
-  data.tar.gz: 1d3a178078a6c88da436c97a6f6cd4cf096947732930840d336b8736e4f35529ec8bea37aa0534ed0517e5ea7d69fa2857f459b35ab7fce3f44b0fdff6bba631
+  metadata.gz: 361c6c5af4c893f09d3595eb22ecea7098134c1ddc5ae2854ba9177a35f5a89ea3e6d27142e92f0e66d89b0aa8d17a7373671dc2fbcb5d51e22407a61b33d587
+  data.tar.gz: a899980e7b03a31998d1e183026d9ad675aa865445f6c28392c3ee13bdd23de9e09b2e90f3cb0dd77f572931605e8fe436f372b71b086a4a7464ac4b6c91e6da

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.1.1] - [2017-08-04]
+
+### Added
+- Support for options in errors.merge (@nepalez)
+
+    # adds `field: "user"` to every merged error
+    errors.merge other_policy.errors, field: "user"
+
 ## [0.1.0] - [2017-05-31]
 Contains backward-incompatible change.
 
@@ -52,4 +60,6 @@ This is a first public release (@nepalez, @charlie-wasp, @JewelSam, @sergey-chec
 [Unreleased]: https://github.com/tram-rb/tram-policy
 [0.0.1]: https://github.com/tram-rb/tram-policy/releases/tag/v0.0.1
 [0.0.2]: https://github.com/tram-rb/tram-policy/compare/v0.0.1...v0.0.2
-[0.0.3]: https://github.com/tram-rb/tram-policy/compare/v0.0.2...v0.0.3
+[0.0.3]: https://github.com/tram-rb/tram-policy/compare/v0.0.2...v0.0.3
+[0.1.0]: https://github.com/tram-rb/tram-policy/compare/v0.0.3...v0.1.0
+[0.1.1]: https://github.com/tram-rb/tram-policy/compare/v0.1.0...v0.1.1

data/lib/tram/policy/errors.rb

@@ -80,13 +80,12 @@ class Tram::Policy
     # @example Add some tag to merged errors
     #   policy.merge(other) { |err| err[:source] = "other" }
     #
-    def merge(other)
-      return self unless other.is_a?(self.class) && other.any?
+    def merge(other, **options)
+      return self unless other.is_a?(self.class)
 
-      if block_given?
-        other.each { |err| add yield(err.to_h) }
-      else
-        @set |= other.to_a
+      other.each do |err|
+        new_err = block_given? ? yield(err.to_h) : err.to_h
+        add new_err.merge(options)
       end
 
       self

data/spec/fixtures/admin_policy.rb

@@ -0,0 +1,6 @@
+require_relative "user_policy"
+
+class Test::AdminPolicy < Test::UserPolicy
+  validate :login
+  validate :name
+end

data/spec/fixtures/customer_policy.rb

@@ -0,0 +1,12 @@
+class Test::CustomerPolicy < Tram::Policy
+  option :name
+
+  validate :name_presence
+
+  private
+
+  def name_presence
+    return if name
+    errors.add :name_presence, field: "name"
+  end
+end

data/spec/fixtures/en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  tram-policy:
+    test/customer_policy:
+      name_presence: Name is absent
+    test/user_policy:
+      name_presence: Name is absent

data/spec/fixtures/user_policy.rb

@@ -0,0 +1,21 @@
+class Test::UserPolicy < Tram::Policy
+  param :user
+
+  validate :name
+  validate "email"
+  validate "name"
+
+  private
+
+  def name
+    errors.add "No name", level: "warning" unless user.name
+  end
+
+  def email
+    user.email
+  end
+
+  def login
+    user.login
+  end
+end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require "tram/policy"
 require "tram/policy/rspec"
 require "rspec/its"
 
+require_relative "support/fixtures_helper.rb"
+
 RSpec.configure do |config|
   config.example_status_persistence_file_path = ".rspec_status"
   config.expect_with :rspec do |c|

data/spec/support/fixtures_helper.rb

@@ -0,0 +1,11 @@
+def fixture_file_path(filename)
+  File.expand_path "spec/fixtures/#{filename}"
+end
+
+def yaml_fixture_file(filename)
+  YAML.load_file(fixture_file_path(filename))
+end
+
+def load_fixture(filename)
+  load fixture_file_path(filename)
+end

data/spec/tram/policy/errors_spec.rb

@@ -67,6 +67,30 @@ RSpec.describe Tram::Policy::Errors do
       end
     end
 
+    context "with options:" do
+      subject { errors.merge(other, source: "Homer") }
+
+      it "merges other collection with given options" do
+        expect(subject).to be_a Tram::Policy::Errors
+        expect(subject.map(&:to_h)).to match_array [
+          { message: "OMG!", level: "disaster" },
+          { message: "OMG!", level: "error", source: "Homer" }
+        ]
+      end
+    end
+
+    context "with block and options:" do
+      subject { errors.merge(other, id: 5) { |err| err.merge id: 3, age: 4 } }
+
+      it "merges filtered collection with given options" do
+        expect(subject).to be_a Tram::Policy::Errors
+        expect(subject.map(&:to_h)).to match_array [
+          { message: "OMG!", level: "disaster" },
+          { message: "OMG!", level: "error", id: 5, age: 4 }
+        ]
+      end
+    end
+
     context "not errors:" do
       subject { errors.merge 1 }
       it { is_expected.to eql errors }

data/spec/tram/policy/rspec_spec.rb

@@ -1,25 +1,12 @@
 RSpec.describe "RSpec support:" do
-  subject { Test::UserPolicy[name: nil] }
-
   before do
     I18n.available_locales = %i[en]
-    I18n.backend.store_translations \
-      :en, { "test/user_policy" => { "name_presence" => "Name is absent" } }
-
-    class Test::UserPolicy < Tram::Policy
-      option :name
-
-      validate :name_presence
-
-      private
-
-      def name_presence
-        return if name
-        errors.add :name_presence, field: "name"
-      end
-    end
+    I18n.backend.store_translations :en, yaml_fixture_file("en.yml")["en"]
+    load_fixture "customer_policy.rb"
   end
 
+  subject { Test::CustomerPolicy[name: nil] }
+
   describe "to be_invalid_at" do
     it "passes when some translated error present w/o tags constraint" do
       expect do

data/spec/tram/policy_spec.rb

@@ -1,38 +1,10 @@
 RSpec.describe Tram::Policy do
   before do
     I18n.available_locales = %w[en]
-    I18n.backend.store_translations :en, {
-      "tram-policy" => {
-        "test/user_policy" => { "name_presence" => "Name is absent" }
-      }
-    }
-
-    class Test::UserPolicy < Tram::Policy
-      param :user
-
-      validate :name
-      validate "email"
-      validate "name"
-
-      private
-
-      def name
-        errors.add "No name", level: "warning" unless user.name
-      end
+    I18n.backend.store_translations :en, yaml_fixture_file("en.yml")["en"]
 
-      def email
-        user.email
-      end
-
-      def login
-        user.login
-      end
-    end
-
-    class Test::AdminPolicy < Test::UserPolicy
-      validate :login
-      validate :name
-    end
+    load_fixture "user_policy.rb"
+    load_fixture "admin_policy.rb"
   end
 
   let(:policy) { Test::UserPolicy[user] }

data/tram-policy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "tram-policy"
-  gem.version  = "0.1.0"
+  gem.version  = "0.1.1"
   gem.author   = ["Viktor Sokolov (gzigzigzeo)", "Andrew Kozin (nepalez)"]
   gem.email    = ["andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/tram/tram-policy"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tram-policy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Viktor Sokolov (gzigzigzeo)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -141,7 +141,12 @@ files:
 - lib/tram/policy/rspec.rb
 - lib/tram/policy/validation_error.rb
 - lib/tram/policy/validator.rb
+- spec/fixtures/admin_policy.rb
+- spec/fixtures/customer_policy.rb
+- spec/fixtures/en.yml
+- spec/fixtures/user_policy.rb
 - spec/spec_helper.rb
+- spec/support/fixtures_helper.rb
 - spec/tram/policy/error_spec.rb
 - spec/tram/policy/errors_spec.rb
 - spec/tram/policy/inflector_spec.rb
@@ -174,10 +179,16 @@ signing_key:
 specification_version: 4
 summary: Policy Object Pattern
 test_files:
+- spec/fixtures/admin_policy.rb
+- spec/fixtures/customer_policy.rb
+- spec/fixtures/en.yml
+- spec/fixtures/user_policy.rb
 - spec/spec_helper.rb
+- spec/support/fixtures_helper.rb
 - spec/tram/policy/error_spec.rb
 - spec/tram/policy/errors_spec.rb
 - spec/tram/policy/inflector_spec.rb
 - spec/tram/policy/rspec_spec.rb
 - spec/tram/policy/validation_error_spec.rb
 - spec/tram/policy_spec.rb
+has_rdoc: