mores_marvel 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1215cbbacd7538805935b32f1798e0b13c2316
-  data.tar.gz: 2381438dc747df997a19fe469ea84d392208184e
+  metadata.gz: 180b81e4535febfcc5090d2d355b3636de03e92a
+  data.tar.gz: 567394d2d4436a13f88abb104c4619dd3dd921ae
 SHA512:
-  metadata.gz: 2753ec524b3fa9cd2704903bd62c31cf811e380f28839e98fab3d2752f0a7b0301390b0c65ffae046f135ab5e84ce5b8bb5981cf0e9dc652459a3aa4bb6e780e
-  data.tar.gz: 1a6aecc6d777050820a21191dd40f5803be08c0ed176df302e5bd04c2a7dddce4b6c1bfcf68c7e7a598273f01d614b3b2e7b24796c399cd7c176e4fffd488984
+  metadata.gz: 8e2c456ef7cb26e6466f4308ae757f71a7084cde5bb810dc9452b1a1c7a5a99ec154ca40fd11a73dbf0bf24e8f9608e2286d26bf05ec4760553bc5789045a906
+  data.tar.gz: 79c6b63295100f16178f43addd90660834c8763749e5f35cfc4d54f3d1b0f6e4f9d752356749000cab9bd9669c030f13cdd93c027b8706c752e69f2d66364ecc

data/lib/mores_marvel/client.rb

@@ -7,7 +7,6 @@ module MoresMarvel
   class Client
     include MoresMarvel::Resource
 
-    class ServiceClientError < StandardError; end
     def initialize config
       @public_key = config[:public_key]
       @private_key = config[:private_key]
@@ -17,7 +16,11 @@ module MoresMarvel
     def get_resource(resource, filters = {})
       api_end_point = "#{@base_uri}#{resource}"
       url_params = filters.empty? ? security_hash : security_hash.merge(filters)
-      restructure_response RestClient.get(api_end_point, { params: url_params })
+      begin
+        restructure_response RestClient.get(api_end_point, { params: url_params })
+      rescue RestClient::Conflict, RestClient::NotFound => errors
+        errors
+      end
     end
 
     private

data/lib/mores_marvel/resource.rb

@@ -2,27 +2,58 @@ require_relative 'client'
 
 module MoresMarvel
   MODELS = %w(characters creators comics events series stories).freeze
+  ORDERBY = %w(name modified -name -modified).freeze
   module Resource
-    # will be removed soon.
-    def get_characters
-      get_resource('/v1/public/characters')
+    # fetch all records
+    def fetch_all(model, filters = {})
+      get_resource("/v1/public/#{model}", filters) if model_exists?(model) && validate_filters(filters)
     end
-    # will be removed soon.
-    def get_character id
-      get_resource("/v1/public/characters/#{id}")
+    # fetch a record by id
+    def fetch_by_id(model, id, filters = {})
+      get_resource("/v1/public/#{model}/#{id}", filters) if model_exists?(model) && validate_filters(filters)
     end
 
-    def fetch_all(model, filters = {})
-      get_resource("/v1/public/#{model}", filters) if MODELS.include?(model)
+    def fetch_filtered_by(params, filters = {})
+      if validate_filters(filters)
+        if params[:primary_model].eql?params[:secondary_model]
+          puts "Primary_model & Secondary_model can't be same.\n"
+        elsif model_exists?(params[:primary_model]) &&  model_exists?(params[:secondary_model])
+          get_resource("/v1/public/#{params[:primary_model]}/#{params[:id]}/#{params[:secondary_model]}", filters)
+        end
+      end
     end
 
-    def fetch_by_id(model, id, filters = {})
-      get_resource("/v1/public/#{model}/#{id}", filters) if MODELS.include?(model)
+    private
+    def validate_filters(filters)
+      return filters if filters.empty?
+
+      unless filters.empty?
+        filters_error= []
+        filters.keys.each do |key|
+          case key
+          when :limit
+            filters_error.push({error_message: "Invalid limit (Min: 1 & Max: 100)"}) if (filters[:limit] < 0 || filters[:limit] > 100)
+          when :orderBy
+            filters_error.push({error_message: "Invalid or unrecognized ordering parameter."}) if !(ORDERBY.include?(filters[:orderBy]))
+          end
+        end
+
+        return filters_error if filters_error.empty?
+
+        unless filters_error.empty?
+          puts "\n Request failed with following errors"
+          filters_error.each_with_index { |errors, index| puts "#{index+1} : #{errors[:error_message]}" }
+          false
+        end
+      end
     end
 
-    def fetch_filtered_by(model_1, id, model_2, filters = {})
-      if MODELS.include?(model_1) &&  MODELS.include?(model_2) && !(model_1.eql?model_2)
-        get_resource("/v1/public/#{model_1}/#{id}/#{model_2}", filters)
+    def model_exists? model
+      if MODELS.include?(model)
+        true
+      else
+        puts "Invalid resource \"#{model}\" : #{MODELS.join(', ')} are only resources supported by Marvel.\n"
+        false
       end
     end
   end

data/lib/mores_marvel/version.rb

@@ -1,3 +1,3 @@
 module MoresMarvel
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mores_marvel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Manoj more
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler