rom 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8052ad74ae5b51b3c93fdf26f763c9b4311c03
-  data.tar.gz: 7b08d6d109408b867d9835091f2659113677d9f0
+  metadata.gz: 351889d2541ad18d05c029e555b635919c68c50c
+  data.tar.gz: c66be9ee892b0ee4c4f2c7ec6505739d9a811df1
 SHA512:
-  metadata.gz: 104cc004f3767ad8ce1907597ef7d93b2eca030517cacc174830c391ce64e09f367980b0f6d271be535286c2cbd4fb949bae1d656b32b604011b353450abf5ff
-  data.tar.gz: c82137cf1b58dfa77ac280b0847c78625eb0fd86f0da3d416f71b2cf5340f9342703086d40681b482813ca0d2be10461db3c04c044133bf6b975e435ce7ac039
+  metadata.gz: 451aa0e25642c399e67eda6cddd8db5c67b801bbea371f291094913d693e9f226ed5defe783df59dfebebf4b1fd67a3577096df13c91a63faec8a2260bf0eeed
+  data.tar.gz: 41db751db49169072c52b16ffd07f4cbd694463dd2a64b484553d1a9542e47db81492b17d0e1914e489c4cf02dfa8f49ffd4bad905f271b4fc45177c760b7580

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.3.2 2017-10-14
+
+### Fixed
+
+* Delegate private method calls in composite relations (flash-gordon)
+
+[Compare v3.3.1...v3.3.2](https://github.com/rom-rb/rom/compare/v3.3.1...v3.3.2)
+
 # v3.3.1 2017-07-09
 
 ### Fixed

data/lib/rom/pipeline.rb

@@ -94,6 +94,8 @@ module ROM
     #
     # @api private
     class Composite
+      (Kernel.private_instance_methods - %i(respond_to_missing?)).each(&method(:undef_method))
+
       include Dry::Equalizer(:left, :right)
       include Proxy
 

data/lib/rom/types.rb

@@ -1,4 +1,5 @@
 require 'dry-types'
+require 'json'
 
 module ROM
   module Types
@@ -6,6 +7,10 @@ module ROM
 
     def self.included(other)
       other.extend(Methods)
+      other::Coercible.extend(CoercibleMethods)
+      other::Coercible.const_set('JSON', other::Coercible.JSON)
+      other::Coercible.const_set('JSONHash', other::Coercible.JSONHash)
+      other::Coercible.const_set('HashJSON', other::Coercible.HashJSON)
       super
     end
 
@@ -22,5 +27,30 @@ module ROM
         type.meta(foreign_key: true, target: relation)
       end
     end
+
+    module CoercibleMethods
+      def JSONHash(symbol_keys: false, type: Types::Hash)
+        Types.Constructor(type) do |value|
+          next Hash[value] if value.respond_to?(:to_hash)
+
+          begin
+            ::JSON.parse(value.to_s, symbolize_names: symbol_keys)
+          rescue ::JSON::ParserError
+            value
+          end
+        end
+      end
+
+      def HashJSON(type: Types::String)
+        Types.Constructor(type) do |value|
+          next value unless value.respond_to?(:to_hash)
+          ::JSON.dump(value)
+        end
+      end
+
+      def JSON(symbol_keys: false)
+        self.HashJSON.meta(read: self.JSONHash(symbol_keys: symbol_keys))
+      end
+    end
   end
 end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '3.3.1'.freeze
+  VERSION = '3.3.2'.freeze
 end

data/spec/unit/rom/relation/composite_spec.rb

@@ -6,6 +6,11 @@ RSpec.describe ROM::Relation::Composite do
 
   let(:users_relation) do
     Class.new(ROM::Memory::Relation) do
+      schema do
+        attribute :name, ROM::Types::String
+        attribute :email, ROM::Types::String
+      end
+
       def by_name(name)
         restrict(name: name)
       end
@@ -13,6 +18,10 @@ RSpec.describe ROM::Relation::Composite do
       def sorted(other)
         other.source.order(:name)
       end
+
+      def select(key)
+        project(key)
+      end
     end.new(users_dataset)
   end
 
@@ -86,4 +95,12 @@ RSpec.describe ROM::Relation::Composite do
       expect(relation.first).to eql('JOE')
     end
   end
+
+  describe '#__send__' do
+    it 'proxies Kernel methods' do
+      relation = (users_relation >> name_list >> upcaser).__send__(:select, :name)
+
+      expect(relation.call).to match_array(%w(JANE JOE))
+    end
+  end
 end

data/spec/unit/rom/relation/schema_spec.rb

@@ -81,6 +81,91 @@ RSpec.describe ROM::Relation, '.schema' do
     expect(schema.foreign_key(:users)).to be(schema[:author_id])
   end
 
+  it 'allows JSON read/write coersion', aggregate_failures: true do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::JSON
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = '{"foo":"bar"}'
+    hash_payload = { "foo" => "bar" }
+
+    expect(schema[:payload][hash_payload]).to eq(json_payload)
+    expect(schema[:payload].meta[:read][json_payload]).to eq(hash_payload)
+  end
+
+  it 'allows JSON/Hash read/write coersion using symbols as keys', aggregate_failures: true do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::JSON(symbol_keys: true)
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = '{"foo":"bar"}'
+    hash_payload = { foo: "bar" }
+
+    expect(schema[:payload][hash_payload]).to eq(json_payload)
+    expect(schema[:payload].meta[:read][json_payload]).to eq(hash_payload)
+  end
+
+  it 'allows JSON to Hash coersion only' do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::JSONHash
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = '{"foo":"bar"}'
+    hash_payload = { "foo" => "bar" }
+
+    expect(schema[:payload][json_payload]).to eq(hash_payload)
+  end
+
+  it 'returns original payload in JSON to Hash coersion when json is invalid' do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::JSONHash
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = 'invalid: json'
+
+    expect(schema[:payload][json_payload]).to eq(json_payload)
+  end
+
+  it 'allows JSON to Hash coersion only using symbols as keys' do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::JSONHash(symbol_keys: true)
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = '{"foo":"bar"}'
+    hash_payload = { foo: "bar" }
+
+    expect(schema[:payload][json_payload]).to eq(hash_payload)
+  end
+
+  it 'allows Hash to JSON coersion only' do
+    class Test::Posts < ROM::Relation[:memory]
+      schema do
+        attribute :payload, Types::Coercible::HashJSON
+      end
+    end
+
+    schema = Test::Posts.schema
+    json_payload = '{"foo":"bar"}'
+    hash_payload = { "foo" => "bar" }
+
+    expect(schema[:payload][hash_payload]).to eq(json_payload)
+  end
+
   it 'sets register_as and dataset' do
     class Test::Users < ROM::Relation[:memory]
       schema(:users) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby Object Mapper