katapult 0.3.0 → 0.4.0

data/spec/association_spec.rb

@@ -0,0 +1,12 @@
+require 'katapult/elements/association'
+
+describe Katapult::Association do
+
+  subject { described_class.new('association') }
+
+  it 'stores its :belongs_to as String' do
+    subject = described_class.new('model', belongs_to: :other_model)
+    expect(subject.belongs_to).to eq 'other_model'
+  end
+
+end

data/spec/attribute_spec.rb

@@ -1,4 +1,4 @@
-require 'katapult/attribute'
+require 'katapult/elements/attribute'
 
 describe Katapult::Attribute do
 
@@ -57,4 +57,38 @@ describe Katapult::Attribute do
     end
   end
 
+  describe '#asset_values_as_list?' do
+    it 'returns false when there are no assignable values given' do
+      subject = described_class.new('name')
+      expect(subject.assignable_values_as_list?).to be false
+    end
+
+    it 'returns false when assignable values are give as a string (= custom code)' do
+      subject = described_class.new('name', assignable_values: 'NameProvider.all')
+      expect(subject.assignable_values_as_list?).to be false
+    end
+
+    it 'returns true when assignable values are an Array' do
+      subject = described_class.new('name', assignable_values: %w[andi andy])
+      expect(subject.assignable_values_as_list?).to be true
+    end
+
+    it 'returns true when assignable values are a Range' do
+      subject = described_class.new('age', assignable_values: (1..99))
+      expect(subject.assignable_values_as_list?).to be true
+    end
+  end
+
+  describe '#has_defaults?' do
+    it 'returns false when it is an "assignable values" attribute' do
+      subject = described_class.new('kind', assignable_values: %w[customer guest])
+      expect(subject.has_defaults?).to be false
+    end
+
+    it 'returns false when it is a flag attribute' do
+      subject = described_class.new('active', type: :flag, default: true)
+      expect(subject.has_defaults?).to be false
+    end
+  end
+
 end

data/spec/model_spec.rb

@@ -1,5 +1,4 @@
-require 'katapult/model'
-require 'katapult/attribute'
+require 'katapult/elements/model'
 
 describe Katapult::Model do
 
@@ -13,6 +12,10 @@ describe Katapult::Model do
 
       expect(subject.label_attr.name).to eql('second_attr')
     end
+
+    it 'raises an error when someone needs/wants/expect a label attribute but there is none' do
+      expect{ subject.label_attr }.to raise_error Katapult::Model::MissingLabelAttributeError
+    end
   end
 
 end

data/spec/util_spec.rb

@@ -1,4 +1,4 @@
-require 'katapult/binary_util'
+require 'katapult/support/binary_util'
 
 describe Katapult::BinaryUtil do
 

data/spec/web_ui_spec.rb

@@ -1,5 +1,5 @@
-require 'katapult/web_ui'
-require 'katapult/model'
+require 'katapult/elements/web_ui'
+require 'katapult/elements/model'
 require 'katapult/application_model'
 
 describe Katapult::WebUI do
@@ -37,43 +37,21 @@ describe Katapult::WebUI do
 
   describe '#model' do
     it 'returns the model object' do
-      subject = described_class.new('Customer', model: 'User')
-      model = Katapult::Model.new('User')
+      application_model.model 'User'
 
-      application_model.add_web_ui(subject)
-      application_model.add_model(model)
+      subject = described_class.new('Customer',
+        model: 'User',
+        application_model: application_model,
+      )
 
-      expect(subject.model).to eql(model)
+      expect(subject.model).to be application_model.models.first
     end
 
     it 'detects the model from its own name, if not stated explicitly' do
-      subject = described_class.new('Customer')
-      model = Katapult::Model.new('Customer')
+      application_model.model 'Customer'
+      subject = described_class.new('Customer', application_model: application_model)
 
-      application_model.add_web_ui(subject)
-      application_model.add_model(model)
-
-      expect(subject.model).to eql(model)
-    end
-
-    it 'raises an error if it cannot find the model' do
-      subject = described_class.new('MissingModel')
-      application_model.add_web_ui(subject)
-
-      expect{ subject.model }.to raise_error(Katapult::WebUI::UnknownModelError)
-    end
-  end
-
-  describe '#render' do
-    it 'raises an error when its model does not have a label attribute' do
-      subject = described_class.new('user')
-      model = Katapult::Model.new('user')
-
-      application_model.add_web_ui(subject)
-      application_model.add_model(model)
-
-      expect{ subject.render }.to raise_error Katapult::WebUI::MissingLabelAttrError,
-        'Cannot render a WebUI without a model with a label attribute'
+      expect(subject.model).to be application_model.models.first
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapult
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dominik Schöler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -86,6 +87,7 @@ files:
 - lib/generators/katapult/basics/templates/Capfile
 - lib/generators/katapult/basics/templates/Gemfile
 - lib/generators/katapult/basics/templates/Guardfile
+- lib/generators/katapult/basics/templates/README.md.tt
 - lib/generators/katapult/basics/templates/app/controllers/errors_controller.rb
 - lib/generators/katapult/basics/templates/app/helpers/unpoly_helper.rb
 - lib/generators/katapult/basics/templates/app/views/layouts/_flashes.html.haml
@@ -189,27 +191,28 @@ files:
 - lib/generators/katapult/web_ui/templates/controller.rb
 - lib/generators/katapult/web_ui/web_ui_generator.rb
 - lib/katapult.rb
-- lib/katapult/action.rb
 - lib/katapult/application_model.rb
-- lib/katapult/attribute.rb
-- lib/katapult/authentication.rb
-- lib/katapult/binary_util.rb
 - lib/katapult/element.rb
+- lib/katapult/elements/action.rb
+- lib/katapult/elements/association.rb
+- lib/katapult/elements/attribute.rb
+- lib/katapult/elements/authentication.rb
+- lib/katapult/elements/model.rb
+- lib/katapult/elements/navigation.rb
+- lib/katapult/elements/web_ui.rb
 - lib/katapult/generator.rb
-- lib/katapult/generator_goodies.rb
-- lib/katapult/model.rb
-- lib/katapult/navigation.rb
-- lib/katapult/parser.rb
+- lib/katapult/support/binary_util.rb
+- lib/katapult/support/generator_goodies.rb
 - lib/katapult/version.rb
-- lib/katapult/web_ui.rb
 - script/console
 - script/kta
 - script/update
 - spec/action_spec.rb
+- spec/application_model_spec.rb
+- spec/association_spec.rb
 - spec/attribute_spec.rb
 - spec/element_spec.rb
 - spec/model_spec.rb
-- spec/parser_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
 - spec/web_ui_spec.rb
@@ -255,10 +258,11 @@ test_files:
 - features/support/env.rb
 - features/web_ui.feature
 - spec/action_spec.rb
+- spec/application_model_spec.rb
+- spec/association_spec.rb
 - spec/attribute_spec.rb
 - spec/element_spec.rb
 - spec/model_spec.rb
-- spec/parser_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
 - spec/web_ui_spec.rb

data/lib/katapult/model.rb

@@ -1,45 +0,0 @@
-# Models a Rails model.
-
-require 'katapult/element'
-require 'katapult/attribute'
-require 'generators/katapult/model/model_generator'
-
-module Katapult
-  class Model < Element
-
-    UnknownAttributeError = Class.new(StandardError)
-
-    attr_accessor :attrs
-
-    def initialize(*args)
-      self.attrs = []
-
-      super
-    end
-
-    def attr(attr_name, options = {})
-      attrs << Attribute.new(attr_name, options)
-    end
-
-    def label_attr
-      renderable_attrs.first
-    end
-
-    def db_fields
-      attrs.reject(&:skip_db)
-    end
-
-    def renderable_attrs
-      attrs.reject { |a| %w[plain_json json password].include? a.type.to_s }
-    end
-
-    def editable_attrs
-      attrs.reject { |a| %w[plain_json json].include? a.type.to_s }
-    end
-
-    def render
-      Generators::ModelGenerator.new(self).invoke_all
-    end
-
-  end
-end

data/lib/katapult/parser.rb

@@ -1,53 +0,0 @@
-# This class reads an application model file and turns it into an
-# ApplicationModel instance.
-
-require_relative 'application_model'
-require 'katapult/model'
-require 'katapult/web_ui'
-require 'katapult/navigation'
-require 'katapult/authentication'
-
-module Katapult
-  class Parser
-
-    def initialize
-      self.application_model = Katapult::ApplicationModel.new
-    end
-
-    def parse(application_model_string, path_to_model = '')
-      instance_eval application_model_string, path_to_model
-
-      application_model
-    end
-
-    def model(name, &block)
-      application_model.add_model Model.new(name, &block)
-    end
-
-    def web_ui(name, options = {}, &block)
-      application_model.add_web_ui WebUI.new(name, options, &block)
-    end
-
-    # A shortcut to create a #model together with a default #web_ui with CRUD
-    # actions
-    def crud(name, &block)
-      application_model.add_model Model.new(name, &block)
-      application_model.add_web_ui WebUI.new(name, &:crud)
-    end
-
-    def navigation(name = :main)
-      application_model.set_navigation Navigation.new(name)
-    end
-
-    def authenticate(name, system_email:)
-      application_model.set_authentication Authentication.new(name,
-        system_email: system_email
-      )
-    end
-
-    private
-
-    attr_accessor :application_model
-
-  end
-end

data/spec/parser_spec.rb

@@ -1,26 +0,0 @@
-require 'katapult/parser'
-
-describe Katapult::Parser do
-
-  describe '#crud' do
-    it 'creates a model plus a web UI with crud actions' do
-      model = <<-MODEL
-crud 'user' do |user|
-  user.attr :age
-end
-      MODEL
-
-      parsed_model = subject.parse(model)
-      expect(parsed_model.models.count).to be 1
-      user = parsed_model.models.first
-      expect(user.name).to eq 'user'
-      expect(user.attrs.count).to be 1
-      expect(user.attrs.first.name).to eq 'age'
-
-      expect(parsed_model.web_uis.count).to be 1
-      web_ui = parsed_model.web_uis.first
-      expect(web_ui.actions.map(&:name)).to match Katapult::WebUI::RAILS_ACTIONS
-    end
-  end
-
-end