valkyrie-sequel 1.1.0 → 2.0.0.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e9fe995f047640837186d5468d2c13c1a4bde5
-  data.tar.gz: 2802d8cdee2d9bc7a029be53053a8d2df0e56358
+  metadata.gz: f09e37f6279e040ac0253e63ff2f10bc822ea67b
+  data.tar.gz: eae2cdca8cae11738a8ef38f4ce591659de08932
 SHA512:
-  metadata.gz: bb9d0289ef5b574b75447c06531416f306db195ad9a3e213cba51ab4671bd3cf62504a107f5647f6a6f2262b45805d832ad88bfbbf5252d3b953d2a2963dd743
-  data.tar.gz: 9d38118312e0e27e71c8035b40eabc23c15719bbe33b87d4deb2e99fc1347f95384e457ee1480ebbab71d6072eff3750281dc96b8a8fc933ca6639365da27c13
+  metadata.gz: 1845a18da24c50ac546f0c6f92836ebcc68143f83a37559386a831541945ec5932ba515e1c0976950a93c0e94854ed3e18f8136df9b668eb88469550d536a290
+  data.tar.gz: 5021dbc8d25fbcdf3221490b9fcfbc1fa64dcabdb76703d8707708a2636c34cb96d299e6e6678d0e2fde6ddb523eb25a9da148dd89991e9e4c9a26f04133a070

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.3.7-node-browsers
+      - image: circleci/ruby:2.4.6-node-browsers
         environment:
           RAILS_ENV: test
           DB_HOST: localhost

data/.rubocop.yml

@@ -14,6 +14,7 @@ Naming/FileName:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
+    - 'valkyrie-sequel.gemspec'
 Metrics/ClassLength:
   Exclude:
     - 'lib/valkyrie/sequel/query_service.rb'

data/lib/valkyrie/sequel/query_service.rb

@@ -199,7 +199,7 @@ module Valkyrie::Sequel
       end
 
       def ordered_property?(resource:, property:)
-        resource.class.schema[property].meta.try(:[], :ordered)
+        resource.ordered_attribute?(property)
       end
   end
 end

data/lib/valkyrie/sequel/resource_factory/orm_converter.rb

@@ -54,7 +54,7 @@ module Valkyrie::Sequel
       # Generate a Hash derived from Valkyrie Resource metadata encoded in the RDF
       # @return [Hash]
       def rdf_metadata
-        @rdf_metadata ||= Valkyrie::Persistence::Postgres::ORMConverter::RDFMetadata.new(object[:metadata]).result
+        @rdf_metadata ||= Valkyrie::Persistence::Shared::JSONValueMapper.new(object[:metadata]).result
       end
   end
 end

data/lib/valkyrie/sequel/resource_factory/resource_converter.rb

@@ -1,6 +1,17 @@
 # frozen_string_literal: true
 module Valkyrie::Sequel
   class ResourceFactory::ResourceConverter
+    PRIMARY_TERMS = [
+      :id,
+      :created_at,
+      :updated_at,
+      :internal_resource
+    ].freeze
+
+    BLACKLIST_TERMS = [
+      :new_record
+    ].freeze
+
     attr_reader :resource, :resource_factory
     delegate :orm_class, :adapter, to: :resource_factory
     delegate :resources, to: :adapter
@@ -34,14 +45,14 @@ module Valkyrie::Sequel
 
       def database_hash
         resource_hash.select do |k, _v|
-          primary_terms.include?(k)
+          PRIMARY_TERMS.include?(k)
         end.compact.merge(
           metadata: ::Sequel.pg_json(metadata_hash)
         )
       end
 
       def resource_hash
-        @resource_hash ||= resource.to_h
+        @resource_hash ||= resource.__attributes__
       end
 
       # Convert attributes to all be arrays to better enable querying and
@@ -57,23 +68,8 @@ module Valkyrie::Sequel
 
       def selected_resource_attributes
         resource_hash.select do |k, _v|
-          !primary_terms.include?(k) && !blacklist_terms.include?(k)
+          !PRIMARY_TERMS.include?(k) && !BLACKLIST_TERMS.include?(k)
         end
       end
-
-      def primary_terms
-        [
-          :id,
-          :created_at,
-          :updated_at,
-          :internal_resource
-        ]
-      end
-
-      def blacklist_terms
-        [
-          :new_record
-        ]
-      end
   end
 end

data/lib/valkyrie/sequel/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Valkyrie
   module Sequel
-    VERSION = "1.1.0"
+    VERSION = "2.0.0.RC1"
   end
 end

data/valkyrie-sequel.gemspec

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -23,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sequel"
   spec.add_dependency "sequel_pg"
-  spec.add_dependency "valkyrie", '>= 1.5.0', '< 3.0.0'
+  spec.add_dependency "valkyrie", '>= 2.0.0.RC6', '< 3.0.0'
   spec.add_dependency "oj"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-sequel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.RC1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0.RC6
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0.RC6
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -228,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14