skalka 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70c936569d44cb79fe41c6ad86d2c4a9c43bfb787b79e285c83585e425ea7f1
-  data.tar.gz: a4449fd3ecccce7d9e20fc7e23cb91e4f85771ae9ab390bed9fcf9af36d117e2
+  metadata.gz: 127fb261be8fd450102d76ac6e76d0a5080d7273b89fdae633f05d8c318e4873
+  data.tar.gz: 6902e5e67bdf3a3528c77ed26fbcbea0db1d0d2e6689d496f3ac89b261eadde0
 SHA512:
-  metadata.gz: 115ca2f626cc8b10c918118a5dd05fe966f529ef87336593d5cf7be3877131c5d130847a97c2294f339315c77ba96d78e06e73811f2d8c6f3e5759e3f8d1209b
-  data.tar.gz: 5492c631a829f42c170dd2c99bf3d345e93d0164ded21c881b197894149e8e13f8f2007ad9eba4874a52586978372d83eba0133235e6da9ebe5970be4c852224
+  metadata.gz: 949b512b5c35a3e81b7212c9db87d22711f3fe8a2e29e41193a916730d5dc3b627742e880215f1737bd140a427a630e536d3a3df6fd0419d8fdfb75b38e2a6ef
+  data.tar.gz: 36e38e01276d3d502d73540d498edb9a2a44e135b850f707017c700e6463a90194dc71d89c6ccf65ec6b98e0c0f734bfb7049201537d5d40d2da88a989cd2f26

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+before_install: gem install bundler
+script:
+  - bundle exec rake spec
+rvm:
+  - 2.5.1

data/Gemfile

@@ -5,4 +5,5 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in skalka.gemspec
 gemspec
 
-gem "pry"
+gem "pry", require: false
+gem "simplecov", require: false

data/README.md

@@ -1,5 +1,7 @@
 # Skalka
 
+[![Build Status](https://travis-ci.com/vaihtovirta/skalka.svg?branch=master)](https://travis-ci.com/vaihtovirta/skalka)
+
 ![](https://i.imgur.com/rsw7QPg.png)
 
 ### Skalka — the rolling pin for your json api responses.
@@ -61,8 +63,8 @@ json = %{
       }
     ],
     "meta": {
-      "page": 1,
-      "count": 1
+      "page": "1",
+      "count": "1"
     }
   }
 }
@@ -71,14 +73,30 @@ Skalka.call(json)
 
 {
   data: {
-    id: "1", title: "Wise Thought",
-    body: "You can't blame gravity for falling in love.",
-    created_at: "2015-05-22T14:56:29.000Z",
-    updated_at: "2015-05-22T14:56:28.000Z",
-    author: [{ id: "42", name: "Albert Einstein", age: 76, gender: "male" }],
-    comments: [{ id: "55", content: "Meh" }]
+    id: "1",
+    type: "articles",
+    attributes: {
+      title: "Wise Thought",
+      body: "You can't blame gravity for falling in love.",
+      created_at: "2015-05-22T14:56:29.000Z",
+      updated_at: "2015-05-22T14:56:28.000Z",
+      author: {
+        id: "42",
+        type: "authors",
+        attributes: {
+          id: "42", name: "Albert Einstein", age: 76, gender: "male"
+        }
+      },
+      comments: [
+        {
+          id: "55",
+          type: "comments",
+          attributes: { id: "55", content: "Meh" }
+        }
+      ]
+    }
   },
-    meta: { page: 1, count: 1 }
+  meta: { page: "1", count: "1" }
 }
 ```
 

data/lib/skalka/functions.rb

@@ -4,6 +4,7 @@ require "transproc/conditional"
 
 module Skalka
   module Functions
+    MAIN_FIELDS = %i[id type attributes].freeze
     EXTRA_FIELDS = %i[errors links meta].freeze
 
     extend Transproc::Registry
@@ -16,15 +17,6 @@ module Skalka
 
     module_function
 
-    def deattribute(item)
-      return {} if item.empty?
-
-      {
-        id: item[:id].to_i,
-        **item[:attributes]
-      }
-    end
-
     def fetch_data(item)
       item.fetch(:data, {})
     end
@@ -49,5 +41,9 @@ module Skalka
     def parse_and_symbolize_keys(json)
       (self[:parse_json] >> self[:deep_symbolize_keys]).call(json)
     end
+
+    def pick_main_attributes(item)
+      item.slice(*MAIN_FIELDS)
+    end
   end
 end

data/lib/skalka/nested_resource.rb

@@ -7,25 +7,23 @@ module Skalka
     def build(item)
       return {} if item.empty?
 
-      {
-        **Functions[:deattribute][item],
-        **attributes(item)
-      }
+      Functions[:deep_merge][
+        Functions[:pick_main_attributes][item],
+        attributes: attributes(item)
+      ]
     end
 
     private def attributes(item)
       (
         Resource[:fetch_relationships] >>
-        Functions[:map_values, fetch_and_process_data]
+        Functions[:map_values, fetch_and_reject_type]
       )[item]
     end
 
-    private def fetch_and_process_data
-      Functions[:fetch_data] >> Functions[:map_or_pass][reject_type_and_convert_id]
-    end
-
-    private def reject_type_and_convert_id
-      Functions[:reject_keys, [:type]] >> Functions[:map_value, :id, ->(id) { id.to_i }]
+    private def fetch_and_reject_type
+      Functions[:fetch_data] >> Functions[:map_or_pass][
+        Functions[:reject_keys, [:type]]
+      ]
     end
   end
 end

data/lib/skalka/resource.rb

@@ -5,39 +5,36 @@ module Skalka
     module_function
 
     def build(item, included)
-      {
-        **Functions[:deattribute][item],
-        **self[:relationships].with(included)[item]
-      }
-    end
+      return {} if item.empty?
 
-    def deattribute_with_nested(item)
-      {
-        **self[:deattribute][item],
-        **NestedResource[:build][item]
-      }
+      Functions[:deep_merge][
+        Functions[:pick_main_attributes][item],
+        attributes: self[:relationships].with(included)[item]
+      ]
     end
 
     def fetch_relationships(item)
       item.fetch(:relationships, {})
     end
 
-    def fetch_link_func(included)
-      Functions[:fetch_data] >> Functions[:map_or_pass][
-        self[:find_resource].with(included) >> NestedResource[:build]
-      ]
+    private def build_resource(included)
+      self[:find_resource].with(included) >> NestedResource[:build]
+    end
+
+    private def fetch_link(included)
+      Functions[:fetch_data] >> Functions[:map_or_pass][build_resource(included)]
     end
 
-    def find_resource(relationship, included)
+    private def find_resource(relationship, included)
       included.find do |included_resource|
         included_resource.values_at(:id, :type) == relationship.values_at(:id, :type)
       end
     end
 
-    def relationships(item, included)
+    private def relationships(item, included)
       (
         self[:fetch_relationships] >>
-        Functions[:map_values, fetch_link_func(included)]
+        Functions[:map_values, fetch_link(included)]
       )[item]
     end
   end

data/lib/skalka/version.rb

@@ -1,3 +1,3 @@
 module Skalka
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skalka
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Emil Shakirov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md