servi 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11896204fcc9e4b7211577129399d9863d657bed
-  data.tar.gz: 2131f13d63197edde1f10c97fe45105982518f94
+  metadata.gz: 6811acf7e53f4885c8132c0d83eded742bf588a7
+  data.tar.gz: 9821e8dca4ce04e82cc3c491c5cdc7a2802416b0
 SHA512:
-  metadata.gz: 7fe1da5405b9ddafe4dd34516850cab60d6930ee91d0360223958960e3346b806989a3e3e99d749b22444d80c44edb0b231c56b560d2a9f0e8b3766767e1b5f0
-  data.tar.gz: baa30cf484fd306b3a2d3343d072b368645f70e030e7296c5554cff7d4b8e405f893b3d5009cbb612d819e267c61076fb30188bdbba29b12f77e77597b780ecb
+  metadata.gz: 8ec854851433cf72b0d9036f93fbbef5b88616f25baefdfa4e709ae28a43bc1ef88a5e5587e047634d0e253bf8277bd0308597ceb34d82967290c25031bbf035
+  data.tar.gz: 35432e25d98b66cf15dcfa21a24d1332083723a85660fc76774e680a48f662590580b08345ba25ef9cc148065f2d97a73358efcffe4c018e30359d4607154ca0

data/lib/servi.rb

@@ -1,60 +1,53 @@
-require "scrivener"
+require_relative "servi/validations"
 
 class Servi
-  attr :input
+  include Servi::Validations
 
-  def self.call(user_input, trusted_input)
-    service = new(user_input)
+  attr_reader :errors
 
-    trusted_input.each do |key, value|
-      service.send("#{key}=", value)
-    end
-
-    service.commit
-  end
+  def self.call(params, trusted = {})
+    merged = params.dup
 
-  def self.empty_result
-    Servi::Result.new(:empty, {}, {}, Servi::Errors.new)
-  end
+    trusted.each do |key, value|
+      merged[key.to_s] = value
+    end
 
-  def initialize(input = {})
-    @input = input
-  end
+    service = new(merged)
 
-  def commit
-    form = self.class.const_get(:Input).new(input, self.validation_context)
+    service.validate
 
-    if form.valid?
-      build(form.attributes)
+    if service.errors.empty?
+      service.build(service.clean)
     else
-      error(form.errors)
+      service.error(service.errors)
     end
   end
 
-  # Things you may need when validating the input
-  def validation_context
-    {}
+  def initialize(params)
+    @params = params
+    @errors = Hash.new { |hash, key| hash[key] = [] }
+  end
+
+  def get(attr)
+    @params[attr.to_s]
   end
-  protected :validation_context
 
   def error(errors)
-    Result.new(:error, @input, {}, Errors.new(errors))
+    Result.new(:error, @params, {}, errors)
   end
-  protected :error
 
   def success(output = {})
-    Result.new(:success, @input, output)
+    Result.new(:success, @params, output)
   end
-  protected :success
 
   class Result
-    attr :input
     attr :output
+    attr :params
     attr :errors
 
-    def initialize(status, input, output, errors = Hash.new { |hash, key| hash[key] = [] })
+    def initialize(status, params, output, errors = Hash.new { |hash, key| hash[key] = [] })
       @status = status
-      @input = input
+      @params = params
       @output = output
       @errors = errors
     end
@@ -67,45 +60,4 @@ class Servi
       @output.fetch(key)
     end
   end
-
-  class Input < ::Scrivener
-    def initialize(atts, context)
-      @context = context
-      super(atts)
-    end
-  end
-
-  class Errors
-    def initialize(errors={})
-      @errors = errors
-    end
-
-    def empty?
-      @errors.empty?
-    end
-
-    def on(att, name)
-      errors = lookup(att)
-      error = errors && errors.include?(name)
-
-      if block_given?
-        yield if error
-      else
-        error
-      end
-    end
-
-    def any?(att)
-      errors = lookup(att)
-      errors && errors.any?
-    end
-
-    def lookup(atts)
-      Array(atts).inject(@errors) { |err, att| err && !err[att].empty? && err[att] }
-    end
-
-    def [](att)
-      @errors[att]
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Kevin Hanna