her 1.0.1 → 1.0.2

data/lib/her/middleware/json_api_parser.rb

@@ -3,6 +3,7 @@ module Her
     # This middleware expects the resource/collection data to be contained in the `data`
     # key of the JSON object
     class JsonApiParser < ParseJSON
+
       # Parse the response body
       #
       # @param [String] body The response body
@@ -25,11 +26,11 @@ module Her
       # @private
       def on_complete(env)
         env[:body] = case env[:status]
-        when 204, 304
-          parse('{}')
-        else
-          parse(env[:body])
-        end
+                     when 204, 304
+                       parse('{}')
+                     else
+                       parse(env[:body])
+                     end
       end
     end
   end

data/lib/her/middleware/parse_json.rb

@@ -1,6 +1,7 @@
 module Her
   module Middleware
     class ParseJSON < Faraday::Response::Middleware
+
       # @private
       def parse_json(body = nil)
         body = '{}' if body.blank?
@@ -12,7 +13,7 @@ module Her
           raise Her::Errors::ParseError, message
         end
 
-        raise Her::Errors::ParseError, message unless json.is_a?(Hash) or json.is_a?(Array)
+        raise Her::Errors::ParseError, message unless json.is_a?(Hash) || json.is_a?(Array)
 
         json
       end

data/lib/her/middleware/second_level_parse_json.rb

@@ -3,6 +3,7 @@ module Her
     # This middleware expects the resource/collection data to be contained in the `data`
     # key of the JSON object
     class SecondLevelParseJSON < ParseJSON
+
       # Parse the response body
       #
       # @param [String] body The response body
@@ -25,11 +26,11 @@ module Her
       # @private
       def on_complete(env)
         env[:body] = case env[:status]
-        when 204
-          parse('{}')
-        else
-          parse(env[:body])
-        end
+                     when 204
+                       parse('{}')
+                     else
+                       parse(env[:body])
+                     end
       end
     end
   end

data/lib/her/model/associations.rb

@@ -32,18 +32,18 @@ module Her
         # @private
         def associations
           @_her_associations ||= begin
-            superclass.respond_to?(:associations) ? superclass.associations.dup : Hash.new { |h,k| h[k] = [] }
+            superclass.respond_to?(:associations) ? superclass.associations.dup : Hash.new { |h, k| h[k] = [] }
           end
         end
 
         # @private
         def association_names
-          associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:name] }
+          associations.inject([]) { |memo, (_, details)| memo << details }.flatten.map { |a| a[:name] }
         end
 
         # @private
         def association_keys
-          associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:data_key] }
+          associations.inject([]) { |memo, (_, details)| memo << details }.flatten.map { |a| a[:data_key] }
         end
 
         # Parse associations data after initializing a new object
@@ -81,7 +81,7 @@ module Her
         #   @user = User.find(1)
         #   @user.articles # => [#<Article(articles/2) id=2 title="Hello world.">]
         #   # Fetched via GET "/users/1/articles"
-        def has_many(name, opts={})
+        def has_many(name, opts = {})
           Her::Model::Associations::HasManyAssociation.attach(self, name, opts)
         end
 
@@ -106,7 +106,7 @@ module Her
         #   @user = User.find(1)
         #   @user.organization # => #<Organization(organizations/2) id=2 name="Foobar Inc.">
         #   # Fetched via GET "/users/1/organization"
-        def has_one(name, opts={})
+        def has_one(name, opts = {})
           Her::Model::Associations::HasOneAssociation.attach(self, name, opts)
         end
 
@@ -132,7 +132,7 @@ module Her
         #   @user = User.find(1) # => #<User(users/1) id=1 team_id=2 name="Tobias">
         #   @user.team # => #<Team(teams/2) id=2 name="Developers">
         #   # Fetched via GET "/teams/2"
-        def belongs_to(name, opts={})
+        def belongs_to(name, opts = {})
           Her::Model::Associations::BelongsToAssociation.attach(self, name, opts)
         end
       end

data/lib/her/model/associations/association.rb

@@ -2,6 +2,7 @@ module Her
   module Model
     module Associations
       class Association
+
         # @private
         attr_accessor :params
 
@@ -47,7 +48,7 @@ module Her
           return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
           return @opts[:default].try(:dup) if @parent.new?
 
-          path = build_association_path lambda { "#{@parent.request_path(@params)}#{@opts[:path]}" }
+          path = build_association_path -> { "#{@parent.request_path(@params)}#{@opts[:path]}" }
           @klass.get(path, @params).tap do |result|
             @cached_result = result unless @params.any?
           end
@@ -55,11 +56,9 @@ module Her
 
         # @private
         def build_association_path(code)
-          begin
-            instance_exec(&code)
-          rescue Her::Errors::PathError
-            return nil
-          end
+          instance_exec(&code)
+        rescue Her::Errors::PathError
+          nil
         end
 
         # @private
@@ -81,7 +80,7 @@ module Her
         #   user.comments.where(:approved => 1) # Fetched via GET "/users/1/comments?approved=1
         def where(params = {})
           return self if params.blank? && @parent.attributes[@name].blank?
-          AssociationProxy.new self.clone.tap { |a| a.params = a.params.merge(params) }
+          AssociationProxy.new clone.tap { |a| a.params = a.params.merge(params) }
         end
         alias all where
 
@@ -97,7 +96,7 @@ module Her
         #   user.comments.find(3) # Fetched via GET "/users/1/comments/3
         def find(id)
           return nil if id.blank?
-          path = build_association_path lambda { "#{@parent.request_path(@params)}#{@opts[:path]}/#{id}" }
+          path = build_association_path -> { "#{@parent.request_path(@params)}#{@opts[:path]}/#{id}" }
           @klass.get_resource(path, @params)
         end
 
@@ -123,7 +122,6 @@ module Her
           reset
           fetch
         end
-
       end
     end
   end

data/lib/her/model/associations/association_proxy.rb

@@ -15,7 +15,7 @@ module Her
         end
 
         install_proxy_methods :association,
-          :build, :create, :where, :find, :all, :assign_nested_attributes, :reload
+                              :build, :create, :where, :find, :all, :assign_nested_attributes, :reload
 
         # @private
         def initialize(association)
@@ -28,7 +28,7 @@ module Her
 
         # @private
         def method_missing(name, *args, &block)
-          if :object_id == name # avoid redefining object_id
+          if name == :object_id # avoid redefining object_id
             return association.fetch.object_id
           end
 
@@ -38,7 +38,6 @@ module Her
           # resend message to fetched object
           __send__(name, *args, &block)
         end
-
       end
     end
   end

data/lib/her/model/associations/belongs_to_association.rb

@@ -80,7 +80,7 @@ module Her
           return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
 
           path_params = @parent.attributes.merge(@params.merge(@klass.primary_key => foreign_key_value))
-          path = build_association_path lambda { @klass.build_request_path(path_params) }
+          path = build_association_path -> { @klass.build_request_path(path_params) }
           @klass.get_resource(path, @params).tap do |result|
             @cached_result = result if @params.blank?
           end

data/lib/her/model/attributes.rb

@@ -23,7 +23,7 @@ module Her
       #     u.name = "Tobias"
       #   end
       #   # => #<User name="Tobias">
-      def initialize(attributes={})
+      def initialize(attributes = {})
         attributes ||= {}
         @metadata = attributes.delete(:_metadata) || {}
         @response_errors = attributes.delete(:_errors) || {}
@@ -151,19 +151,18 @@ module Her
       end
 
       module ClassMethods
-
         # Initialize a single resource
         #
         # @private
         def instantiate_record(klass, parsed_data)
-          if record = parsed_data[:data] and record.kind_of?(klass)
+          if (record = parsed_data[:data]) && record.is_a?(klass)
             record
           else
             attributes = klass.parse(record).merge(_metadata: parsed_data[:metadata],
                                                    _errors: parsed_data[:errors])
-            klass.new(attributes).tap do |record|
-              record.send :clear_changes_information
-              record.run_callbacks :find
+            klass.new(attributes).tap do |record_instance|
+              record_instance.send :clear_changes_information
+              record_instance.run_callbacks :find
             end
           end
         end
@@ -289,6 +288,7 @@ module Her
         end
 
         private
+
         # @private
         def store_her_data(name, value)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1

data/lib/her/model/base.rb

@@ -11,7 +11,7 @@ module Her
       # @private
       def has_key?(attribute_name)
         has_attribute?(attribute_name) ||
-        has_association?(attribute_name)
+          has_association?(attribute_name)
       end
 
       # Returns
@@ -21,7 +21,7 @@ module Her
       # @private
       def [](attribute_name)
         get_attribute(attribute_name) ||
-        get_association(attribute_name)
+          get_association(attribute_name)
       end
 
       # @private

data/lib/her/model/http.rb

@@ -52,7 +52,7 @@ module Her
         # Main request wrapper around Her::API. Used to make custom request to the API.
         #
         # @private
-        def request(params={})
+        def request(params = {})
           request = her_api.request(params)
 
           if block_given?

data/lib/her/model/introspection.rb

@@ -22,6 +22,7 @@ module Her
       end
 
       private
+
       def attribute_for_inspect(value)
         if value.is_a?(String) && value.length > 50
           "#{value[0..50]}...".inspect
@@ -42,11 +43,12 @@ module Her
         end
 
         protected
+
         # Looks for a class at the same level as this one with the given name.
         #
         # @private
         def her_sibling_class(name)
-          if mod = self.her_containing_module
+          if mod = her_containing_module
             @_her_sibling_class ||= Hash.new { Hash.new }
             @_her_sibling_class[mod][name] ||= "#{mod.name}::#{name}".constantize rescue nil
           end
@@ -56,8 +58,8 @@ module Her
         #
         # @private
         def her_containing_module
-          return unless self.name =~ /::/
-          self.name.split("::")[0..-2].join("::").constantize
+          return unless name =~ /::/
+          name.split("::")[0..-2].join("::").constantize
         end
       end
     end

data/lib/her/model/nested_attributes.rb

@@ -25,7 +25,7 @@ module Her
 
           associations.each do |association_name|
             unless allowed_association_names.include?(association_name)
-              raise Her::Errors::AssociationUnknownError.new("Unknown association name :#{association_name}")
+              raise Her::Errors::AssociationUnknownError, "Unknown association name :#{association_name}"
             end
 
             class_eval <<-RUBY, __FILE__, __LINE__ + 1

data/lib/her/model/orm.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 module Her
   module Model
     # This module adds ORM-like capabilities to the model
@@ -54,7 +55,7 @@ module Her
 
       # Similar to save(), except that ResourceInvalid is raised if the save fails
       def save!
-        if !self.save
+        unless save
           raise Her::Errors::ResourceInvalid, self
         end
         self
@@ -195,7 +196,7 @@ module Her
         #
         #   User.all # Called via GET "/users?admin=1"
         #   User.new.admin # => 1
-        def default_scope(block=nil)
+        def default_scope(block = nil)
           @_her_default_scope ||= (!respond_to?(:default_scope) && superclass.respond_to?(:default_scope)) ? superclass.default_scope : scoped
           @_her_default_scope = @_her_default_scope.instance_exec(&block) unless block.nil?
           @_her_default_scope
@@ -227,7 +228,7 @@ module Her
         # @example
         #   User.destroy_existing(1)
         #   # Called via DELETE "/users/1"
-        def destroy_existing(id, params={})
+        def destroy_existing(id, params = {})
           request(params.merge(:_method => method_for(:destroy), :_path => build_request_path(params.merge(primary_key => id)))) do |parsed_data, response|
             data = parse(parsed_data[:data])
             metadata = parsed_data[:metadata]
@@ -256,15 +257,15 @@ module Her
         # If the request_new_object_on_build flag is set, the new object is requested via API.
         def build(attributes = {})
           params = attributes
-          return self.new(params) unless self.request_new_object_on_build?
+          return new(params) unless request_new_object_on_build?
 
-          path = self.build_request_path(params.merge(self.primary_key => 'new'))
-          method = self.method_for(:new)
+          path = build_request_path(params.merge(primary_key => 'new'))
+          method = method_for(:new)
 
           resource = nil
-          self.request(params.merge(:_method => method, :_path => path)) do |parsed_data, response|
+          request(params.merge(:_method => method, :_path => path)) do |parsed_data, response|
             if response.success?
-              resource = self.new_from_parsed_data(parsed_data)
+              resource = new_from_parsed_data(parsed_data)
             end
           end
           resource

data/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,7 +31,7 @@ module Her
         end
 
         # @private
-        def to_params(attributes, changes={})
+        def to_params(attributes, changes = {})
           filtered_attributes = attributes.each_with_object({}) do |(key, value), memo|
             case value
             when Her::Model
@@ -45,10 +45,7 @@ module Her
           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?
@@ -133,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
@@ -145,7 +142,7 @@ module Her
 
         # @private
         def root_element_included?(data)
-          element = data[root_element]
+          element = data[parsed_root_element]
           element.is_a?(Hash) || element.is_a?(Array)
         end
 

data/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