uatu-marvel 0.0.1.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eff7b90a327877e28e3d381a6d2620c3e4c9ca3
-  data.tar.gz: 0894ac10900d6dffbb96fdd78694db1a63b44076
+  metadata.gz: 330a8356b2d7b0966db9894575503533baaaeeb2
+  data.tar.gz: b1d0e32f6c552458b8e2ee146d071ae28e43cba0
 SHA512:
-  metadata.gz: 1dff9387718a54252392b1ac4c3ec95280829d9b373e11a57be4397e2948caf62c7577d18fcfc67511cfe8ca2d10084b1203f3b5a962cb2386bf555c89b32a8a
-  data.tar.gz: 8b341d3ed77eeb8d99c90fe9d153c048ac406c423995e6a0f42d8a47053118c9b76258bf6e907b4c2bca058d970825cb77d02e9519ae24f22dd5fe24e3afbf20
+  metadata.gz: 497fed44e916e0f6527ac0786e1bdb6b5ba7c4c58c0510f3c31323f689f116da0dc7dc1e4336f260342dbe9624a8c60e019046fa8ecbeb0d507817eb71734b65
+  data.tar.gz: 37f432df0a3fe7ceba0d92fd44e5ab4d7487c7006c91b113a91aa0c30bda9a0b0e786c4bddcda7359aa29f8d58a884318db731e35ea7e53b5f29e246f0bc3e73

data/README.md

@@ -23,7 +23,7 @@ And then execute:
 ```ruby
 require 'uatu'
 
-# You can also have them in your env.
+# You can also have them in your env => ENV["MARVEL_PUBLIC_KEY"] - ENV["MARVEL_PRIVATE_KEY"]
 Uatu.configure do |config|
   config.public_key = 'your_api_key'
   config.private_key = 'your_private_api_key'

data/lib/uatu.rb

@@ -11,7 +11,5 @@ require 'uatu/base'
 
 module Uatu
   extend Configuration
-
-
 end
 

data/lib/uatu/connection.rb

@@ -42,7 +42,7 @@ module Uatu
       _options = options.reject{|key, value| key.to_s.match(/.*_id/)}
 
       # We change the names, so 'format_type' becomes 'formatType' 
-      _options.each{|key, value| valid_opts[unrubify(key)] = value }
+      _options.each{|key, value| valid_opts[key.to_s.camelize(:lower).to_sym] = value }
 
       # An array should become a string with comma separated values
       valid_opts.each{|key, value| valid_opts[key] = value.join(',') if value.is_a?(Array) }
@@ -50,21 +50,17 @@ module Uatu
       valid_opts
     end
 
-    def unrubify(name)
-      key = name.to_s
-      unrubified_key_array = key.split('_')
-      unrubified_key_array[1..-1].each(&:capitalize!)
-      unrubified_key_array.join.to_sym
-    end
-
+    # character => characters
+    # characters => characters
+    # character_comics => characters
     def valid_method(method)
       _method = method.split('_').first.pluralize
-      raise 'InvalidMethod' unless %w(characters series creators comics events stories).include?(_method)
+      raise Uatu::Error.new('InvalidMethod') unless Uatu::Base::RESOURCES.map(&:pluralize).include?(_method)
       _method
     end
 
     def current_timestamp
-      DateTime.now.to_s
+      @ts ||= DateTime.now.to_s
     end
 
     def hash(timestamp, conn_options)
@@ -72,8 +68,7 @@ module Uatu
     end
 
     def mandatory_params(conn_options)
-      ts = current_timestamp
-      {apikey: conn_options.public_key, ts: ts, hash: hash(ts, conn_options)}
+      {apikey: conn_options.public_key, ts: current_timestamp, hash: hash(current_timestamp, conn_options)}
     end
 
   end

data/lib/uatu/resource.rb

@@ -1,28 +1,8 @@
 module Uatu
   class Resource < OpenStruct
 
-    def initialize(resource_hash)
-      super(improve_hash(resource_hash))
-    end
-
-    def improve_hash(original_hash)
-      output_hash = underscore_keys(original_hash)
-      output_hash = add_shortcuts(output_hash)
-      output_hash = mashify(output_hash)
-      output_hash
-    end
-
-    # We change the hasehs to mashes (Hashie::Mash) so it's easier to manipulate
-    def mashify(hash)
-      _hash = {}
-      hash.each do |k,v|
-        _hash[k] = if v.is_a?(Hash)
-          Hashie::Mash.new(v)
-        else
-          v
-        end
-      end
-      _hash
+    def initialize(original_hash)
+      super(improve_values(underscore_keys(original_hash)))
     end
 
     # Underscore names of the Hash. I mean... this is Ruby, right?.
@@ -40,16 +20,20 @@ module Uatu
       _hash
     end
 
-    # That "thumbnail" hash in the original response drives me crazy
-    def add_shortcuts(args)
-      _args = {}
-      args.each do |k, v|
-        _args[k] = case k.to_s
-          when 'thumbnail' then [v['path'],v['extension']].join('.')
-          else v
+    # We change the hashes to mashes (Hashie::Mash) so it's easier to manipulate
+    # The 'thumbnail' hash drives me crazy, we convert it to a single value.
+    def improve_values(hash)
+      _hash = {}
+      hash.each do |k,v|
+        _hash[k] = if k.to_s=='thumbnail'
+          [v['path'],v['extension']].join('.')
+        elsif v.is_a?(Hash)
+          Hashie::Mash.new(v)
+        else
+          v
         end
       end
-      _args
+      _hash
     end
 
   end

data/lib/uatu/response.rb

@@ -16,7 +16,7 @@ module Uatu
         message = parsed_body['message'] || parsed_body['status']
 
         unless code.to_i == 200
-          raise Uatu::Error::ClientError.new "#{code} - #{message}\n ", {body: body, headers: headers}
+          raise Uatu::Error::ClientError.new "- Error code: #{code}\n- Message: #{message}\n ", {body: body, headers: headers}
         end
 
       end

data/lib/uatu/version.rb

@@ -1,3 +1,3 @@
 module Uatu
-  VERSION = "0.0.1.1"
+  VERSION = "0.0.2"
 end

data/uatu.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Víctor Martín"]
   spec.email         = ["victor.martin84@gmail.com"]
   spec.summary       = %q{Marvel API Wrapper}
-  spec.description   = %q{Marvel API Wrapper for Ruby.}
+  spec.description   = %q{Lightweight Marvel API Wrapper for Ruby.}
   spec.homepage      = "https://github.com/eltercero/uatu"
   spec.license       = "MIT"
 
@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~>5.2'
   spec.add_development_dependency 'json', '~>1.8'
   spec.add_development_dependency 'hashie', '~>2.0'
-  spec.add_development_dependency 'pry', '~>0.9'
   spec.add_development_dependency 'activesupport', '~>3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uatu-marvel
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Víctor Martín
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description: Marvel API Wrapper for Ruby.
+description: Lightweight Marvel API Wrapper for Ruby.
 email:
 - victor.martin84@gmail.com
 executables: []