skalka 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5719ceadec96d873ec1440d99a5d5c5780aaef255e2b035830e74540d25d9bcc
-  data.tar.gz: b85ccbb1645e24dcfd4e3a36c9fa02a56e717f8863d46471550bb4731be5263a
+  metadata.gz: c558e0b2f03dc122f6a188e4af2b33f2164985ad170379ae74a3a94f65ad4229
+  data.tar.gz: 7dc9ed1b8322e19b7252cbf5e1483adcf854aafadc028476e55b2abe62611edb
 SHA512:
-  metadata.gz: b7561d80483359b08e8054096900bc90bef5e68e582bcb19fb94d80739dcc7c49296482e7de16b164b656bf72de4b7712de32badf772a964fc8b1d225926feca
-  data.tar.gz: 00a13e0657fb7ae1cdc6333b65f8d5051110b63d483dc558d550444419df42615e27c05e7fcd6a3195e33b6fcdc75b4ac7bb9b3398f20caf6554e020e3a63ed8
+  metadata.gz: 9cafcff73078d423dc9723045c9fbacad3bf832aeb40543dfb39021fc65051701fbc652b1203b08cfae7d5b12008e9240e78342e8dd9dfc16dd8f9b3540928ef
+  data.tar.gz: 400907919983d610a5fcfe7786b40f2cb16ff8dcec5d3e7c6a75f264b974cda45a872b1cea1247fcd6569d55b8a87161892d339f3d02ae12b9269937b55e599a

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/lib/skalka/functions.rb

@@ -16,6 +16,13 @@ module Skalka
 
     module_function
 
+    def deattribute(item)
+      {
+        id: item[:id].to_i,
+        **item[:attributes]
+      }
+    end
+
     def fetch_data(item)
       item.fetch(:data, {})
     end

data/lib/skalka/nested_resource.rb

@@ -5,6 +5,13 @@ module Skalka
     module_function
 
     def build(item)
+      {
+        **Functions[:deattribute][item],
+        **attributes(item)
+      }
+    end
+
+    private def attributes(item)
       (
         Resource[:fetch_relationships] >>
         Functions[:map_values, fetch_and_process_data]

data/lib/skalka/resource.rb

@@ -6,18 +6,11 @@ module Skalka
 
     def build(item, included)
       {
-        **self[:deattribute][item],
+        **Functions[:deattribute][item],
         **self[:relationships].with(included)[item]
       }
     end
 
-    def deattribute(item)
-      {
-        id: item[:id].to_i,
-        **item[:attributes]
-      }
-    end
-
     def deattribute_with_nested(item)
       {
         **self[:deattribute][item],
@@ -31,7 +24,7 @@ module Skalka
 
     def fetch_link_func(included)
       Functions[:fetch_data] >> Functions[:map_or_pass][
-        self[:find_resource].with(included) >> self[:deattribute_with_nested]
+        self[:find_resource].with(included) >> NestedResource[:build]
       ]
     end
 

data/lib/skalka/version.rb

@@ -1,3 +1,3 @@
 module Skalka
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skalka
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emil Shakirov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,6 @@ files:
 - ".rubocop.yml"
 - ".tool-versions"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    skalka (0.1.0)
-      transproc
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    method_source (0.9.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    transproc (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  pry
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  skalka!
-
-BUNDLED WITH
-   1.16.1