model-api 0.8.4 → 0.8.5

data/lib/model-api/model.rb

@@ -2,11 +2,21 @@ module ModelApi
   module Model
     module ClassMethods
       def api_model(*args)
-        metadata = ModelApi::SimpleMetadata.process_metadata(:model, self, args)
+        metadata = ModelApi::SimpleMetadata.process_metadata(:model, self, args,
+            post_process: (lambda do |metadata|
+              if args.present? && metadata.include?(:id_attributes)
+                metadata[:id_attributes] = metadata[:id_attributes]
+                    .map { |v| (v.is_a?(Array) ? v.flatten : [v]).map(&:to_sym) }
+              end
+            end))
         ModelApi::SimpleMetadata.merge_superclass_metadata(:model, superclass, metadata,
             exclude_keys: [:alias])
       end
 
+      def api_model_post_process_metadata(klass, metadata)
+
+      end
+
       def api_attributes(*args)
         metadata = ModelApi::HashMetadata.process_metadata(:attributes, self, args)
         metadata = ModelApi::HashMetadata.merge_superclass_metadata(:attributes, superclass, metadata)
@@ -14,10 +24,11 @@ module ModelApi
           id_attrs = []
           metadata.each { |attr, attr_metadata| id_attrs << attr if attr_metadata[:id] }
           if id_attrs.present?
-            id_attrs = id_attrs.map(&:to_sym)
-            existing_id_attrs = (api_model[:id_attributes] || []).map(&:to_sym)
-            if (id_attrs - existing_id_attrs).present?
-              api_model id_attributes: (id_attrs - existing_id_attrs).uniq
+            id_attr_sets = id_attrs.map { |v| (v.is_a?(Array) ? v.flatten : [v]).map(&:to_sym) }
+            existing_id_attr_sets = (api_model[:id_attributes] || [])
+                .map { |v| (v.is_a?(Array) ? v.flatten : [v]).map(&:to_sym) }
+            if (id_attr_sets - existing_id_attr_sets).present?
+              api_model id_attributes: (id_attr_sets - existing_id_attr_sets).uniq
             end
           end
         end
@@ -42,8 +53,10 @@ module ModelApi
       end
     end
 
-    def self.included(base)
-      base.extend(ClassMethods)
+    class << self
+      def included(base)
+        base.extend(ClassMethods)
+      end
     end
   end
 end

data/lib/model-api/open_api_extensions.rb

@@ -32,8 +32,10 @@ module ModelApi
       end
     end
 
-    def self.included(base)
-      base.extend(ClassMethods)
+    class << self
+      def included(base)
+        base.extend(ClassMethods)
+      end
     end
 
     class Utils

data/lib/model-api/simple_metadata.rb

@@ -1,7 +1,7 @@
 module ModelApi
   class SimpleMetadata
     class << self
-      def process_metadata(type, obj, args)
+      def process_metadata(type, obj, args, opts = {})
         instance_var = :"@api_#{type}_metadata"
         metadata = obj.instance_variable_get(instance_var) || {}
         if args.present?
@@ -12,6 +12,8 @@ module ModelApi
           else
             metadata.merge!(Hash[args.map { |key| [key.to_sym, {}] }])
           end
+          ModelApi::Utils.invoke_callback(opts[:post_process], metadata,
+              opts.merge(type: type, object: obj))
           obj.instance_variable_set(instance_var, metadata)
         end
         metadata.dup

data/model-api.gemspec

@@ -3,7 +3,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = 'model-api'
-  s.version = '0.8.4'
+  s.version = '0.8.5'
   s.summary = 'Create easy REST API\'s using metadata inside your ActiveRecord models'
   s.description = 'Ruby gem allowing Ruby on Rails developers to create REST API’s using ' \
       'metadata defined inside their ActiveRecord models.'
@@ -16,9 +16,8 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "rails", ">= 4.0"
-  s.add_dependency "open-api", ">= 0.8.2"
+  s.add_dependency "rails", "~> 4.0"
+  s.add_dependency "open-api", "~> 0.8.2"
 
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "rspec-rails", "~> 3.5", ">= 3.5.2"
 end

metadata

@@ -1,71 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: model-api
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Matthew Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: open-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.5'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.2
 description: Ruby gem allowing Ruby on Rails developers to create REST API’s using
   metadata defined inside their ActiveRecord models.
 email: m.mead@precisionhawk.com