ditty 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5927a508f91c400cfa56e92e918bc39e528e9239
-  data.tar.gz: cd6c64af45510a51eeb1a809db67b89879064d17
+  metadata.gz: 4e117d869f435ccaf97c5e0ed465a2464695d0e1
+  data.tar.gz: 0eaa19a3ed0647b95abf5593ca4a89a98f043e5e
 SHA512:
-  metadata.gz: a224e0050344d3f2e1f8f7b2c0706de89f49aa642dfaeb999218ee871d70f11f73f4013207d71a3dcaf1561f3f13a525003c742b092abb037679a0d1cdd75729
-  data.tar.gz: f470a2c66fda01a16c2b67b7e058efbd858cf387f69846e8ac7ba03a6ff6ed98b115e2548b07198793ad8d56823a136aea6076a6e7539a12a4da2c6514507ba0
+  metadata.gz: dfe1b8c443b4ae745c8e45c9e660c6819f49d9af0062f486f3c5d24d4f9f2383a52cde548c3dfc6c6f4a2406d21b680af6abba5d85e35120ff9675c8eb087215
+  data.tar.gz: 076b68ddde52ccdede169bdf493aa63adb1ea28ffcec0f764791e460e4e3e744e382af61d950b0d6b624ef55e9b425a13d9817af3b5b292472dd98f8bc9afd6b

data/.travis.yml

@@ -7,7 +7,10 @@ rvm:
 gemfile: Gemfile.ci
 env:
   - DATABASE_URL="sqlite::memory:" RACK_ENV=test
-before_install: gem install bundler -v 1.12.5
+before_install:
+  - gem install bundler -v 1.12.5
+before_script:
+  - bundle exec rake ditty:prep
 addons:
   code_climate:
     repo_token: 289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35

data/Rakefile

@@ -5,6 +5,9 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'ditty/rake_tasks'
 
+require 'ditty'
+require 'ditty/components/app'
+
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/ditty.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Sinatra Based Application Framework'
   spec.description   = 'Sinatra Based Application Framework'
   spec.homepage      = 'https://github.com/eagerelk/ditty'
-  spec.license       = 'LGPLv3'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'

data/lib/ditty.rb

@@ -67,45 +67,38 @@ module Ditty
 
     # Return a hash of controllers with their routes as keys: `{ '/users' => Ditty::Controllers::Users }`
     def self.routes
-      @routes ||= {}
-    end
-
-    def self.routes=(routes)
-      @routes = routes
+      components.inject({}) do |memo, comp|
+        memo.merge! comp[1].routes if comp[1].respond_to?(:routes)
+        memo
+      end.compact
     end
 
     # Return an ordered list of navigation items:
     # `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
     def self.navigation
-      @navigation ||= []
-    end
-
-    def self.navigation=(navigation)
-      @navigation = navigation
+      components.inject([]) do |memo, comp|
+        memo.concat comp[1].navigation if comp[1].respond_to?(:navigation)
+        memo
+      end
     end
 
     def self.migrations
-      @migrations ||= []
-    end
-
-    def self.migrations=(migrations)
-      @migrations = migrations
+      components.map do |_name, comp|
+        comp.migrations if comp.respond_to?(:migrations)
+      end.compact
     end
 
     def self.seeders
-      @seeders ||= []
-    end
-
-    def self.seeders=(seeders)
-      @seeders = seeders
+      components.map do |_name, comp|
+        comp.seeder if comp.respond_to?(:seeder)
+      end.compact
     end
 
     def self.workers
-      @workers ||= []
-    end
-
-    def self.workers=(workers)
-      @workers = workers
+      components.inject([]) do |memo, comp|
+        memo.concat comp.workers if comp.respond_to?(:workers)
+        memo
+      end
     end
 
     module Base
@@ -123,11 +116,6 @@ module Ditty
           extend(component::ClassMethods) if defined?(component::ClassMethods)
 
           component.configure(self, *args, &block) if component.respond_to?(:configure)
-          Components.navigation.concat component.navigation if component.respond_to?(:navigation)
-          Components.routes.merge! component.routes if component.respond_to?(:routes)
-          Components.migrations << component.migrations if component.respond_to?(:migrations)
-          Components.seeders << component.seeder if component.respond_to?(:seeder)
-          Components.workers.concat component.workers if component.respond_to?(:workers)
           nil
         end
       end

data/lib/ditty/components/app.rb

@@ -4,7 +4,10 @@ require 'ditty'
 
 module Ditty
   class App
-    def self.load_models
+    def self.load
+      controllers = File.expand_path('../../controllers', __FILE__)
+      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+
       require 'ditty/models/user'
       require 'ditty/models/role'
       require 'ditty/models/identity'
@@ -25,8 +28,7 @@ module Ditty
     end
 
     def self.routes
-      controllers = File.expand_path('../../controllers', __FILE__)
-      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+      load
       {
         '/' => ::Ditty::Main,
         '/users' => ::Ditty::Users,
@@ -36,7 +38,7 @@ module Ditty
     end
 
     def self.navigation
-      load_models
+      load
 
       [
         {
@@ -54,7 +56,7 @@ module Ditty
 
     def self.seeder
       proc do
-        load_models
+        load
 
         ::Ditty::Role.find_or_create(name: 'super_admin')
         ::Ditty::Role.find_or_create(name: 'admin')

data/lib/ditty/models/audit_log.rb

@@ -3,7 +3,7 @@
 require 'ditty/models/base'
 
 module Ditty
-  class AuditLog < Sequel::Model
+  class AuditLog < ::Sequel::Model
     include ::Ditty::Base
     many_to_one :user
 

data/lib/ditty/models/base.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 module Ditty
   module Base
     def for_json

data/lib/ditty/models/identity.rb

@@ -7,7 +7,7 @@ require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 module Ditty
-  class Identity < Sequel::Model
+  class Identity < ::Sequel::Model
     include ::Ditty::Base
     many_to_one :user
 

data/lib/ditty/models/role.rb

@@ -3,7 +3,7 @@
 require 'ditty/models/base'
 
 module Ditty
-  class Role < Sequel::Model
+  class Role < ::Sequel::Model
     include ::Ditty::Base
 
     many_to_many :users

data/lib/ditty/models/user.rb

@@ -7,7 +7,7 @@ require 'active_support/core_ext/object/blank'
 
 # Why not store this in Elasticsearch?
 module Ditty
-  class User < Sequel::Model
+  class User < ::Sequel::Model
     include ::Ditty::Base
 
     one_to_many :identity

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -406,7 +406,7 @@ files:
 - views/users/user.haml
 homepage: https://github.com/eagerelk/ditty
 licenses:
-- LGPLv3
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -424,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework