protopack 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78a62b7195e16bf1e652f062893e09fa386c3cdd
-  data.tar.gz: 387c89d2bd400de745cd6c740f5527c7db73845f
+  metadata.gz: 0cb317f6ebff18ddcfef2fa9f2154020e5fb2e22
+  data.tar.gz: d8ee7909c86427a0d10d23eea8dce5e34a5d9667
 SHA512:
-  metadata.gz: 22c529ff5dda2505ec3dc2da67de63d0a3786c1542f69ffb6897628cf116785130759e447a8eccb62bed1a7d13101ba68a26e1c2062278ee74c80638720e80d0
-  data.tar.gz: 30411c3d7f5e79b69330bfc4271cb9113d32450feefc494fcd29f6cf31528f9ab188afd233b15ef2cc2ddc45cd99d141a724b735c2a2c34c338ccb067eb411bd
+  metadata.gz: 69d583f898589b222eda2d0f0f9795ec648a107681a491e970d64419e69c365f65990ea106421c0a592934c3cc0da2ce9618c86b0298de1cac3660bbe7bce466
+  data.tar.gz: 1abea23055c7ea068b1bc4caea24c6255594625fb9ffa3e8c575f75b9e483b80dceede994383f33abfa6a53eaa3baf77ad9ac7c7c8b78b4f55c83b5e10d2358a

data/lib/protopack.rb

@@ -1,5 +1,5 @@
 require "yaml"
-require "hashie"
+require "aduki"
 require "protopack/version"
 require "protopack/package"
 require "protopack/package_item"

data/lib/protopack/exporter.rb

@@ -15,14 +15,22 @@ module Protopack
 
     def build_association_table obj
       export_config(obj)[:associations].inject({ }) { |table, name|
-        assoc = obj.send name
-        next table if assoc.blank? || assoc.empty?
-        attrs = (assoc.respond_to?(:each)) ? array_assoc(assoc) : to_attributes(assoc)
-        table["#{name}_attributes"] = attrs
+        if name.is_a? Hash
+          build_association obj, table, name[:get], name[:set]
+        else
+          build_association obj, table, name, "#{name}_attributes"
+        end
         table
       }
     end
 
+    def build_association obj, table, getter, setter
+      assoc = obj.send getter
+      return if assoc.blank? || assoc.empty?
+      attrs = (assoc.respond_to?(:each)) ? array_assoc(assoc) : to_attributes(assoc)
+      table[setter] = attrs
+    end
+
     def to_package obj, meta={ }
       obj_name        = obj.send(name_method obj)
       obj_id          = obj_name.to_s.gsub(/_/, '-')

data/lib/protopack/package.rb

@@ -1,16 +1,14 @@
-class Protopack::Package
-  attr_reader :config
-
-  def method_missing m, *args
-    config.send m, *args
-  end
-
-  def initialize cfg
-    @config = (cfg.is_a?(Hashie::Mash) ? cfg : Hashie::Mash.new(cfg))
-  end
+class Protopack::Package < Aduki::Initializable
+  attr_accessor :name
+  attr_accessor :title
+  attr_accessor :description
+  attr_accessor :authors
+  attr_accessor :item_files
+  attr_accessor :root
+  aduki updated: Date
 
   def items
-    config.items.map { |item_file| Protopack::PackageItem.load(item_file) }
+    item_files.map { |item_file| Protopack::PackageItem.load(item_file) }
   end
 
   def item id
@@ -48,9 +46,9 @@ class Protopack::Package
 
   def self.all
     Dir.glob("#{config_root}/*/package-config.yml").map { |pkg_cfg|
-      cfg = Hashie::Mash.new(YAML.load(File.read(pkg_cfg)))
+      cfg = YAML.load(File.read(pkg_cfg))
       root = File.dirname pkg_cfg
-      cfg["items"] = Dir.glob("#{root}/*item*.yml")
+      cfg["item_files"] = Dir.glob("#{root}/*item*.yml")
       cfg["root"] = root
       new cfg
     }
@@ -58,8 +56,8 @@ class Protopack::Package
 
   def self.find name
     root = "#{config_root}/#{name}"
-    cfg = Hashie::Mash.new(YAML.load(File.read("#{root}/package-config.yml")))
-    cfg["items"] = Dir.glob("#{root}/*item*.yml")
+    cfg = YAML.load(File.read("#{root}/package-config.yml"))
+    cfg["item_files"] = Dir.glob("#{root}/*item*.yml")
     cfg["root"] = root
     new cfg
   end

data/lib/protopack/package_item.rb

@@ -1,17 +1,15 @@
-class Protopack::PackageItem
-  attr_reader :config
-
-  def method_missing m, *args
-    config.send m, *args
-  end
-
-  def initialize cfg
-    @config = (cfg.is_a?(Hashie::Mash) ? cfg : Hashie::Mash.new(cfg))
-  end
-
-  def name
-    attributes.name
-  end
+class Protopack::PackageItem < Aduki::Initializable
+  attr_accessor :id
+  attr_accessor :description
+  attr_accessor :locale
+  attr_accessor :default_locale
+  attr_accessor :type
+  attr_accessor :ordinal
+  attr_accessor :attributes
+  attr_accessor :resources
+  attr_accessor :protopack_filename
+
+  def name ; attributes[:name] || attributes["name"] ; end
 
   def lookup_class base, list
     base = base.const_get list.shift
@@ -31,17 +29,24 @@ class Protopack::PackageItem
     target_class.existence attributes
   end
 
+  def load_resources hsh, d = File.dirname(protopack_filename)
+    (resources || {}).inject(hsh) { |hsh, (k, v)|
+      hsh[k] = File.read(File.join d, v)
+      hsh
+    }
+  end
+
   def apply!
     factory = existence
     if factory.empty?
-      factory.create! attributes.to_hash
+      factory.create! load_resources(attributes.to_hash)
     else
       factory.first.update_attributes attributes.to_hash
     end
   end
 
   def self.load filename
-    Protopack::PackageItem.new(Hashie::Mash.new(YAML.load(File.read(filename))))
+    Protopack::PackageItem.new(YAML.load(File.read(filename)).merge(protopack_filename: filename))
   rescue
     raise "error reading from file #{filename}"
   end

data/lib/protopack/version.rb

@@ -1,3 +1,3 @@
 module Protopack
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/protopack.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{ Store packages of object prototypes on-disk as YML; this gem allows you scan each package for missing items and apply them to your repository. }
   gem.homepage      = "https://github.com/conanite/protopack"
 
-  gem.add_dependency             'hashie'
-  gem.add_dependency             'aduki', '~> 0.2.6', '>= 0.2.6'
+  gem.add_dependency             'aduki', '>= 0.2.7'
   gem.add_development_dependency 'rspec'
 
   gem.files         = `git ls-files`.split($/)

data/spec/models.rb

@@ -1,3 +1,29 @@
+require 'aduki'
+
+class Object
+  def blank?
+    false
+  end
+end
+
+class String
+  def blank?
+    strip == ''
+  end
+end
+
+class NilClass
+  def blank?
+    true
+  end
+end
+
+class Hash
+  def deep_merge other
+    merge other
+  end
+end
+
 class Repository
   def initialize klass, name
     @klass, @name = klass, name
@@ -20,9 +46,11 @@ class Repository
   end
 end
 
-class Widget
+class Widget < Aduki::Initializable
   @@widgets = []
 
+  attr_accessor :wots, :colour, :height, :density, :name, :description
+
   def self.all
     @@widgets
   end
@@ -31,28 +59,41 @@ class Widget
     @@widgets = []
   end
 
-  def initialize attrs
-    @attrs = attrs.is_a?(Hash) ? Hashie::Mash.new(attrs) : attrs
+  def aduki_after_initialize
     @@widgets << self
   end
 
-  def method_missing m, *args
-    @attrs[m.to_s]
+  def protopack_export_config
+    { fields: [:colour, :height, :density, :name ], associations: [{ get: :mywots, set: :newwots }]}
+  end
+
+  def slice *names
+    Hash[*(names.zip(names.map { |n| send n }).flatten)]
+  end
+
+  def mywots
+    self.wots
+  end
+
+  def newwots= wots_attrs
+    self.wots = wots_attrs.map { |a| Wot::Zit.new a }
   end
 
   def update_attributes attrs
-    @attrs = attrs
+    aduki_apply_attributes attrs
   end
 
   def self.existence attrs
-    Repository.new Widget, attrs.colour
+    Repository.new Widget, attrs["colour"]
   end
 end
 
 module Wot
-  class Zit
+  class Zit < Aduki::Initializable
     @@wotzits = []
 
+    attr_accessor :colour, :height, :density, :name
+
     def self.all
       @@wotzits
     end
@@ -61,21 +102,24 @@ module Wot
       @@wotzits = []
     end
 
-    def initialize attrs
-      @attrs = attrs.is_a?(Hash) ? Hashie::Mash.new(attrs) : attrs
+    def aduki_after_initialize
       @@wotzits << self
     end
 
-    def method_missing m, *args
-      @attrs.send m, *args
+    def protopack_export_config
+      { fields: [:colour, :height, :density, :name ], associations: [] }
+    end
+
+    def slice *names
+      Hash[*(names.zip(names.map { |n| send n }).flatten)]
     end
 
     def update_attributes attrs
-      @attrs = attrs
+      aduki_apply_attributes attrs
     end
 
     def self.existence attrs
-      Repository.new Wot::Zit, attrs.colour
+      Repository.new Wot::Zit, attrs["colour"]
     end
   end
 end

data/spec/protopack/exporter_spec.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+require File.expand_path('../../spec_helper', __FILE__)
+
+# from aduki
+require 'core_ext/array'
+require 'core_ext/hash'
+
+describe Protopack::Package do
+
+  it "exports a simple widget" do
+    wz0 = { colour: 41, height: 42, density: 43 }
+    wz1 = { colour: 51, height: 52, density: 53 }
+    w = Widget.new colour: 1, height: 2, density: 3, name: "Park Lodge Café", newwots: [ wz0, wz1 ]
+
+    exporter = Protopack::Exporter.new
+    hsh = exporter.to_package(w)
+    expected = <<YML.strip
+---
+id: Park Lodge Café
+description: Park Lodge Café
+type: Widget
+attributes:
+  colour: 1
+  height: 2
+  density: 3
+  name: Park Lodge Café
+  newwots:
+  - colour: 41
+    height: 42
+    density: 43
+  - colour: 51
+    height: 52
+    density: 53
+YML
+
+    expect(exporter.clean_yaml(hsh).strip).to eq expected
+  end
+
+end

data/spec/protopack/package_spec.rb

@@ -4,7 +4,12 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe Protopack::Package do
 
+  module HasRegion
+    attr_accessor :region
+  end
+
   before {
+    Protopack::PackageItem.send :include, HasRegion
     Protopack::Package.config_root = File.expand_path('../packages', __FILE__)
     Widget.destroy_all
     Wot::Zit.destroy_all
@@ -18,11 +23,11 @@ describe Protopack::Package do
     p = Protopack::Package.find("standard-widgets")
     expect(p.name).to eq "standard-widgets"
 
-    expect(p.title.en).to eq "Standard Widgets"
-    expect(p.title.fr).to eq "Widgets standards"
+    expect(p.title["en"]).to eq "Standard Widgets"
+    expect(p.title["fr"]).to eq "Widgets standards"
 
-    expect(p.description.en).to eq "Use these widgets for everyday widgeting"
-    expect(p.description.fr).to eq "Ces widgets sont utilisables pour votre widgeting quotidien"
+    expect(p.description["en"]).to eq "Use these widgets for everyday widgeting"
+    expect(p.description["fr"]).to eq "Ces widgets sont utilisables pour votre widgeting quotidien"
 
     expect(p.authors).to eq %w{ baz titi Z }
 
@@ -49,6 +54,14 @@ describe Protopack::Package do
     expect(Widget.all[2].height).to eq 'tiger'
     expect(Widget.all[3].height).to eq 'hyena'
     expect(Widget.all[4].height).to eq 'camel'
+
+    green = Widget.all[1]
+    expect(green.name).to eq "The green widget for obtuse African zebras"
+
+    black = Widget.all[4]
+    black_desc = "<html><p>this is what a black widget looks like</p></html>"
+    expect(black.name).to be_nil
+    expect(black.description).to eq black_desc
   end
 
   it "should install all items from a package subject to filtering" do

data/spec/protopack/packages/standard-widgets/black-description.html

@@ -0,0 +1 @@
+<html><p>this is what a black widget looks like</p></html>

data/spec/protopack/packages/standard-widgets/black-widget-item.yml

@@ -5,3 +5,5 @@ attributes:
   colour:  black
   height:  camel
   density: rhetorical
+resources:
+  description: black-description.html

data/spec/protopack/packages/standard-widgets/green-widget-item.yml

@@ -2,6 +2,7 @@ id: green-widget
 type: Widget
 region:    Africa
 attributes:
+  name:    The green widget for obtuse African zebras
   colour:  green
   height:  zebra
   density: obtuse

data/spec/protopack/packages/standard-widgets/package-config.yml

@@ -11,4 +11,3 @@ authors:
   - titi
   - Z
 updated: 2013-03-15
-

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: protopack
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aduki
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,10 +60,12 @@ files:
 - lib/protopack/version.rb
 - protopack.gemspec
 - spec/models.rb
+- spec/protopack/exporter_spec.rb
 - spec/protopack/package_spec.rb
 - spec/protopack/packages/advanced-widgets/lavender-widget-item.yml
 - spec/protopack/packages/advanced-widgets/magenta-widget-item.yml
 - spec/protopack/packages/advanced-widgets/package-config.yml
+- spec/protopack/packages/standard-widgets/black-description.html
 - spec/protopack/packages/standard-widgets/black-widget-item.yml
 - spec/protopack/packages/standard-widgets/blue-widget-item.yml
 - spec/protopack/packages/standard-widgets/green-widget-item.yml
@@ -118,10 +100,12 @@ summary: Store packages of object prototypes on-disk as YML; this gem allows you
   each package for missing items and apply them to your repository.
 test_files:
 - spec/models.rb
+- spec/protopack/exporter_spec.rb
 - spec/protopack/package_spec.rb
 - spec/protopack/packages/advanced-widgets/lavender-widget-item.yml
 - spec/protopack/packages/advanced-widgets/magenta-widget-item.yml
 - spec/protopack/packages/advanced-widgets/package-config.yml
+- spec/protopack/packages/standard-widgets/black-description.html
 - spec/protopack/packages/standard-widgets/black-widget-item.yml
 - spec/protopack/packages/standard-widgets/blue-widget-item.yml
 - spec/protopack/packages/standard-widgets/green-widget-item.yml