Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bixby to insulate from changes in rubocop #20

Merged
merged 1 commit into from
Jun 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require: rubocop-rspec
inherit_from: .rubocop_todo.yml
inherit_gem:
bixby: bixby_default.yml

AllCops:
DisplayCopNames: true
Expand Down
1 change: 1 addition & 0 deletions iiif_manifest.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'activesupport', '>= 4'

spec.add_development_dependency 'bixby', '~> 1.0'
spec.add_development_dependency 'bundler', '~> 1.11'
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'rake', '~> 10.0'
Expand Down
12 changes: 6 additions & 6 deletions lib/iiif_manifest/manifest_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ def to_h

private

def manifest
@manifest ||= manifest_builder_class
end
def manifest
@manifest ||= manifest_builder_class
end

def top_record
top_record_factory.new
end
def top_record
top_record_factory.new
end
end
end
24 changes: 12 additions & 12 deletions lib/iiif_manifest/manifest_builder/canvas_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ def apply(sequence)

private

def display_image
record.display_image if record.respond_to?(:display_image)
end

def apply_record_properties
canvas['@id'] = path
canvas.label = record.to_s
end

def attach_image
image_builder.new(display_image).apply(canvas)
end
def display_image
record.display_image if record.respond_to?(:display_image)
end

def apply_record_properties
canvas['@id'] = path
canvas.label = record.to_s
end

def attach_image
image_builder.new(display_image).apply(canvas)
end
end
end
end
6 changes: 3 additions & 3 deletions lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def from(work)

private

def file_set_presenters(work)
work.file_set_presenters
end
def file_set_presenters(work)
work.file_set_presenters
end
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ def each(&block)

private

def file_set_presenters
work.try(:file_set_presenters) || []
end
def file_set_presenters
work.try(:file_set_presenters) || []
end

def work_presenters
work.try(:work_presenters) || []
end
def work_presenters
work.try(:work_presenters) || []
end
end
end
end
18 changes: 9 additions & 9 deletions lib/iiif_manifest/manifest_builder/image_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ def apply(canvas)

private

def build_resource
resource_builder.apply(annotation)
end
def build_resource
resource_builder.apply(annotation)
end

def resource_builder
resource_builder_factory.new(display_image)
end
def resource_builder
resource_builder_factory.new(display_image)
end

def annotation
@annotation ||= iiif_annotation_factory.new
end
def annotation
@annotation ||= iiif_annotation_factory.new
end
end
end
end
6 changes: 3 additions & 3 deletions lib/iiif_manifest/manifest_builder/image_service_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def apply(resource)

private

def service
@service ||= iiif_service_factory.new
end
def service
@service ||= iiif_service_factory.new
end
end
end
end
101 changes: 50 additions & 51 deletions lib/iiif_manifest/manifest_builder/record_property_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def initialize(record, iiif_search_service_factory:, iiif_autocomplete_service_f
@iiif_autocomplete_service_factory = iiif_autocomplete_service_factory
end

# rubocop:disable Metrics/AbcSize
def apply(manifest)
manifest['@id'] = record.manifest_url.to_s
manifest.label = record.to_s
Expand All @@ -23,65 +22,65 @@ def apply(manifest)

private

def viewing_hint
(record.respond_to?(:viewing_hint) && record.send(:viewing_hint))
end
def viewing_hint
(record.respond_to?(:viewing_hint) && record.send(:viewing_hint))
end

def viewing_direction
(record.respond_to?(:viewing_direction) && record.send(:viewing_direction))
end
def viewing_direction
(record.respond_to?(:viewing_direction) && record.send(:viewing_direction))
end

def autocomplete_service
(record.respond_to?(:autocomplete_service) && record.send(:autocomplete_service))
end
def autocomplete_service
(record.respond_to?(:autocomplete_service) && record.send(:autocomplete_service))
end

def search_service
(record.respond_to?(:search_service) && record.send(:search_service))
end
def search_service
(record.respond_to?(:search_service) && record.send(:search_service))
end

def iiif_search_service
@iiif_search_service ||= iiif_search_service_factory.new
end
def iiif_search_service
@iiif_search_service ||= iiif_search_service_factory.new
end

def iiif_autocomplete_service
@iiif_autocomplete_service ||= iiif_autocomplete_service_factory.new
end
def iiif_autocomplete_service
@iiif_autocomplete_service ||= iiif_autocomplete_service_factory.new
end

# Build services. Currently supported:
# search_service, with (optional) embedded autocomplete service
#
# @return [Array] array of services
def services
iiif_search_service.search_service = search_service
iiif_autocomplete_service.autocomplete_service = autocomplete_service
iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
[iiif_search_service]
end
# Build services. Currently supported:
# search_service, with (optional) embedded autocomplete service
#
# @return [Array] array of services
def services
iiif_search_service.search_service = search_service
iiif_autocomplete_service.autocomplete_service = autocomplete_service
iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
[iiif_search_service]
end

# Validate manifest_metadata against the IIIF spec format for metadata
#
# @return [Boolean]
def valid_metadata?
return false unless record.respond_to?(:manifest_metadata)
metadata = record.manifest_metadata
valid_metadata_structure?(metadata) && valid_metadata_content?(metadata)
end
# Validate manifest_metadata against the IIIF spec format for metadata
#
# @return [Boolean]
def valid_metadata?
return false unless record.respond_to?(:manifest_metadata)
metadata = record.manifest_metadata
valid_metadata_structure?(metadata) && valid_metadata_content?(metadata)
end

# Manifest metadata must be an array containing hashes
#
# @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
# @return [Boolean]
def valid_metadata_structure?(metadata)
metadata.is_a?(Array) && metadata.all? { |v| v.is_a?(Hash) }
end
# Manifest metadata must be an array containing hashes
#
# @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
# @return [Boolean]
def valid_metadata_structure?(metadata)
metadata.is_a?(Array) && metadata.all? { |v| v.is_a?(Hash) }
end

# Manifest Metadata Hashes must contain 'label' and 'value' keys
#
# @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
# @return [Boolean]
def valid_metadata_content?(metadata)
metadata.all? { |v| v['label'].present? && v['value'].present? }
end
# Manifest Metadata Hashes must contain 'label' and 'value' keys
#
# @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
# @return [Boolean]
def valid_metadata_content?(metadata)
metadata.all? { |v| v['label'].present? && v['value'].present? }
end
end
end
end
18 changes: 9 additions & 9 deletions lib/iiif_manifest/manifest_builder/resource_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ def apply(annotation)

private

def resource
@resource ||= iiif_resource_factory.new
end
def resource
@resource ||= iiif_resource_factory.new
end

def iiif_endpoint
display_image.try(:iiif_endpoint)
end
def iiif_endpoint
display_image.try(:iiif_endpoint)
end

def image_service_builder
image_service_builder_factory.new(iiif_endpoint)
end
def image_service_builder
image_service_builder_factory.new(iiif_endpoint)
end
end
end
end
38 changes: 19 additions & 19 deletions lib/iiif_manifest/manifest_builder/sequence_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ def empty?

private

def canvas_builder
canvas_builder_factory.from(work)
end
def canvas_builder
canvas_builder_factory.from(work)
end

def sequence
@sequence ||=
begin
sequence = sequence_factory.new
sequence['@id'] ||= work.manifest_url + '/sequence/normal'
sequence['rendering'] ||= populate_sequence_rendering
canvas_builder.apply(sequence)
sequence
end
end
def sequence
@sequence ||=
begin
sequence = sequence_factory.new
sequence['@id'] ||= work.manifest_url + '/sequence/normal'
sequence['rendering'] ||= populate_sequence_rendering
canvas_builder.apply(sequence)
sequence
end
end

def populate_sequence_rendering
if work.respond_to?(:sequence_rendering)
work.sequence_rendering.each(&:to_h)
else
[]
def populate_sequence_rendering
if work.respond_to?(:sequence_rendering)
work.sequence_rendering.each(&:to_h)
else
[]
end
end
end
end
end
end
6 changes: 3 additions & 3 deletions lib/iiif_manifest/manifest_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def new(work)

private

def sammelband?(work)
work.respond_to?(:sammelband?) && work.sammelband?
end
def sammelband?(work)
work.respond_to?(:sammelband?) && work.sammelband?
end
end
end
6 changes: 3 additions & 3 deletions lib/iiif_manifest/v3/manifest_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ def to_h

private

def top_record
top_record_factory.new
end
def top_record
top_record_factory.new
end
end
end
end
Loading