pokeapi 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2dbd18db0c4cd72a952802659ed6ec3f0f68fd
-  data.tar.gz: 33d2aac81d880c8d8dde2d5f89deb409e5a4f9c7
+  metadata.gz: 40816f1238320795f9a1fd2d3fd04cabfb90dab8
+  data.tar.gz: 7ab4819c43275bdc5938052f46340f292ee021f0
 SHA512:
-  metadata.gz: 5385481672a79046f1d5909d1401b8fa40370ba0834a990b837ec09b981a12fe9c5555119fb514f1e6117b81a8020cc2417c9c025ab922491dafc8efa0873173
-  data.tar.gz: cee1a9870567e2f62a5cdf1a782232fc76bdc6eddd1618fa1b66a382b936bd32162e41c53363b48322abf936d06ebdca77158f17dd8a576fa7640b9af08b0917
+  metadata.gz: 329e351b4541d4b15e0454c43d345a27013853a851ec9d3965d268b24d4c5d46bd02a0a49a8172d3160a7c1b9e5ad5cb06f26756c90ee8a47e1d17c1dc52a78f
+  data.tar.gz: 3a266eda7b2a66be70803af8995109bb92b169ab2f3e11e1f00976189803a7c8fe027a0efcb6a326e7d96d1e7b79b3d392082f1cdc21eb658f5f9a182b3044e6

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/lib/pokeapi.rb

@@ -1,5 +1,6 @@
 require "hashie"
 require "pokeapi/version"
+require "pokeapi/parser/pokemon"
 require "pokeapi/base"
 require "pokeapi/ability"
 require "pokeapi/move"

data/lib/pokeapi/ability.rb

@@ -1,7 +1,8 @@
 module PokeAPI
   class Ability < Base
+    property :name
     property :is_hidden
     property :slot
-    property :ability
+    property :url
   end
 end

data/lib/pokeapi/move.rb

@@ -1,6 +1,6 @@
 module PokeAPI
   class Move < Base
-    property :move
-    property :version_group_details
+    property :name
+    property :url
   end
 end

data/lib/pokeapi/parser/pokemon.rb

@@ -0,0 +1,73 @@
+module PokeAPI
+  module Parser
+    class Pokemon
+      def self.parse(data)
+        new(data).parse
+      end
+
+      def initialize(data)
+        @data = data.clone
+        @abilities = @data.delete :abilities
+        @moves = @data.delete :moves
+        @types = @data.delete :types
+        @stats = @data.delete :stats
+        @thumbnail = @data.delete(:sprites).delete(:front_default)
+      end
+
+      def parse
+        {
+          id: @data[:id],
+          name: @data[:name],
+          abilities: abilities,
+          moves: moves,
+          types: types,
+          stats: stats,
+          thumbnail: @thumbnail,
+        }
+      end
+
+      private
+
+      def abilities
+        @abilities.map do |ability|
+          {
+            name: ability[:ability][:name],
+            url: ability[:ability][:url],
+            is_hidden: ability[:is_hidden],
+            slot: ability[:slot],
+          }
+        end.sort_by { |ability| ability[:slot] }
+      end
+
+      def moves
+        @moves.map do |move|
+          {
+            name: move[:move][:name],
+            url: move[:move][:url],
+          }
+        end
+      end
+
+      def types
+        @types.map do |type|
+          {
+            name: type[:type][:name],
+            slot: type[:slot],
+            url: type[:type][:url],
+          }
+        end.sort_by { |type| type[:slot] }
+      end
+
+      def stats
+        @stats.map do |stat|
+          {
+            name: stat[:stat][:name],
+            url: stat[:stat][:url],
+            base_stat: stat[:base_stat],
+            effort: stat[:effort],
+          }
+        end
+      end
+    end
+  end
+end

data/lib/pokeapi/pokemon.rb

@@ -3,15 +3,10 @@ module PokeAPI
     property :id
     property :name
     property :abilities, coerce: Array[Ability]
-    property :held_items, coerce: Array[Hash]
     property :moves, coerce: Array[Move]
     property :types, coerce: Array[Type]
     property :stats, coerce: Array[Stat]
-    property :sprites
-
-    def sprite
-      sprites[:front_default]
-    end
+    property :thumbnail
 
     class << self
       def find(id)

data/lib/pokeapi/requester.rb

@@ -9,7 +9,8 @@ module PokeAPI
 
     class << self
       def pokemon(id)
-        get("#{POKEMON_ENDPOINT}#{id}")
+        data = get("#{POKEMON_ENDPOINT}#{id}")
+        Parser::Pokemon.parse(data)
       end
 
       def get(path)

data/lib/pokeapi/stat.rb

@@ -1,10 +1,8 @@
 module PokeAPI
   class Stat < Base
+    property :name
+    property :url
     property :base_stat
-    property :stat
-
-    def name
-      stat[:name]
-    end
+    property :effort
   end
 end

data/lib/pokeapi/type.rb

@@ -1,10 +1,7 @@
 module PokeAPI
   class Type < Base
+    property :name
+    property :url
     property :slot
-    property :type
-
-    def name
-      type[:name]
-    end
   end
 end

data/lib/pokeapi/version.rb

@@ -1,3 +1,3 @@
 module PokeAPI
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokeapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Edgar Ortega
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -101,6 +102,7 @@ files:
 - lib/pokeapi/ability.rb
 - lib/pokeapi/base.rb
 - lib/pokeapi/move.rb
+- lib/pokeapi/parser/pokemon.rb
 - lib/pokeapi/pokemon.rb
 - lib/pokeapi/requester.rb
 - lib/pokeapi/stat.rb