active_remote 3.3.3 → 5.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b8e2f3b79e43639dcdcb56f75b99674bcd1cb79100e01e79b5b1e5aa4f8494
-  data.tar.gz: bd0726676290ec68c5f7de7bb0aa5a1d39553bb88c72075f7e9879b31aeb99eb
+  metadata.gz: 20c9373eff2820fdfaeb4eefd815a1d4cfb752e9fd388e8fd0e2d4ef2c0c5f7f
+  data.tar.gz: 5f66d51af2723950bad69d3870fc83685e253f5fcfd894d6ae19dd6a78c27516
 SHA512:
-  metadata.gz: 206c1006067983f39a3944ff67a25dcd7f269f5353e19b3b0e67c3b6aa2b897f52407132e0bfcae6917da9e9b9c041fe17f081a2ae4c05d5f21558ce8ff42daa
-  data.tar.gz: 00fc6a154121e46f47b7bf57bbc8b51ccee44166189cb289f383a4cd038909792dbe470db7062decf37cb50f4a9b7bb98a47a36ad48c2827709241e01b3d1a0e
+  metadata.gz: 07d671953169e1eefc9db8b26d2de3af40a39302e1423fdd7beeb212df913c46db1017aeb2dbc2d02c21cf72f0ae35639732d6af86694f0ecd7be894ae03db04
+  data.tar.gz: 98ee4213dcd636baab1def67ba1848469ff8592aff9334b720348830e4fd797f65e2935450fe399fafdc84261a64f2a07197323d38b743c616d4b70475f7890f

data/.rubocop.yml

@@ -0,0 +1,28 @@
+# Styles are inherited from Mad Rubocop
+
+inherit_gem:
+  mad_rubocop: .rubocop.yml
+
+# Styles that are modified from the defaults
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - "**/*.pb.rb"
+
+Style/BlockDelimiters:
+  Description: >-
+                Avoid using {...} for multi-line blocks (multiline chaining is always ugly).
+                Prefer {...} over do...end for single-line blocks.
+  Exclude:
+    - "spec/**/*"
+
+Style/HashSyntax:
+  Description: >-
+                 Prefer Ruby 1.8 hash syntax { :a => 1, :b => 2 } over 1.9 syntax { a: 1, b: 2 }.
+  EnforcedStyle: hash_rockets
+  Exclude:
+    - "Gemfile"
+
+Layout/SpaceAroundOperators:
+  Exclude:
+    - "*.gemspec"

data/CHANGES.md

@@ -1,5 +1,18 @@
 # ActiveRemote Changes
 
+5.0.0
+----------
+
+- Use Active Model attributes [#72]
+- Use type casting from Active Model (custom types must be registered) [#71]
+- Use query attributes from Active Record (string values such as 'FALSE', and '0' are now considered present) [#71]
+- Drop support for Rails 4.2 (versions will match Rails version moving forward) [#71]
+
+3.3.1
+----------
+
+- Fix unknown type error in Protobuf serializer [#70]
+
 3.3.0
 ----------
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in active_remote.gemspec
 gemspec

data/Rakefile

@@ -2,12 +2,16 @@
 require "bundler/gem_tasks"
 require "protobuf/tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+desc "Run cops"
+::RuboCop::RakeTask.new(:rubocop)
 
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec)
+::RSpec::Core::RakeTask.new(:spec)
 
-desc "Run specs (default)"
-task :default, [] => :spec
+desc "Run cops and specs (default)"
+task :default => [:rubocop, :spec]
 
 desc "Remove protobuf definitions that have been compiled"
 task :clean do

data/active_remote.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require "active_remote/version"
 
 Gem::Specification.new do |s|
@@ -8,19 +9,19 @@ Gem::Specification.new do |s|
   s.authors       = ["Adam Hutchison"]
   s.email         = ["liveh2o@gmail.com"]
   s.homepage      = "https://github.com/liveh2o/active_remote"
-  s.summary       = %q{Active Record for your platform}
-  s.description   = %q{Active Remote provides Active Record-like object-relational mapping over RPC. It was written for use with Google Protocol Buffers, but could be extended to use any RPC data format.}
+  s.summary       = "Active Record for your platform"
+  s.description   = "Active Remote provides Active Record-like object-relational mapping over RPC. It was written for use with Google Protocol Buffers, but could be extended to use any RPC data format."
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   ##
   # Dependencies
   #
-  s.add_dependency "activemodel", ">= 4.0", "< 5.2"
-  s.add_dependency "activesupport", ">= 4.0"
+  s.add_dependency "activemodel", ">= 5.0", "< 5.2"
+  s.add_dependency "activesupport", ">= 5.0"
   s.add_dependency "protobuf", ">= 3.0"
 
   ##
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", ">= 3.3.0"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-pride", ">= 3.1.0"
+  s.add_development_dependency "mad_rubocop"
   s.add_development_dependency "pry"
   s.add_development_dependency "protobuf-rspec", ">= 1.1.2"
   s.add_development_dependency "simplecov"

data/lib/active_remote.rb

@@ -1,11 +1,12 @@
-require 'active_model'
-require 'active_support'
-require 'protobuf'
+require "active_model"
+require "active_support"
+require "active_support/core_ext"
+require "protobuf"
 
-require 'active_remote/base'
-require 'active_remote/config'
-require 'active_remote/errors'
-require 'active_remote/version'
+require "active_remote/base"
+require "active_remote/config"
+require "active_remote/errors"
+require "active_remote/version"
 
 module ActiveRemote
   def self.config
@@ -16,4 +17,4 @@ module ActiveRemote
   config
 end
 
-require 'active_remote/railtie' if defined?(Rails)
+require "active_remote/railtie" if defined?(Rails)

data/lib/active_remote/association.rb

@@ -33,12 +33,12 @@ module ActiveRemote
       #     end
       #   end
       #
-      def belongs_to(belongs_to_klass, options={})
+      def belongs_to(belongs_to_klass, options = {})
         perform_association(belongs_to_klass, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{klass.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[:guid] = object.read_attribute(foreign_key)
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? nil : klass.search(search_hash).first
         end
@@ -74,17 +74,17 @@ module ActiveRemote
       #     end
       #   end
       #
-      def has_many(has_many_class, options={})
+      def has_many(has_many_class, options = {})
         perform_association(has_many_class, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{object.class.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[foreign_key] = object.guid
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? [] : klass.search(search_hash)
         end
 
-        options.merge!(:has_many => true)
+        options[:has_many] = true
         create_setter_method(has_many_class, options)
       end
 
@@ -115,12 +115,12 @@ module ActiveRemote
       #     end
       #   end
       #
-      def has_one(has_one_klass, options={})
+      def has_one(has_one_klass, options = {})
         perform_association(has_one_klass, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{object.class.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[foreign_key] = object.guid
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? nil : klass.search(search_hash).first
         end
@@ -135,29 +135,27 @@ module ActiveRemote
 
     private
 
-      def create_setter_method(associated_klass, options={})
+      def create_setter_method(associated_klass, options = {})
         writer_method = "#{associated_klass}=".to_sym
         define_method(writer_method) do |new_value|
           raise "New value must be an array" if options[:has_many] == true && new_value.class != Array
-          klass_name = options.fetch(:class_name){ associated_klass }
-          klass = klass_name.to_s.classify.constantize
 
           instance_variable_set(:"@#{new_value.class.name.demodulize.underscore}", new_value)
           new_value
         end
       end
 
-      def perform_association(associated_klass, options={})
+      def perform_association(associated_klass, options = {})
         define_method(associated_klass) do
-          klass_name = options.fetch(:class_name){ associated_klass }
+          klass_name = options.fetch(:class_name) { associated_klass }
           klass = klass_name.to_s.classify.constantize
 
-          self.class.validate_scoped_attributes(klass, self.class, options) if options.has_key?(:scope)
+          self.class.validate_scoped_attributes(klass, self.class, options) if options.key?(:scope)
 
           value = instance_variable_get(:"@#{associated_klass}")
 
           unless value
-            value = yield( klass, self )
+            value = yield(klass, self)
             instance_variable_set(:"@#{associated_klass}", value)
           end
 

data/lib/active_remote/attribute_definition.rb

@@ -1,4 +1,4 @@
-require "active_remote/type"
+require "active_model/type"
 
 module ActiveRemote
   # Represents an attribute for reflection
@@ -55,17 +55,19 @@ module ActiveRemote
     # @return [ActiveAttr::AttributeDefinition]
     #
     # @since 0.2.0
-    def initialize(name, type = :unknown, **options)
+    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
-      @options[:typecaster] = ::ActiveRemote::Type.lookup(type) unless type == :unknown
+    end
+
+    def from_rpc(value)
+      type.deserialize(value)
+    end
 
-      if @options[:type]
-        typecaster = ::ActiveRemote::Typecasting::TYPECASTER_MAP[@options[:type]]
-        fail ::ActiveRemote::UnknownType unless typecaster
-        @options[:typecaster] = typecaster
-      end
+    def from_user(value)
+      type.cast(value)
     end
 
     # Returns the code that would generate the attribute definition
@@ -88,9 +90,7 @@ module ActiveRemote
     # @return [String] the attribute name
     #
     # @since 0.2.0
-    def to_s
-      name.to_s
-    end
+    delegate :to_s, :to => :name
 
     # The attribute name
     #
@@ -101,10 +101,12 @@ module ActiveRemote
       name
     end
 
-    protected
+  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

@@ -68,7 +68,7 @@ module ActiveRemote
     # Write an attribute to the attributes hash
     #
     def attribute=(name, value)
-      @attributes[name] = value
+      @attributes[name] = self.class.attributes[name].from_user(value)
     end
 
     def attribute_method?(attr_name)
@@ -88,9 +88,9 @@ module ActiveRemote
       # @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}
+      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
@@ -107,7 +107,7 @@ module ActiveRemote
       # @example Define a dangerous attribute.
       #   attribute! :timeout
       #
-      def attribute!(name, options={})
+      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
@@ -164,7 +164,7 @@ module ActiveRemote
       #
       def inspect
         inspected_attributes = attribute_names.sort
-        attributes_list = "(#{inspected_attributes.join(", ")})" unless inspected_attributes.empty?
+        attributes_list = "(#{inspected_attributes.join(', ')})" unless inspected_attributes.empty?
         "#{name}#{attributes_list}"
       end
 

data/lib/active_remote/base.rb

@@ -1,33 +1,28 @@
-require 'active_model/callbacks'
-
-require 'active_remote/association'
-require 'active_remote/attribute_assignment'
-require 'active_remote/attribute_definition'
-require 'active_remote/attributes'
-require 'active_remote/config'
-require 'active_remote/dirty'
-require 'active_remote/dsl'
-require 'active_remote/integration'
-require 'active_remote/persistence'
-require 'active_remote/primary_key'
-require 'active_remote/query_attributes'
-require 'active_remote/rpc'
-require 'active_remote/scope_keys'
-require 'active_remote/search'
-require 'active_remote/serialization'
-require 'active_remote/typecasting'
-require 'active_remote/validations'
+require "active_model/callbacks"
+
+require "active_remote/association"
+require "active_remote/attribute_definition"
+require "active_remote/attributes"
+require "active_remote/config"
+require "active_remote/dirty"
+require "active_remote/dsl"
+require "active_remote/integration"
+require "active_remote/persistence"
+require "active_remote/primary_key"
+require "active_remote/query_attributes"
+require "active_remote/rpc"
+require "active_remote/scope_keys"
+require "active_remote/search"
+require "active_remote/serialization"
+require "active_remote/validations"
 
 module ActiveRemote
   class Base
     extend ::ActiveModel::Callbacks
-    extend ::ActiveModel::Naming
 
-    include ::ActiveModel::Conversion
-    include ::ActiveModel::Validations
+    include ::ActiveModel::Model
 
     include ::ActiveRemote::Association
-    include ::ActiveRemote::AttributeAssignment
     include ::ActiveRemote::Attributes
     include ::ActiveRemote::DSL
     include ::ActiveRemote::Integration
@@ -38,7 +33,6 @@ module ActiveRemote
     include ::ActiveRemote::ScopeKeys
     include ::ActiveRemote::Search
     include ::ActiveRemote::Serialization
-    include ::ActiveRemote::Typecasting
 
     # Overrides some methods, providing support for dirty tracking,
     # so it needs to be included last.
@@ -48,8 +42,6 @@ module ActiveRemote
     include ::ActiveRemote::Validations
     include ::ActiveModel::Validations::Callbacks
 
-    attr_reader :last_request, :last_response
-
     define_model_callbacks :initialize, :only => :after
 
     def initialize(attributes = {})
@@ -78,7 +70,8 @@ module ActiveRemote
     end
 
     def freeze
-      @attributes.freeze; self
+      @attributes.freeze
+      self
     end
 
     def frozen?

data/lib/active_remote/config.rb

@@ -1,4 +1,4 @@
-require 'active_support/ordered_options'
+require "active_support/ordered_options"
 
 module ActiveRemote
   class Config < ::ActiveSupport::OrderedOptions

data/lib/active_remote/dirty.rb

@@ -1,4 +1,4 @@
-require 'active_model/dirty'
+require "active_model/dirty"
 
 # Overrides persistence methods, providing support for dirty tracking.
 #
@@ -32,7 +32,7 @@ module ActiveRemote
     # Override #save to store changes as previous changes then clear them.
     #
     def save(*)
-      if status = super
+      if (status = super)
         @previously_changed = changes
         changed_attributes.clear
       end
@@ -49,7 +49,7 @@ module ActiveRemote
       end
     end
 
-    def skip_dirty_tracking(&block)
+    def skip_dirty_tracking
       disable_dirty_tracking
 
       yield