arrest 0.0.11 → 0.0.12

data/lib/arrest.rb

@@ -15,10 +15,6 @@ require "arrest/http_source"
 require "arrest/mem_source"
 require "arrest/source"
 require "arrest/nested_resource"
-require "arrest/validations/validator"
-require "arrest/validations/presence_of"
-require "arrest/validations/inclusion_of"
-require "arrest/validations/validatable"
 require "arrest/abstract_resource"
 require "arrest/root_resource"
 require "arrest/rest_child"

data/lib/arrest/abstract_resource.rb

@@ -8,12 +8,11 @@ Scope = Struct.new(:name, :block)
 module Arrest
   class AbstractResource
     extend ActiveModel::Naming
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
     include HasAttributes
-    include Validatable
     attribute :id, String
 
-    attr_accessor :errors
-
     class << self
       attr_reader :scopes
 
@@ -129,8 +128,7 @@ module Arrest
     end
 
     def save
-      self.errors = self.validate
-      if self.errors.empty?
+      if Source.skip_validations || self.valid?
         verb = new_record? ? :post : :put
         !!AbstractResource::source.send(verb, self)
       else

data/lib/arrest/helper/logger.rb

@@ -1,4 +1,7 @@
 module Arrest
+  unless File::directory?( "log" )
+    Dir.mkdir("log")
+  end
   @@logger = Logger.new('log/arrest.log')
 
   def self.logger

data/lib/arrest/root_resource.rb

@@ -34,6 +34,10 @@ module Arrest
       end
 
       def find id
+        if id == nil || "" == id
+          Arrest::logger.info "DocumentNotFoundError: no id given"
+          raise Errors::DocumentNotFoundError.new
+        end
         r = source().get_one "#{self.resource_path}/#{id}"
         body = body_root(r)
         if body == nil || body.empty?

data/lib/arrest/source.rb

@@ -5,20 +5,21 @@ module Arrest
     end
   end
 
-  class Source 
+  class Source
     class << self
       attr_accessor :debug
       attr_reader :source
       attr_reader :mod
       attr_reader :header_decorator
       attr_accessor :json_key_converter
+      attr_accessor :skip_validations
 
       def source=(host=nil)
-        if host == nil || host.blank?
+        if [nil, ""].include?(host)
           @source = MemSource.new
           Arrest::logger.info "Setting Arrest host empty in-memory-store"
         else
-          @source = HttpSource.new host 
+          @source = HttpSource.new host
           Arrest::logger.info "Setting Arrest host to #{host}"
         end
         @source
@@ -63,5 +64,6 @@ module Arrest
   Source.header_decorator = Source
   Source.debug = false
   Source.json_key_converter = Source
+  Source.skip_validations = false
 
 end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/unit.rb

@@ -54,7 +54,7 @@ class FirstTest < Test::Unit::TestCase
       new_zoo = Zoo.new(p)
       assert_equal false, new_zoo.save, "zoo without name shouldnt be persistable"
       assert_equal zoo_count_before, Zoo.all.length
-      assert_equal :name, new_zoo.errors.first.attribute
+      assert_equal :name, new_zoo.errors.first[0]
       assert_nil new_zoo.id
 
       new_zoo.name = "Foo"

data/test/validations.rb

@@ -1,8 +1,8 @@
 require 'test/unit'
 require 'arrest'
+require 'active_model'
 
-class PresenceOfClass
-  include Arrest::Validatable
+class PresenceOfClass < Arrest::RootResource
   attr_accessor :foo
 
   validates_presence_of :foo
@@ -13,7 +13,7 @@ class PresenceOfClass
 end
 
 class PresenceOfTwo
-  include Arrest::Validatable
+  include ActiveModel::Validations
   attr_accessor :foo, :bar
 
   validates_presence_of :foo
@@ -37,10 +37,10 @@ class InheritedPresence < PresenceOfClass
 end
 
 class CustomVal
-  include Arrest::Validatable
+  include ActiveModel::Validations
   attr_accessor :foo
 
-  validates :is_foo
+  validate :is_foo
 
   def initialize foo=nil
     @foo = foo
@@ -48,19 +48,30 @@ class CustomVal
   
   def is_foo
     if self.foo != "Foo"
-      [Arrest::Validations::ValidationError.new(:foo, "is no foo")]
-    else
-      []
+      errors.add(:foo, "is not foo")
     end
   end
 end
 
+class InclusionOfClass
+  include ActiveModel::Validations
+
+  attr_accessor :foo
+
+  validates :foo, :inclusion => { :in => ["Foo", "Bar"] }
+
+  def initialize foo
+    @foo = foo
+  end
+end
+
 class ValidationsTest < Test::Unit::TestCase
 
 
   def setup
      Arrest::Source.source = nil
      #Arrest::Source.debug = true
+     Arrest::Source.skip_validations = false
   end
 
   def test_prsnc
@@ -71,6 +82,15 @@ class ValidationsTest < Test::Unit::TestCase
     assert o1.valid?, "Foo is present and valid!"
   end
 
+  def test_skip_validations
+    Arrest::Source.skip_validations = true
+    o0 = PresenceOfClass.new nil
+    assert o0.valid? == false, "Foo is '#{o0.foo}' -> not present and thus not valid!"
+    assert o0.save, "When skipping validations, in-mem-storage should work"
+
+    Arrest::Source.skip_validations = false
+  end
+
   def test_presence_of_two
     o = PresenceOfTwo.new 
     assert o.valid? == false, "Both missing, must not be valid"
@@ -122,17 +142,6 @@ class ValidationsTest < Test::Unit::TestCase
 
   # ================ inclusion_of ======
 
-  class InclusionOfClass
-    include Arrest::Validatable
-
-    attr_accessor :foo
-
-    validates_inclusion_of :foo, :in => ["Foo", "Bar"]
-
-    def initialize foo
-      @foo = foo
-    end
-  end
 
   def test_inclusion_of
     invalids = [nil, '', "Baz", "foo", 3, true]
@@ -142,7 +151,6 @@ class ValidationsTest < Test::Unit::TestCase
     invalids.each do |iv|
       o = InclusionOfClass.new(iv)
       assert o.valid? == false, "#{iv} is not valid"
-      assert o.validate.map(&:attribute).include?(:foo), ":foo should be in list of invalid attributes when created with #{iv}"
     end
 
     valids.each do |v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24668020 !ruby/object:Gem::Requirement
+  requirement: &15777380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24668020
+  version_requirements: *15777380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &24666840 !ruby/object:Gem::Requirement
+  requirement: &15776240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *24666840
+  version_requirements: *15776240
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &24666120 !ruby/object:Gem::Requirement
+  requirement: &15775480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *24666120
+  version_requirements: *15775480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24640360 !ruby/object:Gem::Requirement
+  requirement: &15749340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24640360
+  version_requirements: *15749340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24639500 !ruby/object:Gem::Requirement
+  requirement: &15748420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24639500
+  version_requirements: *15748420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24639020 !ruby/object:Gem::Requirement
+  requirement: &15747940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24639020
+  version_requirements: *15747940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24638440 !ruby/object:Gem::Requirement
+  requirement: &15747400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *24638440
+  version_requirements: *15747400
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &24637760 !ruby/object:Gem::Requirement
+  requirement: &15746680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24637760
+  version_requirements: *15746680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24637300 !ruby/object:Gem::Requirement
+  requirement: &15746220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24637300
+  version_requirements: *15746220
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &24636880 !ruby/object:Gem::Requirement
+  requirement: &15745800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24636880
+  version_requirements: *15745800
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -151,10 +151,6 @@ files:
 - lib/arrest/root_resource.rb
 - lib/arrest/source.rb
 - lib/arrest/string_utils.rb
-- lib/arrest/validations/inclusion_of.rb
-- lib/arrest/validations/presence_of.rb
-- lib/arrest/validations/validatable.rb
-- lib/arrest/validations/validator.rb
 - lib/arrest/version.rb
 - spec/arrest_spec.rb
 - spec/spec_helper.rb

data/lib/arrest/validations/inclusion_of.rb

@@ -1,25 +0,0 @@
-module Arrest
-  module Validations
-    class InclusionOf < Validator
-
-      def initialize attribute, hash
-        super attribute
-        @hash = hash
-      end
-
-      def validate input
-        errors = []
-        if !input.respond_to?(@attribute)
-          errors << ValidationError.new(@attribute, "not_responding")
-        else
-          val = input.send(@attribute)
-          unless @hash[:in] != nil && @hash[:in].include?(val) 
-            errors << ValidationError.new(@attribute,"not_included")
-          end
-        end
-        return errors
-      end
-    end
-  end
-end
-

data/lib/arrest/validations/presence_of.rb

@@ -1,18 +0,0 @@
-module Arrest
-  module Validations
-    class PresenceOf < Validator
-      def validate input
-        errors = []
-        if !input.respond_to?(@attribute)
-          errors << ValidationError.new(@attribute, "not_responding")
-        else
-          val = input.send(@attribute)
-          if val == nil || val == ''
-            errors << ValidationError.new(@attribute,"not_present")
-          end
-        end
-        return errors
-      end
-    end
-  end
-end

data/lib/arrest/validations/validatable.rb

@@ -1,69 +0,0 @@
-module Arrest
-  module Validations
-    class MethodValidator
-      def initialize method = nil, &blk
-        @method = method
-      end
-
-      def validate input
-        input.send(@method)
-      end
-    end
-  end
-
-  module Validatable
-    def self.included(base) # :nodoc:
-      base.extend ValidatableMethods
-    end
-
-    module ValidatableMethods
-      def validates_presence_of attribute
-        add_validator Validations::PresenceOf.new attribute
-      end
-
-      def validates method_name
-        add_validator Validations::MethodValidator.new method_name
-      end
-
-      def validates_inclusion_of attribute, hash = {}
-        add_validator Validations::InclusionOf.new attribute, hash
-      end
-
-      def add_validator v
-        if @validations == nil
-          @validations = []
-        end
-        @validations << v
-      end
-
-      def validations
-        if self.superclass.respond_to? :validations
-          super_v = self.superclass.validations
-        else 
-          super_v = []
-        end
-        if @validations == nil
-          @validations = []
-        end
-
-        @validations + super_v
-      end
-    end
-
-    # --------- instance methods ---------
-    def valid?
-      validate.empty?
-    end
-
-
-    def validate
-      vs = self.class.validations
-      return [] if vs == nil
-      errors = []
-      vs.each do |v|
-        errors += v.validate self
-      end
-      errors
-    end
-  end
-end

data/lib/arrest/validations/validator.rb

@@ -1,27 +0,0 @@
-module Arrest
-  module Validations
-    class ValidationError 
-      attr_accessor :attribute, :message
-
-      def initialize attribute, message
-        @attribute = attribute
-        @message = message
-      end
-
-      def translate
-        "#{self.attribute} - #{self.message}"
-      end
-    end
-
-    class Validator
-      def initialize attribute
-        @attribute = attribute
-      end
-
-      def validate input
-        return []
-      end
-      
-    end
-  end
-end