test_track_rails_client 4.0.0.alpha12 → 4.0.0.alpha13

data/vendor/gems/her/lib/her/model/parse.rb

@@ -10,7 +10,7 @@ module Her
       #   @user.to_params
       #   # => { :id => 1, :name => 'John Smith' }
       def to_params
-        self.class.to_params(self.attributes, self.changes)
+        self.class.to_params(attributes, changes)
       end
 
       module ClassMethods
@@ -31,14 +31,21 @@ module Her
         end
 
         # @private
-        def to_params(attributes, changes={})
-          filtered_attributes = attributes.dup.symbolize_keys
+        def to_params(attributes, changes = {})
+          filtered_attributes = attributes.each_with_object({}) do |(key, value), memo|
+            case value
+            when Her::Model
+            when ActiveModel::Serialization
+              value = value.serializable_hash.symbolize_keys
+            end
+
+            memo[key.to_sym] = value
+          end
+
           filtered_attributes.merge!(embeded_params(attributes))
+
           if her_api.options[:send_only_modified_attributes]
-            filtered_attributes = changes.symbolize_keys.keys.inject({}) do |hash, attribute|
-              hash[attribute] = filtered_attributes[attribute]
-              hash
-            end
+            filtered_attributes.slice! *changes.keys.map(&:to_sym)
           end
 
           if include_root_in_json?
@@ -52,20 +59,16 @@ module Her
           end
         end
 
-
         # @private
-        # TODO: Handle has_one
         def embeded_params(attributes)
-          associations[:has_many].select { |a| attributes.include?(a[:data_key])}.compact.inject({}) do |hash, association|
-            params = attributes[association[:data_key]].map(&:to_params)
-            next hash if params.empty?
-            if association[:class_name].constantize.include_root_in_json?
-              root = association[:class_name].constantize.root_element
-              hash[association[:data_key]] = params.map { |n| n[root] }
-            else
-              hash[association[:data_key]] = params
-            end
-            hash
+          associations.values.flatten.each_with_object({}) do |definition, hash|
+            value = case association = attributes[definition[:name]]
+                    when Her::Collection, Array
+                      association.map { |a| a.to_params }.reject(&:empty?)
+                    when Her::Model
+                      association.to_params
+                    end
+            hash[definition[:data_key]] = value if value.present?
           end
         end
 
@@ -127,11 +130,11 @@ module Her
         #   user.name # => "Tobias"
         def root_element(value = nil)
           if value.nil?
-            if json_api_format?
-              @_her_root_element ||= self.name.split("::").last.pluralize.underscore.to_sym
-            else
-              @_her_root_element ||= self.name.split("::").last.underscore.to_sym
-            end
+            @_her_root_element ||= if json_api_format?
+                                     name.split("::").last.pluralize.underscore.to_sym
+                                   else
+                                     name.split("::").last.underscore.to_sym
+                                   end
           else
             @_her_root_element = value.to_sym
           end
@@ -139,7 +142,8 @@ module Her
 
         # @private
         def root_element_included?(data)
-          data.keys.to_s.include? @_her_root_element.to_s
+          element = data[parsed_root_element]
+          element.is_a?(Hash) || element.is_a?(Array)
         end
 
         # @private
@@ -198,17 +202,20 @@ module Her
 
         # @private
         def request_new_object_on_build?
-          @_her_request_new_object_on_build || (superclass.respond_to?(:request_new_object_on_build?) && superclass.request_new_object_on_build?)
+          return @_her_request_new_object_on_build unless @_her_request_new_object_on_build.nil?
+          superclass.respond_to?(:request_new_object_on_build?) && superclass.request_new_object_on_build?
         end
 
         # @private
         def include_root_in_json?
-          @_her_include_root_in_json || (superclass.respond_to?(:include_root_in_json?) && superclass.include_root_in_json?)
+          return @_her_include_root_in_json unless @_her_include_root_in_json.nil?
+          superclass.respond_to?(:include_root_in_json?) && superclass.include_root_in_json?
         end
 
         # @private
         def parse_root_in_json?
-          @_her_parse_root_in_json || (superclass.respond_to?(:parse_root_in_json?) && superclass.parse_root_in_json?)
+          return @_her_parse_root_in_json unless @_her_parse_root_in_json.nil?
+          superclass.respond_to?(:parse_root_in_json?) && superclass.parse_root_in_json?
         end
       end
     end

data/vendor/gems/her/lib/her/model/paths.rb

@@ -19,7 +19,6 @@ module Her
       end
 
       module ClassMethods
-
         # Define the primary key field that will be used to find and save records
         #
         # @example
@@ -88,13 +87,13 @@ module Her
         # Return a custom path based on the collection path and variable parameters
         #
         # @private
-        def build_request_path(path=nil, parameters={})
+        def build_request_path(path = nil, parameters = {})
           parameters = parameters.try(:with_indifferent_access)
 
           unless path.is_a?(String)
             parameters = path.try(:with_indifferent_access) || parameters
             path =
-              if parameters.include?(primary_key) && parameters[primary_key] && !parameters[primary_key].kind_of?(Array)
+              if parameters.include?(primary_key) && parameters[primary_key] && !parameters[primary_key].is_a?(Array)
                 resource_path.dup
               else
                 collection_path.dup
@@ -117,7 +116,7 @@ module Her
         end
 
         # @private
-        def build_request_path_from_string_or_symbol(path, params={})
+        def build_request_path_from_string_or_symbol(path, params = {})
           path.is_a?(Symbol) ? "#{build_request_path(params)}/#{path}" : path
         end
       end

data/vendor/gems/her/lib/her/model/relation.rb

@@ -1,8 +1,10 @@
 module Her
   module Model
     class Relation
+
       # @private
       attr_accessor :params, :request_headers, :request_options
+      attr_writer :parent
 
       # @private
       def initialize(parent)
@@ -49,7 +51,7 @@ module Her
       #   # Fetched via GET "/users?approved=1"
       def where(params = {})
         return self if params.blank? && !@_fetch.nil?
-        self.clone.tap do |r|
+        clone.tap do |r|
           r.params = r.params.merge(params)
           r.clear_fetch_cache!
         end
@@ -75,7 +77,7 @@ module Her
 
       # @private
       def kind_of?(thing)
-        fetch.kind_of?(thing)
+        fetch.is_a?(thing)
       end
 
       # Fetch a collection of resources
@@ -83,32 +85,14 @@ module Her
       # @private
       def fetch
         @_fetch ||= begin
-          path = @parent.build_request_path(@params)
+          path = @parent.build_request_path(@parent.collection_path, @params)
           method = @parent.method_for(:find)
-          @parent.request(@params.merge(:_method => method, :_path => path, :_headers => request_headers, :_options => request_options)) do |parsed_data, response|
+          @parent.request(@params.merge(:_method => method, :_path => path, :_headers => request_headers, :_options => request_options)) do |parsed_data, _|
             @parent.new_collection(parsed_data)
           end
         end
       end
 
-      # Fetch specific resource by some of its attributes
-      #
-      # @example
-      #   @user = User.find_by(id: 1)
-      #   # Fetched via GET "/users/1"
-      #
-      # @example
-      #   @users = User.find_by(id: 1, age: 25)
-      #   # Fetched via GET "/users/1?age=25"
-      #
-      # @example
-      #   @users = User.find_by(age: 25)
-      #   # Fetched via GET "/users?age=25"
-      #   # locally limit to single result
-      def find_by(params = {})
-        where(params).first
-      end
-
       # Fetch first result
       #
       # @example
@@ -181,7 +165,6 @@ module Her
           @parent.request(request_params) do |parsed_data, response|
             if response.success?
               resource = @parent.new_from_parsed_data(parsed_data)
-              resource.instance_variable_set(:@changed_attributes, {})
               resource.run_callbacks :find
             else
               raise Her::Errors::ResponseError.for(response.status).new("Request against #{@parent.name} returned a #{response.status}")
@@ -191,7 +174,51 @@ module Her
           resource
         end
 
-        ids.length > 1 || ids.first.kind_of?(Array) ? results : results.first
+        ids.length > 1 || ids.first.is_a?(Array) ? results : results.first
+      end
+
+      # Fetch first resource with the given attributes.
+      #
+      # If no resource is found, returns <tt>nil</tt>.
+      #
+      # @example
+      #   @user = User.find_by(name: "Tobias", age: 42)
+      #   # Called via GET "/users?name=Tobias&age=42"
+      def find_by(params)
+        where(params).first
+      end
+
+      # Fetch first resource with the given attributes, or create a resource
+      # with the attributes if one is not found.
+      #
+      # @example
+      #   @user = User.find_or_create_by(email: "remi@example.com")
+      #
+      #   # Returns the first item in the collection if present:
+      #   # Called via GET "/users?email=remi@example.com"
+      #
+      #   # If collection is empty:
+      #   # POST /users with `email=remi@example.com`
+      #   @user.email # => "remi@example.com"
+      #   @user.new? # => false
+      def find_or_create_by(attributes)
+        find_by(attributes) || create(attributes)
+      end
+
+      # Fetch first resource with the given attributes, or initialize a resource
+      # with the attributes if one is not found.
+      #
+      # @example
+      #   @user = User.find_or_initialize_by(email: "remi@example.com")
+      #
+      #   # Returns the first item in the collection if present:
+      #   # Called via GET "/users?email=remi@example.com"
+      #
+      #   # If collection is empty:
+      #   @user.email # => "remi@example.com"
+      #   @user.new? # => true
+      def find_or_initialize_by(attributes)
+        find_by(attributes) || build(attributes)
       end
 
       # Create a resource and return it

data/vendor/gems/her/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.8.6"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_track_rails_client
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha12
+  version: 4.0.0.alpha13
 platform: ruby
 authors:
 - Ryan O'Neill
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake