Skip to content

Commit

Permalink
Merge pull request #17 from nickel/pictos
Browse files Browse the repository at this point in the history
Adding pictos
  • Loading branch information
nickel authored Mar 26, 2024
2 parents 6baf23e + a797b02 commit 41696c9
Show file tree
Hide file tree
Showing 10 changed files with 207 additions and 1 deletion.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ gem "rails", "~> 7.1.3", ">= 7.1.3.2"

gem "bootsnap", require: false
gem "devise"
gem "image_processing"
gem "importmap-rails"
gem "jbuilder"
gem "packwerk"
Expand Down
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,15 @@ GEM
warden (~> 1.2.3)
drb (2.2.1)
erubi (1.12.0)
ffi (1.16.3)
foreman (0.87.2)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
importmap-rails (2.0.1)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
Expand All @@ -150,6 +154,7 @@ GEM
net-smtp
marcel (1.0.4)
matrix (0.4.2)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.22.2)
msgpack (1.7.2)
Expand Down Expand Up @@ -254,6 +259,8 @@ GEM
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
ruby-progressbar (1.13.0)
ruby-vips (2.2.1)
ffi (~> 1.12)
rubyzip (2.3.2)
selenium-webdriver (4.18.1)
base64 (~> 0.2)
Expand Down Expand Up @@ -314,6 +321,7 @@ DEPENDENCIES
debug
devise
foreman
image_processing
importmap-rails
jbuilder
packwerk
Expand Down
9 changes: 9 additions & 0 deletions app/packages/planning/models/picto.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

class Picto < ApplicationRecord
has_one_attached :image

def to_struct
CustomStruct.new(attributes)
end
end
28 changes: 28 additions & 0 deletions app/packages/planning/operations/picto/create.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# frozen_string_literal: true

class Picto::Create < CommandHandler::Command
class Form
include CommandHandler::Form

attribute :keyword, :string
attribute :external_id, :integer
attribute :external_source, :string
attribute :active, :boolean

attribute :image
attribute :data
end

delegate(*Form.new.attributes.keys, to: :form)

def call
Picto
.new(keyword:, external_id:, external_source:, active:, data:)
.save_with_response
.and_then do |picto|
picto.image.attach(io: File.open(image), filename: "image.png") if image

Response.success(picto.to_struct)
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This migration comes from active_storage (originally 20170806125915)
class CreateActiveStorageTables < ActiveRecord::Migration[7.0]
def change
# Use Active Record's configured type for primary and foreign keys
primary_key_type, foreign_key_type = primary_and_foreign_key_types

create_table :active_storage_blobs, id: primary_key_type do |t|
t.string :key, null: false
t.string :filename, null: false
t.string :content_type
t.text :metadata
t.string :service_name, null: false
t.bigint :byte_size, null: false
t.string :checksum

if connection.supports_datetime_with_precision?
t.datetime :created_at, precision: 6, null: false
else
t.datetime :created_at, null: false
end

t.index [ :key ], unique: true
end

create_table :active_storage_attachments, id: primary_key_type do |t|
t.string :name, null: false
t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
t.references :blob, null: false, type: foreign_key_type

if connection.supports_datetime_with_precision?
t.datetime :created_at, precision: 6, null: false
else
t.datetime :created_at, null: false
end

t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
t.foreign_key :active_storage_blobs, column: :blob_id
end

create_table :active_storage_variant_records, id: primary_key_type do |t|
t.belongs_to :blob, null: false, index: false, type: foreign_key_type
t.string :variation_digest, null: false

t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
t.foreign_key :active_storage_blobs, column: :blob_id
end
end

private
def primary_and_foreign_key_types
config = Rails.configuration.generators
setting = config.options[config.orm][:primary_key_type]
primary_key_type = setting || :primary_key
foreign_key_type = setting || :bigint
[primary_key_type, foreign_key_type]
end
end
18 changes: 18 additions & 0 deletions db/migrate/20240326153956_create_pictos.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
class CreatePictos < ActiveRecord::Migration[7.1]
def change
create_table :pictos do |t|
t.string :external_source
t.string :external_id

t.string :keyword

t.jsonb :data

t.boolean :active, default: true

t.timestamps
end

add_index :pictos, [:external_source, :external_id], unique: true
end
end
43 changes: 42 additions & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions lib/tasks/pictos/import.rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

namespace :pictos do
desc "Import pictos"
task import: :environment do
Dir.foreach(Rails.root.join("vendor/pictos")) do |filename|
next if [".", ".."].include?(filename)

data = JSON.parse(File.read(Rails.root.join("vendor/pictos", filename, "data.json")))
image = Rails.root.join("vendor/pictos", filename, "image.png")

keyword = data["keywords"].first["keyword"]
external_id = data["_id"]
external_source = "arasaac"

next if Picto.exists?(external_id:, external_source:)

Picto::Create.call(keyword:, external_id:, external_source:, active: false, image:, data:)
rescue StandardError
next
end
end
end
9 changes: 9 additions & 0 deletions test/packages/planning/models/picto_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

require "test_helper"

class PictoTest < ActiveSupport::TestCase
# test "the truth" do
# assert true
# end
end
12 changes: 12 additions & 0 deletions test/packages/planning/operations/picto/create_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# frozen_string_literal: true

require "test_helper"

class Picto::CreateTest < ActiveSupport::TestCase
test "picto creation with the proper values" do
response = Picto::Create
.call(keyword: "Foo", external_id: "1", external_source: "source")

assert response.success?
end
end

0 comments on commit 41696c9

Please sign in to comment.