lb-project 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43956f0e7b1f6e48a65014512abd750ad68c18318bbf3c00aa6d1d49a46a96bc
-  data.tar.gz: 40a8e5823b486781458458dd931f4669ccc722bb48a2503f9c846a700c251c50
+  metadata.gz: 5277950049547e259c4a214d9ca156e97609a8c0d0977783bd1de8f1b615cc1a
+  data.tar.gz: 292b0bedc18ac29e6df8f23428da5ec7f83d9b2e185574bfb7aae3b487627568
 SHA512:
-  metadata.gz: ec0c25e1e978a2c8b261de4ad35febecbb21165032863a597020047b0a15932e79258b83f455671f5c829923b3fafdf0d0345074c316c5b85a6298a17f192e00
-  data.tar.gz: 5bf9094b84a40341f9465fd9a777528c0a1b90f10d5215d532e1b2be2dcfde17cf7e05da585a6d2776579dc2c089497058f7e6ca7d9fb93d365117b2772da575
+  metadata.gz: 97272185aeb10d66d3b4ef61c89a05805c77667f5ad936448e1848f4735ef1232138fe3ca45c8b2954b563711b8ea6b68935be0e0412913f4e9b1b02d12e001f
+  data.tar.gz: 496cceee927c6a3d3608424064abae94c0ed105ef6fd80ac0d49d3e23aca6093f64c25cce9a5be07e6211cc9d85c4782c2067fd5c610d3d8e11606f1951dcde0

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.1

data/Gemfile

@@ -2,6 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby '2.5.0'
+ruby '2.5.1'
 
 gemspec

data/lb-project.gemspec

@@ -24,15 +24,14 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files      = %w[README.md]
   gem.required_ruby_version = '>= 2.5'
 
-  gem.add_dependency 'dry-initializer',  '~> 2.3',  '< 2.4'
-  gem.add_dependency 'dry-struct',       '~> 0.4',  '< 0.5'
-  gem.add_dependency 'dry-types',        '~> 0.12', '< 0.13'
-  gem.add_dependency 'dry-view',         '~> 0.3',  '>= 0.3.0', '< 0.3.1'
-  gem.add_dependency 'r18n-core',        '~> 2.2',  '< 2.3'
-  gem.add_dependency 'roda',             '~> 2.29', '< 2.30'
-  gem.add_dependency 'roda-i18n',        '~> 0.3', '< 0.4'
+  gem.add_dependency 'dry-initializer',  '~> 2.4'
+  gem.add_dependency 'dry-struct',       '~> 0.5'
+  gem.add_dependency 'dry-types',        '~> 0.13'
+  gem.add_dependency 'dry-view',         '~> 0.5'
+  gem.add_dependency 'roda',             '~> 3.7'
+  gem.add_dependency 'roda-i18n',        '~> 0.4'
 
-  gem.add_development_dependency 'devtools',       '~> 0.1.19'
+  gem.add_development_dependency 'devtools',       '~> 0.1.20'
   gem.add_development_dependency 'guard',          '~> 2.14'
   gem.add_development_dependency 'guard-bundler',  '~> 2.1'
   gem.add_development_dependency 'guard-rspec',    '~> 4.7', '>= 4.7.3'

data/lib/lb/project/config.rb

@@ -4,6 +4,7 @@ module LB
   module Project
     # Configuration
     class Config < Dry::Struct
+      ERROR_MSG = 'load failed: config class is not a LB::Project::Condig'
       RequiredString = Types::Strict::String.constrained(min_size: 1)
 
       attribute :base_path, Types::Strict::String
@@ -11,24 +12,17 @@ module LB
       attribute :public_path, Types::Strict::String
       attribute :template_path, Types::Strict::String
 
-      def self.load(root, name, env)
-        path = File.join(File.join(root, 'config'), "#{name}.yml")
-        yaml = File.exist?(path) ? YAML.load_file(path) : {}
+      def self.load(path, klass = LB::Project::Config)
+        raise ArgumentError, ERROR_MSG unless klass <= LB::Project::Config
 
-        new(config(yaml, env))
-      end
+        raise ArgumentError, not_found_msg(path) unless File.exist?(path)
 
-      def self.config(yaml, env)
-        schema.keys.each_with_object({}) do |key, memo|
-          memo[key] = value_for(yaml, env, key)
-        end
+        yaml = YAML.load_file(path)
+        klass.new(yaml.transform_keys!(&:to_sym))
       end
 
-      def self.value_for(yaml, env, key)
-        ENV.fetch(
-          key.to_s.upcase,
-          yaml.fetch(env.to_s, {})[key.to_s]
-        )
+      def self.not_found_msg(path)
+        "load failed: config file '#{path}' does not exist!"
       end
     end
   end

data/lib/lb/project/settings.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LB
+  module Project
+    # Settings supplied to LB::Project.setup
+    class Settings < Dry::Struct
+      attribute :root, Types::Strict::String
+      attribute :config, LB::Project::Config
+    end
+  end
+end

data/lib/lb/project/version.rb

@@ -3,6 +3,6 @@
 module LB
   module Project
     # Version
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

data/lib/lb/project.rb

@@ -24,24 +24,29 @@ require 'lb/project/types'
 
 # Config
 require 'lb/project/config'
+require 'lb/project/settings'
 
 # LB namespace
 module LB
   # Project
   module Project
-    CONFIG_NAME = 'application'
-    DEFAULT_RACK_ENV = 'development'
+    ERROR_MSG = 'Setup failed: settings is not a LB::Project::Settings'
 
     # Setup
     #
-    # @param [File] root Path to project root
+    # @param [settings] project settings
     #
     # @return [self]
     #
     # @api private
     #
-    def self.setup(root)
-      @root = root
+    def self.setup(settings)
+      unless settings.is_a?(LB::Project::Settings)
+        raise ArgumentError,
+              ERROR_MSG
+      end
+
+      @settings = settings
 
       self
     end
@@ -53,7 +58,9 @@ module LB
     # @api private
     #
     def self.root
-      @root
+      @settings.root
+    rescue NoMethodError
+      raise ArgumentError, 'Call LB::Project.setup(...) first!'
     end
 
     # Get root path for file
@@ -99,27 +106,9 @@ module LB
     # @api private
     #
     def self.config
-      @config ||= Config.load(root, CONFIG_NAME, rack_env)
-    end
-
-    # Get RACK_ENV
-    #
-    # @return [String]
-    #
-    # @api private
-    #
-    def self.rack_env
-      @rack_env ||= ENV.fetch('RACK_ENV', DEFAULT_RACK_ENV)
-    end
-
-    # Check if rack_env is 'development'
-    #
-    # @return [Boolean]
-    #
-    # @api private
-    #
-    def self.development?
-      DEFAULT_RACK_ENV.eql? rack_env
+      @settings.config
+    rescue NoMethodError
+      raise ArgumentError, 'Call LB::Project.setup(...) first!'
     end
 
     def self.t(*params)

data/spec/fixtures/config/application.yml

@@ -1,10 +1,4 @@
-development: &base
-  base_path : ''
-  image_base_path: 'assets/images'
-  public_path: 'docs'
-  template_path: 'templates'
-test:
-  <<: *base
-production:
-  <<: *base
-  public_path: 'htdocs'
+base_path : ''
+image_base_path: 'assets/images'
+public_path: 'docs'
+template_path: 'templates'

data/spec/shared/setup.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+shared_context 'setup' do
+  let(:lb_root) { object.root_for(__FILE__, 3) }
+
+  let(:root) { File.join(lb_root, 'spec/fixtures') }
+
+  let(:config_file) { File.join(root, 'config/application.yml') }
+
+  let(:config) { LB::Project::Config.load(config_file) }
+
+  let(:settings) do
+    LB::Project::Settings.new(
+      root: root,
+      config: config
+    )
+  end
+
+  before(:each) do
+    object.setup(settings)
+  end
+
+  after(:each) do
+    if object.instance_variable_defined?(:@settings)
+      object.remove_instance_variable(:@settings)
+    end
+  end
+end

data/spec/unit/lb/project/class_methods/config_spec.rb

@@ -7,51 +7,18 @@ describe LB::Project, '.config' do
 
   let(:object) { described_class }
 
-  let(:default_hash) do
-    {
-      base_path: '',
-      image_base_path: 'assets/images',
-      public_path: 'docs',
-      template_path: 'templates'
-    }
-  end
-
-  let(:default) { LB::Project::Config.new(default_hash) }
-
-  let(:env) { 'RACK_ENV' }
-
-  before(:each) do
-    root = LB::Project.root_for(__FILE__, 6)
-    LB::Project.setup(File.join(root, 'spec/fixtures'))
-  end
-
-  after(:each) do
-    object.remove_instance_variable(:@rack_env)
-    object.remove_instance_variable(:@config)
-    object.remove_instance_variable(:@root)
-  end
-
-  context 'without RACK_ENV' do
-    it 'should return default config' do
-      expect(subject).to eql(default)
+  context 'without setup' do
+    it 'should raise argument error' do
+      expect { subject }.to raise_error ArgumentError,
+                                        'Call LB::Project.setup(...) first!'
     end
   end
 
-  context 'with RACK_ENV=production' do
-    let(:production_hash) { default_hash.merge(public_path: 'htdocs') }
-    let(:production) { LB::Project::Config.new(production_hash) }
-    let(:rack_env) { 'production' }
-
-    before(:each) do
-      ENV[env] = rack_env
-    end
-
-    after(:each) do
-      ENV.delete(env)
-    end
+  context 'without setup' do
+    include_context 'setup'
 
-    it 'should return production config' do
-      expect(subject).to eql(production)
+    it 'should return config' do
+      expect(subject).to be config
     end
   end
 end

data/spec/unit/lb/project/class_methods/root_spec.rb

@@ -8,23 +8,16 @@ describe LB::Project, '.root' do
   let(:object) { described_class }
 
   context 'without setup' do
-    it 'should return nil' do
-      expect(subject).to be_nil
+    it 'should raise argument error' do
+      expect { subject }.to raise_error ArgumentError,
+                                        'Call LB::Project.setup(...) first!'
     end
   end
 
   context 'without setup' do
-    let(:root) { double(:root) }
+    include_context 'setup'
 
-    before(:each) do
-      object.setup(root)
-    end
-
-    after(:each) do
-      object.remove_instance_variable(:@root)
-    end
-
-    it 'should return nil' do
+    it 'should return root' do
       expect(subject).to be(root)
     end
   end

data/spec/unit/lb/project/class_methods/setup_spec.rb

@@ -3,14 +3,11 @@
 require 'spec_helper'
 
 describe LB::Project, '.setup' do
-  subject { object.setup(root) }
+  include_context 'setup'
 
-  let(:root)   { double(:root) }
-  let(:object) { described_class }
+  subject { object.setup(settings) }
 
-  after(:each) do
-    object.remove_instance_variable(:@root)
-  end
+  let(:object) { described_class }
 
   it 'should return self' do
     expect(subject).to eql(object)

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: lb-project
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Firas Zaidan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
@@ -35,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
@@ -45,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
@@ -55,9 +43,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
@@ -65,9 +50,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
@@ -76,74 +58,33 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: r18n-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.29'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.29'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: roda-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
@@ -151,9 +92,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
@@ -162,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.20
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +234,7 @@ files:
 - lib/lb/project/registry/registration.rb
 - lib/lb/project/render.rb
 - lib/lb/project/route.rb
+- lib/lb/project/settings.rb
 - lib/lb/project/site.rb
 - lib/lb/project/types.rb
 - lib/lb/project/version.rb
@@ -314,12 +253,11 @@ files:
 - spec/fixtures/templates/index.html.slim
 - spec/fixtures/templates/layouts/main.html.slim
 - spec/fixtures/webpack-assets.json
+- spec/shared/setup.rb
 - spec/spec_helper.rb
 - spec/support/helper.rb
 - spec/unit/lb/project/class_methods/config_spec.rb
-- spec/unit/lb/project/class_methods/development_quest_spec.rb
 - spec/unit/lb/project/class_methods/logger_spec.rb
-- spec/unit/lb/project/class_methods/rack_env_spec.rb
 - spec/unit/lb/project/class_methods/root_for_spec.rb
 - spec/unit/lb/project/class_methods/root_spec.rb
 - spec/unit/lb/project/class_methods/setup_spec.rb
@@ -344,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Static site builder with easy migration to dynamic site
@@ -362,12 +300,11 @@ test_files:
 - spec/fixtures/templates/index.html.slim
 - spec/fixtures/templates/layouts/main.html.slim
 - spec/fixtures/webpack-assets.json
+- spec/shared/setup.rb
 - spec/spec_helper.rb
 - spec/support/helper.rb
 - spec/unit/lb/project/class_methods/config_spec.rb
-- spec/unit/lb/project/class_methods/development_quest_spec.rb
 - spec/unit/lb/project/class_methods/logger_spec.rb
-- spec/unit/lb/project/class_methods/rack_env_spec.rb
 - spec/unit/lb/project/class_methods/root_for_spec.rb
 - spec/unit/lb/project/class_methods/root_spec.rb
 - spec/unit/lb/project/class_methods/setup_spec.rb

data/spec/unit/lb/project/class_methods/development_quest_spec.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe LB::Project, '.development?' do
-  subject { object.development? }
-
-  let(:object) { described_class }
-
-  let(:default) { 'development' }
-
-  let(:env) { 'RACK_ENV' }
-
-  after(:each) do
-    object.remove_instance_variable(:@rack_env)
-  end
-
-  context 'without RACK_ENV' do
-    it 'should return true' do
-      expect(subject).to be true
-    end
-  end
-
-  context 'with RACK_ENV=production' do
-    let(:rack_env) { 'production' }
-
-    before(:each) do
-      ENV[env] = rack_env
-    end
-
-    after(:each) do
-      ENV.delete(env)
-    end
-
-    it 'should return false' do
-      expect(subject).to be false
-    end
-  end
-end

data/spec/unit/lb/project/class_methods/rack_env_spec.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe LB::Project, '.rack_env' do
-  subject { object.rack_env }
-
-  let(:object) { described_class }
-
-  let(:default) { 'development' }
-
-  let(:env) { 'RACK_ENV' }
-
-  after(:each) do
-    object.remove_instance_variable(:@rack_env)
-  end
-
-  context 'without RACK_ENV' do
-    it 'should return default RACK_ENV' do
-      expect(subject).to eql(default)
-    end
-  end
-
-  context 'with RACK_ENV=production' do
-    let(:rack_env) { 'production' }
-
-    before(:each) do
-      ENV[env] = rack_env
-    end
-
-    after(:each) do
-      ENV.delete(env)
-    end
-
-    it 'should return production' do
-      expect(subject).to eql(rack_env)
-    end
-  end
-end