skalka 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e0999bc447eda62f39296a95be5f86a7fa7d99950c9f5849f87cb3431ea101
-  data.tar.gz: 1a0d4e2a0d0fa1d06d754a5d969b35a07c3d2b069a5dc88fa48799a7ae8a79d4
+  metadata.gz: 5719ceadec96d873ec1440d99a5d5c5780aaef255e2b035830e74540d25d9bcc
+  data.tar.gz: b85ccbb1645e24dcfd4e3a36c9fa02a56e717f8863d46471550bb4731be5263a
 SHA512:
-  metadata.gz: 7271be51fee6c0e7d4d1e63bc30dab27b6f5f215ff66b67dbb822792d9feb9563c03466ad2079552c0e9881f8d9791cd53c2002662426cca6c363b4847e6543d
-  data.tar.gz: 3f0449c26566a12e463032538c77aed9d516b058f6eddbed6c7a2539a440627691c738418cb4bd3f7ffb16f595c3a27cb4e88cc138c6c3c43f97724c8c3d34c0
+  metadata.gz: b7561d80483359b08e8054096900bc90bef5e68e582bcb19fb94d80739dcc7c49296482e7de16b164b656bf72de4b7712de32badf772a964fc8b1d225926feca
+  data.tar.gz: 00a13e0657fb7ae1cdc6333b65f8d5051110b63d483dc558d550444419df42615e27c05e7fcd6a3195e33b6fcdc75b4ac7bb9b3398f20caf6554e020e3a63ed8

data/lib/skalka/functions.rb

@@ -20,25 +20,25 @@ module Skalka
       item.fetch(:data, {})
     end
 
-    def flat_wrap(data)
-      [data].flatten
-    end
-
     def extra_fields(parsed_json)
       parsed_json.slice(*EXTRA_FIELDS)
     end
 
-    def extract(parsed_json)
+    def extract_resource(parsed_json)
+      included = parsed_json.fetch(:included, [])
+
       (
         self[:fetch_data] >>
-        self[:flat_wrap] >>
-        self[:map_array, Resource[:build_resource].with(parsed_json)] >>
-        self[:unwrap]
+        self[:map_or_pass][ Resource[:build].with(included) ]
       ).call(parsed_json)
     end
 
-    def unwrap(list)
-      Functions[:guard, ->(l) { l.one? }, ->(l) { l.first }][list]
+    def map_or_pass(func)
+      self[:is, Array, self[:map_array, func]] >> self[:is, Hash, func]
+    end
+
+    def parse_and_symbolize_keys(json)
+      (self[:parse_json] >> self[:deep_symbolize_keys]).call(json)
     end
   end
 end

data/lib/skalka/nested_resource.rb

@@ -0,0 +1,22 @@
+module Skalka
+  module NestedResource
+    extend Transproc::Registry
+
+    module_function
+
+    def build(item)
+      (
+        Resource[:fetch_relationships] >>
+        Functions[:map_values, fetch_and_process_data]
+      )[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 }]
+    end
+  end
+end

data/lib/skalka/resource.rb

@@ -4,13 +4,10 @@ module Skalka
 
     module_function
 
-    def build_resource(item, parsed_json)
-      raw_relationships = item.fetch(:relationships, {})
-      included = parsed_json.fetch(:included, [])
-
+    def build(item, included)
       {
         **self[:deattribute][item],
-        **relationships(included, raw_relationships)
+        **self[:relationships].with(included)[item]
       }
     end
 
@@ -23,16 +20,19 @@ module Skalka
 
     def deattribute_with_nested(item)
       {
-        **deattribute(item),
-        **nested_relationships(item.fetch(:relationships, {}))
+        **self[:deattribute][item],
+        **NestedResource[:build][item]
       }
     end
 
-    def fetch_link(included)
-      Functions[:fetch_data] >>
-        Functions[:flat_wrap] >>
-        Functions[:map_array, self[:find_resource].with(included) >> self[:deattribute_with_nested]] >>
-        Functions[:unwrap]
+    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) >> self[:deattribute_with_nested]
+      ]
     end
 
     def find_resource(relationship, included)
@@ -41,21 +41,11 @@ module Skalka
       end
     end
 
-    def nested_relationships(relationships)
-      Functions[
-        :map_values,
-        Functions[:fetch_data] >>
-        Functions[:flat_wrap] >>
-        Functions[
-          :map_array,
-          Functions[:accept_keys, [:id]] >>
-          Functions[:map_value, :id, ->(id) { id.to_i }]
-        ]
-      ][relationships]
-    end
-
-    def relationships(included, raw_relationships)
-      Functions[:map_values, fetch_link(included)][raw_relationships]
+    def relationships(item, included)
+      (
+        self[:fetch_relationships] >>
+        Functions[:map_values, fetch_link_func(included)]
+      )[item]
     end
   end
 end

data/lib/skalka/version.rb

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

data/lib/skalka.rb

@@ -1,23 +1,21 @@
 require "skalka/functions"
 require "skalka/resource"
+require "skalka/nested_resource"
 require "skalka/version"
 
 module Skalka
   autoload :Functions, "skalka/functions"
   autoload :Resource, "skalka/resource"
+  autoload :NestedResource, "skalka/nested_resource"
 
   module_function
 
   def call(json)
-    parsed_json = parse_json(json)
+    parsed_json = Functions[:parse_and_symbolize_keys][json]
 
     {
-      data: Functions[:extract][parsed_json],
+      data: Functions[:extract_resource][parsed_json],
       **Functions[:extra_fields][parsed_json]
     }
   end
-
-  private def parse_json(json)
-    (Functions[:parse_json] >> Functions[:deep_symbolize_keys])[json]
-  end
 end

data/skalka.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "skalka/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skalka
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Emil Shakirov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - Rakefile
 - lib/skalka.rb
 - lib/skalka/functions.rb
+- lib/skalka/nested_resource.rb
 - lib/skalka/resource.rb
 - lib/skalka/version.rb
 - skalka.gemspec