active_remote 5.1.1 → 5.2.0.alpha

data/spec/support/models/default_author.rb

@@ -6,7 +6,7 @@ require "support/protobuf/author.pb"
 class DefaultAuthor < ::ActiveRemote::Base
   service_class ::Generic::Remote::AuthorService
 
-  attribute :guid, :default => lambda { 100 }
-  attribute :name, :default => "John Doe"
+  attribute :guid, :string, :default => lambda { 100 }
+  attribute :name, :string, :default => "John Doe"
   attribute :books, :default => []
 end

data/spec/support/models/post.rb

@@ -6,11 +6,11 @@ require "support/protobuf/post.pb"
 class Post < ::ActiveRemote::Base
   service_class ::Generic::Remote::PostService
 
-  attribute :guid
-  attribute :name
-  attribute :author_guid
-  attribute :user_guid
-  attribute :bestseller_guid
+  attribute :guid, :string
+  attribute :name, :string
+  attribute :author_guid, :string
+  attribute :user_guid, :string
+  attribute :bestseller_guid, :string
 
   belongs_to :author
   belongs_to :coauthor, :class_name => "::Author"

data/spec/support/models/tag.rb

@@ -6,10 +6,10 @@ require "support/protobuf/tag.pb"
 class Tag < ::ActiveRemote::Base
   service_class ::Generic::Remote::TagService
 
-  attribute :guid
-  attribute :name
-  attribute :updated_at
-  attribute :user_guid
+  attribute :guid, :string
+  attribute :name, :string
+  attribute :updated_at, :datetime
+  attribute :user_guid, :string
 
   after_update :after_update_callback
   after_create :after_create_callback

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0.alpha
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -203,8 +203,7 @@ files:
 - bin/console
 - lib/active_remote.rb
 - lib/active_remote/association.rb
-- lib/active_remote/attribute_definition.rb
-- lib/active_remote/attributes.rb
+- lib/active_remote/attribute_methods.rb
 - lib/active_remote/base.rb
 - lib/active_remote/config.rb
 - lib/active_remote/dirty.rb
@@ -224,7 +223,6 @@ files:
 - lib/active_remote/validations.rb
 - lib/active_remote/version.rb
 - spec/lib/active_remote/association_spec.rb
-- spec/lib/active_remote/attributes_spec.rb
 - spec/lib/active_remote/base_spec.rb
 - spec/lib/active_remote/dirty_spec.rb
 - spec/lib/active_remote/dsl_spec.rb
@@ -256,7 +254,6 @@ files:
 - spec/support/models/no_attributes.rb
 - spec/support/models/post.rb
 - spec/support/models/tag.rb
-- spec/support/models/typecasted_author.rb
 - spec/support/protobuf.rb
 - spec/support/protobuf/author.pb.rb
 - spec/support/protobuf/category.pb.rb
@@ -278,18 +275,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Active Record for your platform
 test_files:
 - spec/lib/active_remote/association_spec.rb
-- spec/lib/active_remote/attributes_spec.rb
 - spec/lib/active_remote/base_spec.rb
 - spec/lib/active_remote/dirty_spec.rb
 - spec/lib/active_remote/dsl_spec.rb
@@ -321,7 +316,6 @@ test_files:
 - spec/support/models/no_attributes.rb
 - spec/support/models/post.rb
 - spec/support/models/tag.rb
-- spec/support/models/typecasted_author.rb
 - spec/support/protobuf.rb
 - spec/support/protobuf/author.pb.rb
 - spec/support/protobuf/category.pb.rb

data/lib/active_remote/attribute_definition.rb

@@ -1,114 +0,0 @@
-require "active_model/type"
-
-module ActiveRemote
-  # Represents an attribute for reflection
-  #
-  # @example Usage
-  #   AttributeDefinition.new(:amount)
-  #
-  # @since 0.2.0
-  class AttributeDefinition
-    include Comparable
-
-    # The attribute name
-    # @since 0.2.0
-    attr_reader :name
-
-    # Compare attribute definitions
-    #
-    # @example
-    #   attribute_definition <=> other
-    #
-    # @param [ActiveAttr::AttributeDefinition, Object] other The other
-    #   attribute definition to compare with.
-    #
-    # @return [-1, 0, 1, nil]
-    #
-    # @since 0.2.1
-    def <=>(other)
-      return nil unless other.instance_of? self.class
-      return nil if name == other.name && options != other.options
-
-      self.name.to_s <=> other.name.to_s
-    end
-
-    # Read an attribute option
-    #
-    # @example
-    #   attribute_definition[:type]
-    #
-    # @param [Symbol] key The option key
-    #
-    # @since 0.5.0
-    def [](key)
-      @options[key]
-    end
-
-    # Creates a new AttributeDefinition
-    #
-    # @example Create an attribute defintion
-    #   AttributeDefinition.new(:amount)
-    #
-    # @param [Symbol, String, #to_sym] name attribute name
-    # @param [Symbol] type attribute type
-    # @param [Hash{Symbol => Object}] options attribute options
-    #
-    # @return [ActiveAttr::AttributeDefinition]
-    #
-    # @since 0.2.0
-    def initialize(name, type = :value, **options)
-      raise TypeError, "can't convert #{name.class} into Symbol" unless name.respond_to? :to_sym
-
-      @name = name.to_sym
-      @type = ::ActiveModel::Type.lookup(type)
-      @options = options
-    end
-
-    def from_rpc(value)
-      type.deserialize(value)
-    end
-
-    def from_user(value)
-      type.cast(value)
-    end
-
-    # Returns the code that would generate the attribute definition
-    #
-    # @example Inspect the attribute definition
-    #   attribute.inspect
-    #
-    # @return [String] Human-readable presentation of the attribute
-    #   definition
-    #
-    # @since 0.6.0
-    def inspect
-      options_description = options.map { |key, value| "#{key.inspect} => #{value.inspect}" }.sort.join(", ")
-      inspected_options = ", #{options_description}" unless options_description.empty?
-      "attribute :#{name}#{inspected_options}"
-    end
-
-    # The attribute name
-    #
-    # @return [String] the attribute name
-    #
-    # @since 0.2.0
-    delegate :to_s, :to => :name
-
-    # The attribute name
-    #
-    # @return [Symbol] the attribute name
-    #
-    # @since 0.2.1
-    def to_sym
-      name
-    end
-
-  protected
-
-    # The attribute options
-    # @since 0.5.0
-    attr_reader :options, :type
-  end
-
-  ::ActiveModel::Type.register(:value, ::ActiveModel::Type::Value)
-end

data/lib/active_remote/attributes.rb

@@ -1,204 +0,0 @@
-module ActiveRemote
-  module Attributes
-    extend ::ActiveSupport::Concern
-    include ::ActiveModel::AttributeMethods
-
-    included do
-      attribute_method_suffix "="
-    end
-
-    # Performs equality checking on the result of attributes and its type.
-    #
-    # @example Compare for equality.
-    #   model == other
-    #
-    def ==(other)
-      return false unless other.instance_of?(self.class)
-
-      attributes == other.attributes
-    end
-
-    # Returns a copy of our attributes hash
-    def attributes
-      @attributes.dup
-    end
-
-    # Returns the class name plus its attributes
-    #
-    # @example Inspect the model.
-    #   person.inspect
-    #
-    def inspect
-      attribute_descriptions = attributes.sort.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
-      separator = " " unless attribute_descriptions.empty?
-      "#<#{self.class.name}#{separator}#{attribute_descriptions}>"
-    end
-
-    # Read attribute from the attributes hash
-    #
-    def read_attribute(name)
-      name = name.to_s
-
-      if respond_to?(name)
-        attribute(name)
-      else
-        raise ::ActiveRemote::UnknownAttributeError, "unknown attribute: #{name}"
-      end
-    end
-    alias_method :[], :read_attribute
-
-    # Update an attribute in the attributes hash
-    #
-    def write_attribute(name, value)
-      name = name.to_s
-
-      if respond_to?("#{name}=")
-        __send__("attribute=", name, value)
-      else
-        raise ::ActiveRemote::UnknownAttributeError, "unknown attribute: #{name}"
-      end
-    end
-    alias_method :[]=, :write_attribute
-
-    # Read an attribute from the attributes hash
-    #
-    def attribute(name)
-      @attributes[name]
-    end
-
-    # Write an attribute to the attributes hash
-    #
-    def attribute=(name, value)
-      @attributes[name] = self.class.attributes[name].from_user(value)
-    end
-
-    def attribute_method?(attr_name)
-      # Check if @attributes is defined because dangerous_attribute? method
-      # can check allocate.respond_to? before actaully calling initialize
-      defined?(@attributes) && @attributes.key?(attr_name)
-    end
-
-    module ClassMethods
-      # Defines an attribute
-      #
-      # For each attribute that is defined, a getter and setter will be
-      # added as an instance method to the model. An
-      # {AttributeDefinition} instance will be added to result of the
-      # attributes class method.
-      #
-      # @example Define an attribute.
-      #   attribute :name
-      #
-      def attribute(name, options = {})
-        if (dangerous_attribute_method_name = dangerous_attribute?(name))
-          raise ::ActiveRemote::DangerousAttributeError, %(an attribute method named "#{dangerous_attribute_method_name}" would conflict with an existing method)
-        else
-          attribute!(name, options)
-        end
-      end
-
-      # Defines an attribute without checking for conflicts
-      #
-      # Allows you to define an attribute whose methods will conflict
-      # with an existing method. For example, Ruby's Timeout library
-      # adds a timeout method to Object. Attempting to define a timeout
-      # attribute using .attribute will raise a
-      # {DangerousAttributeError}, but .attribute! will not.
-      #
-      # @example Define a dangerous attribute.
-      #   attribute! :timeout
-      #
-      def attribute!(name, options = {})
-        ::ActiveRemote::AttributeDefinition.new(name, options).tap do |attribute_definition|
-          attribute_name = attribute_definition.name.to_s
-          # Force active model to generate attribute methods
-          remove_instance_variable("@attribute_methods_generated") if instance_variable_defined?("@attribute_methods_generated")
-          define_attribute_methods([attribute_definition.name]) unless attribute_names.include?(attribute_name)
-          attributes[attribute_name] = attribute_definition
-          build_default_attributes_hash
-        end
-      end
-
-      # Returns an Array of attribute names as Strings
-      #
-      # @example Get attribute names
-      #   Person.attribute_names
-      #
-      def attribute_names
-        attributes.keys
-      end
-
-      # Returns a Hash of AttributeDefinition instances
-      #
-      # @example Get attribute definitions
-      #   Person.attributes
-      #
-      def attributes
-        @attributes ||= ::ActiveSupport::HashWithIndifferentAccess.new
-      end
-
-      # Determine if a given attribute name is dangerous
-      #
-      # Some attribute names can cause conflicts with existing methods
-      # on an object. For example, an attribute named "timeout" would
-      # conflict with the timeout method that Ruby's Timeout library
-      # mixes into Object.
-      #
-      # @example Testing a harmless attribute
-      #   Person.dangerous_attribute? :name #=> false
-      #
-      # @example Testing a dangerous attribute
-      #   Person.dangerous_attribute? :timeout #=> "timeout"
-      #
-      def dangerous_attribute?(name)
-        return false if attribute_names.include?(name.to_s)
-
-        attribute_methods(name).detect do |method_name|
-          allocate.respond_to?(method_name, true)
-        end
-      end
-
-      # Returns the class name plus its attribute names
-      #
-      # @example Inspect the model's definition.
-      #   Person.inspect
-      #
-      def inspect
-        inspected_attributes = attribute_names.sort
-        attributes_list = "(#{inspected_attributes.join(', ')})" unless inspected_attributes.empty?
-        "#{name}#{attributes_list}"
-      end
-
-    protected
-
-      # Assign a set of attribute definitions, used when subclassing models
-      #
-      def attributes=(attributes)
-        @attributes = attributes
-      end
-
-    private
-
-      # Expand an attribute name into its generated methods names
-      #
-      def attribute_methods(name)
-        attribute_method_matchers.map { |matcher| matcher.method_name(name) }
-      end
-
-      def build_default_attributes_hash
-        @default_attributes_hash = Hash[attribute_names.map { |key| [key, nil] }]
-      end
-
-      def default_attributes_hash
-        @default_attributes_hash || {}
-      end
-
-      # Ruby inherited hook to assign superclass attributes to subclasses
-      #
-      def inherited(subclass)
-        super
-        subclass.attributes = attributes.dup
-      end
-    end
-  end
-end