aws-record 2.10.0 → 2.11.0

data/lib/aws-record/record/marshalers/list_marshaler.rb

@@ -1,23 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Marshalers
-
       class ListMarshaler
-        def initialize(opts = {})
-        end
+        def initialize(opts = {}); end
 
         def type_cast(raw_value)
           case raw_value
@@ -50,7 +37,6 @@ module Aws
           end
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/marshalers/map_marshaler.rb

@@ -1,23 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Marshalers
-
       class MapMarshaler
-        def initialize(opts = {})
-        end
+        def initialize(opts = {}); end
 
         def type_cast(raw_value)
           case raw_value
@@ -50,7 +37,6 @@ module Aws
           end
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/marshalers/numeric_set_marshaler.rb

@@ -1,23 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Marshalers
-
       class NumericSetMarshaler
-        def initialize(opts = {})
-        end
+        def initialize(opts = {}); end
 
         def type_cast(raw_value)
           case raw_value
@@ -53,6 +40,7 @@ module Aws
         end
 
         private
+
         def _as_numeric(set)
           set.collect! do |item|
             if item.is_a?(Numeric)
@@ -63,7 +51,6 @@ module Aws
           end
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/marshalers/string_marshaler.rb

@@ -1,23 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Marshalers
-
       class StringMarshaler
-        def initialize(opts = {})
-        end
+        def initialize(opts = {}); end
 
         def type_cast(raw_value)
           case raw_value
@@ -46,7 +33,6 @@ module Aws
           end
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/marshalers/string_set_marshaler.rb

@@ -1,23 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Marshalers
-
       class StringSetMarshaler
-        def initialize(opts = {})
-        end
+        def initialize(opts = {}); end
 
         def type_cast(raw_value)
           case raw_value
@@ -53,6 +40,7 @@ module Aws
         end
 
         private
+
         def _as_strings(set)
           set.collect! do |item|
             if item.is_a?(String)
@@ -63,7 +51,6 @@ module Aws
           end
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/marshalers/time_marshaler.rb

@@ -1,22 +1,10 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 require 'time'
 
 module Aws
   module Record
     module Marshalers
-
       class TimeMarshaler
         def initialize(opts = {})
           @formatter = opts[:formatter] || Iso8601Formatter
@@ -67,7 +55,6 @@ module Aws
           time.iso8601
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/model_attributes.rb

@@ -1,19 +1,7 @@
-# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
-
     # @api private
     class ModelAttributes
       attr_reader :attributes, :storage_attributes
@@ -32,7 +20,7 @@ module Aws
         attribute
       end
 
-      def register_superclass_attribute (name, attribute)
+      def register_superclass_attribute(name, attribute)
         _new_attr_validation(name, attribute)
         @attributes[name] = attribute.dup
         @storage_attributes[attribute.database_name] = name
@@ -56,6 +44,7 @@ module Aws
       end
 
       private
+
       def _new_attr_validation(name, attribute)
         _validate_attr_name(name)
         _check_for_naming_collisions(name, attribute.database_name)
@@ -64,43 +53,33 @@ module Aws
 
       def _validate_attr_name(name)
         unless name.is_a?(Symbol)
-          raise ArgumentError.new("Must use symbolized :name attribute.")
+          raise ArgumentError, 'Must use symbolized :name attribute.'
         end
         if @attributes[name]
-          raise Errors::NameCollision.new(
-            "Cannot overwrite existing attribute #{name}"
-          )
+          raise Errors::NameCollision, "Cannot overwrite existing attribute #{name}"
         end
       end
 
       def _check_if_reserved(name)
         if @model_class.instance_methods.include?(name)
-          raise Errors::ReservedName.new(
-            "Cannot name an attribute #{name}, that would collide with an"\
-              " existing instance method."
-          )
+          raise Errors::ReservedName, "Cannot name an attribute #{name}, that would collide with an"\
+                                      ' existing instance method.'
         end
       end
 
       def _check_for_naming_collisions(name, storage_name)
         if @attributes[storage_name.to_sym]
-          raise Errors::NameCollision.new(
-            "Custom storage name #{storage_name} already exists as an"\
-              " attribute name in #{@attributes}"
-          )
+          raise Errors::NameCollision, "Custom storage name #{storage_name} already exists as an"\
+                                       " attribute name in #{@attributes}"
         elsif @storage_attributes[name.to_s]
-          raise Errors::NameCollision.new(
-            "Attribute name #{name} already exists as a custom storage"\
-              " name in #{@storage_attributes}"
-          )
+          raise Errors::NameCollision, "Attribute name #{name} already exists as a custom storage"\
+                                       " name in #{@storage_attributes}"
         elsif @storage_attributes[storage_name]
-          raise Errors::NameCollision.new(
-            "Custom storage name #{storage_name} already in use in"\
-              " #{@storage_attributes}"
-          )
+          raise Errors::NameCollision, "Custom storage name #{storage_name} already in use in"\
+                                       " #{@storage_attributes}"
+
         end
       end
     end
-
   end
 end

data/lib/aws-record/record/query.rb

@@ -1,31 +1,18 @@
-# Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Query
-
       # @api private
       def self.included(sub_class)
         sub_class.extend(QueryClassMethods)
       end
 
       module QueryClassMethods
-
         # This method calls
-        # {http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#query-instance_method Aws::DynamoDB::Client#query},
-        # populating the +:table_name+ parameter from the model class, and
-        # combining this with the other parameters you provide.
+        # {http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#query-instance_method
+        # Aws::DynamoDB::Client#query}, populating the +:table_name+ parameter from the model
+        # class, and combining this with the other parameters you provide.
         #
         # @example A query with key and filter expressions:
         #   # Example model class
@@ -66,9 +53,9 @@ module Aws
         end
 
         # This method calls
-        # {http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#scan-instance_method Aws::DynamoDB::Client#scan},
-        # populating the +:table_name+ parameter from the model class, and
-        # combining this with the other parameters you provide.
+        # {http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#scan-instance_method
+        # Aws::DynamoDB::Client#scan}, populating the +:table_name+ parameter from the model
+        # class, and combining this with the other parameters you provide.
         #
         # @example A scan with a filter expression:
         #   # Example model class
@@ -151,7 +138,6 @@ module Aws
           )
         end
       end
-
     end
   end
 end

data/lib/aws-record/record/secondary_indexes.rb

@@ -1,40 +1,26 @@
-# Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module SecondaryIndexes
-
       # @api private
       def self.included(sub_class)
-        sub_class.instance_variable_set("@local_secondary_indexes", {})
-        sub_class.instance_variable_set("@global_secondary_indexes", {})
+        sub_class.instance_variable_set('@local_secondary_indexes', {})
+        sub_class.instance_variable_set('@global_secondary_indexes', {})
         sub_class.extend(SecondaryIndexesClassMethods)
-        if Aws::Record.extends_record?(sub_class)
-          inherit_indexes(sub_class)
-        end
+        inherit_indexes(sub_class) if Aws::Record.extends_record?(sub_class)
       end
 
-      private
       def self.inherit_indexes(klass)
-        superclass_lsi = klass.superclass.instance_variable_get("@local_secondary_indexes").dup
-        superclass_gsi = klass.superclass.instance_variable_get("@global_secondary_indexes").dup
-        klass.instance_variable_set("@local_secondary_indexes", superclass_lsi)
-        klass.instance_variable_set("@global_secondary_indexes", superclass_gsi)
+        superclass_lsi = klass.superclass.instance_variable_get('@local_secondary_indexes').dup
+        superclass_gsi = klass.superclass.instance_variable_get('@global_secondary_indexes').dup
+        klass.instance_variable_set('@local_secondary_indexes', superclass_lsi)
+        klass.instance_variable_set('@global_secondary_indexes', superclass_gsi)
       end
 
-      module SecondaryIndexesClassMethods
+      private_class_method :inherit_indexes
 
+      module SecondaryIndexesClassMethods
         # Creates a local secondary index for the model. Learn more about Local
         # Secondary Indexes in the
         # {http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/LSI.html Amazon DynamoDB Developer Guide}.
@@ -75,7 +61,7 @@ module Aws
           global_secondary_indexes[name] = opts
         end
 
-        # Returns hash of local secondary index names to the index’s attributes.
+        # Returns hash of local secondary index names to the index's attributes.
         #
         # *Note*: +local_secondary_indexes+ is inherited from a parent model when {#local_secondary_index}
         # is explicitly specified in the parent.
@@ -85,7 +71,7 @@ module Aws
           @local_secondary_indexes
         end
 
-        # Returns hash of global secondary index names to the index’s attributes.
+        # Returns hash of global secondary index names to the index's attributes.
         #
         # *Note*: +global_secondary_indexes+ is inherited from a parent model when {#global_secondary_index}
         # is explicitly specified in the parent.
@@ -110,6 +96,7 @@ module Aws
         end
 
         private
+
         def _migration_format_indexes(indexes)
           return nil if indexes.empty?
           mfi = indexes.collect do |name, opts|
@@ -127,12 +114,12 @@ module Aws
 
         def _si_key_schema(opts)
           key_schema = [{
-            key_type: "HASH",
+            key_type: 'HASH',
             attribute_name: @attributes.storage_name_for(opts[:hash_key])
           }]
           if opts[:range_key]
             key_schema << {
-              key_type: "RANGE",
+              key_type: 'RANGE',
               attribute_name: @attributes.storage_name_for(opts[:range_key])
             }
           end
@@ -143,9 +130,7 @@ module Aws
           if params[:hash_key] && params[:range_key]
             _validate_attributes_exist(params[:hash_key], params[:range_key])
           else
-            raise ArgumentError.new(
-              "Local Secondary Indexes require a hash and range key!"
-            )
+            raise ArgumentError, 'Local Secondary Indexes require a hash and range key!'
           end
         end
 
@@ -157,26 +142,22 @@ module Aws
               _validate_attributes_exist(params[:hash_key])
             end
           else
-            raise ArgumentError.new(
-              "Global Secondary Indexes require at least a hash key!"
-            )
+            raise ArgumentError, 'Global Secondary Indexes require at least a hash key!'
           end
         end
 
         def _validate_attributes_exist(*attr_names)
-          missing = attr_names.select do |attr_name|
-            !@attributes.present?(attr_name)
+          missing = attr_names.reject do |attr_name|
+            @attributes.present?(attr_name)
           end
           unless missing.empty?
-            raise ArgumentError.new(
-              "#{missing.join(", ")} not present in model attributes."\
-                " Please ensure that attributes are defined in the model"\
-                " class BEFORE defining an index on those attributes."
-            )
+            raise ArgumentError, "#{missing.join(', ')} not present in model attributes."\
+                                 ' Please ensure that attributes are defined in the model'\
+                                 ' class BEFORE defining an index on those attributes.'
+
           end
         end
       end
-
     end
   end
 end