acfs 0.45.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94d04da7b680edf457505737b4bcc1d18d6e3fb3
-  data.tar.gz: 629b89356e8be9625b20722ca89bfe88ff3d5bc9
+SHA256:
+  metadata.gz: 5f6205aca10d63d37898eecce39e239605fc0a4165d17a9ad994ead94e0037dd
+  data.tar.gz: e1dac804253b61cabd8d5e9410784268c689771fedb9bdcad8c99a67e0b946ef
 SHA512:
-  metadata.gz: 7afc2b923b468780cd3dabd0d6ff592e829b2b158d3b96469513ca324e2644a6e4d30f48408efb0ef48bc53e35595b963b8700131d8a8a81933eb4bef8f324b1
-  data.tar.gz: 45349a36fa4c76f564f95897102e74e4a934b9ddee69cb785868a9b75a2fd652b4ada7687d4c974a856a65b1dfb18caf372eaa963211851edf75edbc8a1a40d1
+  metadata.gz: 150fd36e55507f600437fe65dc3d853379799b6f5afc30c0aaa9644e36d4e025fa3ced557569f6af9e8cbbb8e484ede41281cefac7ceaecda3d6957647e5b76b
+  data.tar.gz: 206228583c974b3ef735d1cfb524938595856bd8741e481c80b331da1779839c4ab31073f34d615561d68f53955ea5f58c501c2d5208039522e5296233d002aa

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 1.2.0
+
+* Add Rails 5.2 compatibility
+
+## 1.1.1
+
+* `each_item`: Pass collection to provided block (#40)
+
+## 1.1.0
+
+* Add support for Rails 5.1
+
+## 1.0.1
+
+* Fix deprecation warnings when using ::Mime
+
+## 1.0.0
+
+* Switch to first non-development major as it's long time used in production.
+* Fix NewRelic RPM inference with middleware stack inherited from `ActionDispatch::MiddlewareStack`.
+
+## 0.48.0
+
+* Remove #attribute_types broke since f7e4109 (Sep 2013, v0.23)
+* Fix attribute inheritance on subclassing broken since commit 7cf1d11 (Apr 2014, v0.43)
+
+## 0.47.0
+
+* Change blank value handling of dict and list type (0a12ef1)
+
+## 0.46.0
+
+* Rework types system (#39)
+
 ## 0.45.0
 
 * Fetching multiple records (`find(ary)`) is stable now, but untested (#38)

data/README.md

@@ -313,7 +313,6 @@ Read [official guide][2] to see to to subscribe.
         * Reusing model definitions for generating responses?
         * Rails responders providing REST operations with integrated ETag,
           Modified Headers, conflict detection, ...
-    * Pagination? Filtering? (If service API provides such features.)
 * Documentation
 
 ## Contributing

data/acfs.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w(lib)
 
-  spec.add_runtime_dependency 'activesupport', '>= 3.1'
-  spec.add_runtime_dependency 'activemodel', '>= 3.1'
-  spec.add_runtime_dependency 'actionpack', '>= 3.1'
+  spec.add_runtime_dependency 'activesupport', '>= 4.2'
+  spec.add_runtime_dependency 'activemodel', '>= 4.2'
+  spec.add_runtime_dependency 'actionpack', '>= 4.2'
   spec.add_runtime_dependency 'multi_json'
 
   # Bundle update w/o version resolves to 0.3.3 ...

data/lib/acfs/middleware/json.rb

@@ -6,7 +6,7 @@ module Acfs
     #
     class JSON < Serializer
       def mime
-        ::Mime::JSON
+        ::Mime[:json]
       end
 
       def encode(data)

data/lib/acfs/middleware/msgpack.rb

@@ -9,7 +9,7 @@ module Acfs
       end
 
       def mime
-        ::Mime::MSGPACK
+        ::Mime[:msgpack]
       end
 
       def encode(data)

data/lib/acfs/resource/attributes/base.rb

@@ -1,35 +1,27 @@
 module Acfs::Resource::Attributes
   #
   class Base
-    attr_reader :options
+    attr_reader :default
 
-    def initialize(opts = {})
-      @options = opts
-      @options.reverse_merge! allow_nil: true
+    def initialize(default: nil)
+      @default = default
     end
 
-    def nil_allowed?
-      options[:allow_nil]
-    end
-
-    def blank_allowed?
-      options[:allow_blank]
+    def cast(value)
+      cast_value(value) unless value.nil?
     end
 
     def default_value
-      if options[:default].is_a? Proc
-        options[:default]
+      if default.respond_to? :call
+        default
       else
-        cast options[:default]
+        cast default
       end
     end
 
-    def cast(obj)
-      return nil if obj.nil? && nil_allowed? || (obj == '' && blank_allowed?)
-      cast_type obj
-    end
+    private
 
-    def cast_type(_obj)
+    def cast_value(_value)
       raise NotImplementedError
     end
   end

data/lib/acfs/resource/attributes/boolean.rb

@@ -14,20 +14,24 @@ module Acfs::Resource::Attributes
   #  true, on, yes
   #
   class Boolean < Base
-    TRUE_VALUES = %w(true on yes 1)
+    FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF', 'no', 'NO'].to_set
 
     # @api public
     #
     # Cast given object to boolean.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [TrueClass, FalseClass] Casted boolean.
     #
-    def cast_type(obj)
-      return true if obj.is_a? TrueClass
-      return false if obj.is_a? FalseClass
+    def cast_value(value)
+      return true if value == true
+      return false if value == false
 
-      TRUE_VALUES.include? obj.to_s
+      if value.blank?
+        nil
+      else
+        !FALSE_VALUES.include?(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/date_time.rb

@@ -10,22 +10,21 @@ module Acfs::Resource::Attributes
   #   end
   #
   class DateTime < Base
+
     # @api public
     #
     # Cast given object to DateTime.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [DateTime] Casted object as DateTime.
     #
-    def cast_type(obj)
-      if nil_allowed? && obj.blank?
+    def cast_value(value)
+      if value.blank?
         nil
-      elsif obj.is_a? ::DateTime
-        obj
-      elsif obj.is_a?(Time) || obj.is_a?(Date)
-        ::DateTime.iso8601 obj.iso8601
+      elsif value.acts_like?(:time) || value.acts_like?(:date)
+        value.to_datetime
       else
-        ::DateTime.iso8601 obj
+        ::DateTime.iso8601 value
       end
     end
   end

data/lib/acfs/resource/attributes/dict.rb

@@ -14,14 +14,24 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to a dict/hash.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Hash] Casted object as hash.
     # @raise [TypeError] If object cannot be casted to a hash.
     #
-    def cast_type(obj)
-      return obj if obj.is_a? Hash
-      return obj.to_h if obj.respond_to? :to_h
-      raise TypeError.new "Cannot cast #{obj.inspect} to hash."
+    def cast_value(value)
+      return {} if value.blank?
+
+      if value.is_a?(Hash)
+        value
+      elsif value.respond_to?(:serializable_hash)
+        value.serializable_hash
+      elsif value.respond_to?(:to_hash)
+        value.to_hash
+      elsif value.respond_to?(:to_h)
+        value.to_h
+      else
+        Hash(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/float.rb

@@ -13,11 +13,19 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to float.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Float] Casted object as float.
     #
-    def cast_type(obj)
-      Float obj
+    def cast_value(value)
+      return 0.0 if value.blank?
+
+      case value
+        when ::Float then value
+        when "Infinity" then ::Float::INFINITY
+        when "-Infinity" then -::Float::INFINITY
+        when "NaN" then ::Float::NAN
+        else Float(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/integer.rb

@@ -13,15 +13,15 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to integer.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Fixnum] Casted object as fixnum.
     #
-    def cast_type(obj)
-      return 0 if obj == ''
-
-      Integer obj
-    rescue ArgumentError => e
-      raise TypeError.new e.message
+    def cast_value(value)
+      if value.blank?
+        0
+      else
+        Integer(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/list.rb

@@ -13,13 +13,22 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to a list.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Fixnum] Casted object as list.
     # @raise [TypeError] If object cannot be casted to a list.
     #
-    def cast_type(obj)
-      return obj.to_a if obj.respond_to? :to_a
-      raise TypeError.new "Cannot cast #{obj.inspect} to array."
+    def cast_value(value)
+      return [] if value.blank?
+
+      if value.is_a?(::Array)
+        value
+      elsif value.respond_to?(:to_ary)
+        value.to_ary
+      elsif value.respond_to?(:to_a)
+        value.to_a
+      else
+        Array(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/string.rb

@@ -14,11 +14,11 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to string.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [String] Casted string.
     #
-    def cast_type(obj)
-      obj.to_s
+    def cast_value(value)
+      value.to_s
     end
   end
 end

data/lib/acfs/resource/attributes/uuid.rb

@@ -10,7 +10,7 @@ module Acfs::Resource::Attributes
   #
   class UUID < Base
     #
-    REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
+    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
 
     # @api public
     #
@@ -28,23 +28,16 @@ module Acfs::Resource::Attributes
     #   |     4 | 4      |
     #   |     5 | 12     |
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [String] Casted object as UUID.
     #
-    def cast_type(obj)
-      cast_string obj.to_s
-    end
-
-    private
-
-    def cast_string(str)
-      if nil_allowed? && str.blank?
-        return nil
-      elsif str =~ REGEXP
-        str
+    def cast_value(value)
+      if value.blank?
+        nil
+      elsif value.to_s =~ UUID_REGEXP
+        value
       else
-        raise ArgumentError.new "given String `#{str}` " \
-                                'does not look like a UUID'
+        raise TypeError.new "Invalid UUID: `#{value.to_s}'"
       end
     end
   end

data/lib/acfs/resource/attributes.rb

@@ -47,7 +47,7 @@ class Acfs::Resource
     #   Attributes and their values.
     #
     def attributes
-      @attributes ||= HashWithIndifferentAccess.new
+      @_attrs ||= HashWithIndifferentAccess.new
     end
 
     # @api public
@@ -222,56 +222,30 @@ class Acfs::Resource
       #   Attributes with default values.
       #
       def attributes
-        {}.tap do |attrs|
-          defined_attributes.each do |key, attr|
-            attrs[key] = attr.default_value
-          end
+        defined_attributes.each_with_object({}) do |(key, attr), hash|
+          hash[key] = attr.default_value
         end
       end
 
       def defined_attributes
-        @attributes ||= begin
-          attributes = {}
-          if superclass.respond_to?(:defined_attributes)
-            attributes.merge superclass.defined_attributes
-          end
-
-          attributes
+        if superclass.respond_to?(:defined_attributes)
+          superclass.defined_attributes.merge(local_attributes)
+        else
+          local_attributes
         end
       end
 
-      # @api public
-      #
-      # Return hash of attributes and there types.
-      #
-      # @example
-      #   class User < Acfs::Resource
-      #     attribute :name, :string
-      #     attribute :age, :integer, default: 25
-      #   end
-      #   User.attributes # => {"name": Acfs::Model::Attributes::String,
-      #                   #     "age":  Acfs::Model::Attributes::Integer}
-      #
-      # @return [Hash{Symbol => Class}] Attributes and their types.
-      #
-      def attribute_types
-        @attribute_types ||= begin
-          attribute_types = {}
-          if superclass.respond_to?(:attribute_types)
-            attribute_types.merge superclass.attribute_types
-          end
+      private
 
-          attribute_types
-        end
+      def local_attributes
+        @local_attributes ||= {}
       end
 
-      private
-
       def define_attribute(name, type, opts = {})
         name      = name.to_s
         attribute = type.new opts
 
-        defined_attributes[name] = attribute
+        local_attributes[name] = attribute
         define_attribute_method name
 
         send :define_method, name do

data/lib/acfs/resource/dirty.rb

@@ -8,26 +8,14 @@ class Acfs::Resource
 
     # @api private
     #
-    # Resets all changes. Does not touch previous changes.
-    #
     def reset_changes
-      changed_attributes.clear
-    end
-
-    # @api private
-    #
-    # Save current changes as previous changes and reset
-    # current one.
-    #
-    def swap_changes
-      @previously_changed = changes
-      reset_changes
+      clear_changes_information
     end
 
     # @api private
     #
     def save!(*)
-      super.tap {|_| swap_changes }
+      super.tap {|_| changes_applied }
     end
 
     # @api private
@@ -40,7 +28,7 @@ class Acfs::Resource
     # @api private
     #
     def write_raw_attribute(name, value, opts = {})
-      attribute_will_change! name if opts[:change].nil? || opts[:change]
+      attribute_will_change!(name) if opts[:change].nil? || opts[:change]
       super
     end
   end

data/lib/acfs/resource/query_methods.rb

@@ -193,10 +193,13 @@ class Acfs::Resource
       #
       # @yield [item] Callback that will be invoked for each item.
       # @yieldparam item [self] Resource.
+      # @yieldparam collection [Acfs::Collection] Collection.
       #
-      def each_item(opts = {}, &block)
+      def each_item(opts = {})
         each_page(opts) do |collection|
-          collection.each(&block)
+          collection.each do |item|
+            yield item, collection
+          end
         end
       end
 

data/lib/acfs/resource/validation.rb

@@ -13,8 +13,10 @@ class Acfs::Resource
 
     def remote_errors=(errors)
       (errors || []).each do |field, errs|
-        self.errors.set field.to_sym, errs
-        remote_errors.set field.to_sym, errs
+        errs.each do |err|
+          self.errors.add field.to_sym, err
+          remote_errors.add field.to_sym, err
+        end
       end
     end
 

data/lib/acfs/response/formats.rb

@@ -9,7 +9,7 @@ module Acfs
       end
 
       def json?
-        content_type == Mime::JSON
+        content_type == Mime[:json]
       end
 
       private

data/lib/acfs/service/middleware/stack.rb

@@ -1,28 +1,57 @@
-require 'action_dispatch/middleware/stack'
-
 module Acfs
   class Service
     module Middleware
-      class Stack < ActionDispatch::MiddlewareStack
+      class Stack
+        include Enumerable
+
         MUTEX = Mutex.new
         IDENTITY = -> (i) { i }
 
+        attr_reader :middlewares
+
+        def initialize
+          @middlewares = []
+        end
+
+        def call(request)
+          build! unless @app
+
+          @app.call request
+        end
+
         def build!
+          return if @app
+
           MUTEX.synchronize do
-            return if @stack
+            return if @app
 
-            @stack = build
+            @app = build
           end
         end
 
         def build(app = IDENTITY)
-          super
+          middlewares.reverse.inject(app) do |next_middleware, current_middleware|
+            klass, args, block = current_middleware
+            args ||= []
+
+            if klass.is_a?(Class)
+              klass.new(next_middleware, *args, &block)
+            elsif klass.respond_to?(:call)
+              lambda do |env|
+                next_middleware.call(klass.call(env, *args))
+              end
+            else
+              fail "Invalid middleware, doesn't respond to `call`: #{klass.inspect}"
+            end
+          end
         end
 
-        def call(request)
-          build! unless @stack
+        def insert(index, klass, *args, &block)
+          middlewares.insert(index, [klass, args, block])
+        end
 
-          @stack.call request
+        def each
+          middlewares.each { |x| yield x.first }
         end
 
         def clear

data/lib/acfs/version.rb

@@ -1,7 +1,7 @@
 module Acfs
   module VERSION
     MAJOR = 0
-    MINOR = 45
+    MINOR = 50
     PATCH = 0
     STAGE = nil
 

data/spec/acfs/resource/attributes/boolean_spec.rb

@@ -3,23 +3,54 @@ require 'spec_helper'
 describe Acfs::Resource::Attributes::Boolean do
   subject { Acfs::Resource::Attributes::Boolean.new }
 
-  describe 'cast' do
-    it 'should preserve boolean values' do
+  describe '#cast' do
+    it 'casts nil' do
+      expect(subject.cast(nil)).to eq nil
+    end
+
+    it 'casts empty string to false' do
+      expect(subject.cast('')).to eq nil
+    end
+
+    it 'casts blank string to false' do
+      expect(subject.cast("  \t")).to eq nil
+    end
+
+    it 'preserves boolean values' do
       expect(subject.cast(false)).to eq false
       expect(subject.cast(true)).to eq true
     end
 
-    it 'should cast TRUE_VALUES to true' do
+    it 'casts falsy values to false' do
+      expect(subject.cast(false)).to eq false
+      expect(subject.cast(0)).to eq false
+      expect(subject.cast('0')).to eq false
+      expect(subject.cast('no')).to eq false
+      expect(subject.cast('NO')).to eq false
+      expect(subject.cast('off')).to eq false
+      expect(subject.cast('OFF')).to eq false
+      expect(subject.cast('false')).to eq false
+      expect(subject.cast('FALSE')).to eq false
+      expect(subject.cast('f')).to eq false
+      expect(subject.cast('F')).to eq false
+    end
+
+    it 'casts any other value to true' do
+      expect(subject.cast(true)).to eq true
+      expect(subject.cast(1)).to eq true
+      expect(subject.cast('1')).to eq true
       expect(subject.cast('yes')).to eq true
+      expect(subject.cast('YES')).to eq true
       expect(subject.cast('on')).to eq true
+      expect(subject.cast('ON')).to eq true
       expect(subject.cast('true')).to eq true
-      expect(subject.cast('1')).to eq true
-    end
+      expect(subject.cast('TRUE')).to eq true
+      expect(subject.cast('t')).to eq true
+      expect(subject.cast('T')).to eq true
 
-    it 'should cast any other value to false' do
-      expect(subject.cast('')).to eq false
-      expect(subject.cast('wrong')).to eq false
-      expect(subject.cast('random')).to eq false
+      expect(subject.cast(2)).to eq true
+      expect(subject.cast('wrong')).to eq true
+      expect(subject.cast('random')).to eq true
     end
   end
 end