tomify 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ba24b3cdc468605a4d113808ee72ac23812cf9
-  data.tar.gz: a4ed234c634ccc1816731bf8a5695af923ecd3b8
+  metadata.gz: c2d0a5f91a0962812c61a3b7f66a1fd034c8750b
+  data.tar.gz: 30dbe54efd78321b91cb16a41fe48fcf15b2692a
 SHA512:
-  metadata.gz: ce223cce5bebd42a784882d70b2c31ff87581f001631b9dfe8430359904bd6a2664d16e9ad972be32ca8efb859b2a9ca33f459f41c5223779cc154673db4b270
-  data.tar.gz: 90ec220529907ec3249cfe4563352dc9a2458f490cf2f135cf7b6f6f93f3d140b000e64a36b0e9b82e29a7338c48e4342ebc276b4d7af74757e89624a26c7a07
+  metadata.gz: f57feac1ed194f776c2e0badc337ef50d7e7738b1611e22012ef6769161da150dd67ea244e37e2a00a6c44d7c6d92290cb7ca8b239131f9f74eb6f8725443a65
+  data.tar.gz: 3ab0aa47ba4bf03d0dcc7eab29f5931bd20cccf4babfa46268188f90bdb3907d1f9f9c3ba01316e02973e82576ef07946e4264b94b5e174e942f988aee0f5dd7

data/app/assets/javascripts/tomify/dynamic/react/components/admin/settings.coffee

@@ -1,6 +1,7 @@
 model = Model.findOrCreate "Admin.Setting"
 model.columns = [
   { name: "name" },
+  { name: "public", value: (r) -> if r.public then "Yes" else "No" },
   { name: "type", value: (r) -> r.type.split("::").last },
   { name: "value", value: (r) ->
     type = r.type.split("::").last
@@ -17,10 +18,12 @@ options = ({ name: option, value: "Tomify::Setting::#{option}" } for option in o
 
 newForm = new Form("horizontal")
 newForm.add "type", "select", options: options
+newForm.add "public", "checkbox"
 newForm.add "name", "text"
 newForm.add "value", "text"
 
 editForm = new Form("horizontal")
+editForm.add "public", "checkbox"
 editForm.add "name", "text"
 editForm.add "value", "text"
 

data/app/models/tomify/concerns/page.rb

@@ -2,9 +2,9 @@ module Tomify::Concerns::Page
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :sidebar, class_name: Tomify.models.sidebar
-    belongs_to :parent, class_name: self
-    has_many :children, class_name: self, foreign_key: :parent_id
+    belongs_to :sidebar, class_name: Tomify.models.sidebar.to_s, optional: true
+    belongs_to :parent, class_name: self.to_s, optional: true
+    has_many :children, class_name: self.to_s, foreign_key: :parent_id
 
     before_validation :format_path
     before_validation :require_root, if: :root_changed?

data/app/models/tomify/concerns/sidebar.rb

@@ -2,7 +2,7 @@ module Tomify::Concerns::Sidebar
   extend ActiveSupport::Concern
 
   included do
-    has_many :pages, class_name: Tomify.models.page
+    has_many :pages, class_name: Tomify.models.page.to_s
     validates_presence_of :name
 
     scope :active, -> { where(active: true) }

data/app/models/tomify/concerns/token.rb

@@ -2,7 +2,7 @@ module Tomify::Concerns::Token
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :user, class_name: Tomify.models.user
+    belongs_to :user, class_name: Tomify.models.user.to_s
 
     before_create :create_uuid
 

data/app/models/tomify/concerns/user.rb

@@ -3,7 +3,7 @@ module Tomify::Concerns::User
 
   included do
     has_secure_password validations: false
-    has_many :tokens, class_name: Tomify.models.token, dependent: :destroy
+    has_many :tokens, class_name: Tomify.models.token.to_s, dependent: :destroy
 
     before_validation :format_email
     after_create :send_invite, if: :invited

data/app/models/tomify/setting.rb

@@ -4,6 +4,7 @@ class Tomify::Setting < Tomify.models.base
   validates_format_of :name, with: /\A[a-z_]+\z/, message: "can only contain lowercase letters and underscores"
   validate :type_valid?, on: :update
   validate :name_valid?, on: :update
+  validate :public_valid?, on: :update
 
   after_commit :update_config
   before_destroy { |record| !record.name.in? self.class.required_settings }
@@ -13,11 +14,11 @@ class Tomify::Setting < Tomify.models.base
   end
 
   def self.required_settings
-    ["allow_signup", "name", "email", "timezone"]
+    ["allow_signup", "aws", "name", "email", "timezone"]
   end
 
   def self.admin_params
-    [:type, :name, :value, :json]
+    [:type, :name, :public, :value, :json]
   end
 
   def serializable_hash(options = nil)
@@ -35,6 +36,11 @@ class Tomify::Setting < Tomify.models.base
     errors.add(:name, "cannot change if required") if name_changed?
   end
 
+  def public_valid?
+    return true unless name_was.in? self.class.required_settings
+    errors.add(:public, "cannot change if required") if public_changed?
+  end
+
   def update_config
     case name
     when "aws"

data/app/views/tomify/defaults/_env.haml

@@ -1,2 +1,2 @@
 :javascript
-  window.env = #{js_env.to_json}
+  window.env = #{js_env.to_json.html_safe}

data/app/views/tomify/layouts/mailer.haml

@@ -6,4 +6,4 @@
     %meta(name="viewport" content="width=device-width, initial-scale=1")
   %body
     = yield
-    = render "mailers/partials/unsubscribe"
+    = render "partials/unsubscribe"

data/app/views/tomify/mailers/user_mailer/invite.haml

@@ -6,4 +6,4 @@
     Click #{link_to "here", profile_url(token: @user.token(:email), from: :email)}
     to join!
   = image_tag "gifs/wind.gif"
-  = render "mailers/partials/signature"
+  = render "partials/signature"

data/app/views/tomify/mailers/user_mailer/reset_password.haml

@@ -11,4 +11,4 @@
   %p
     Guess you can update it
     = link_to "here", profile_url(token: @user.token(:email), from: :email)
-  = render "mailers/partials/signature"
+  = render "partials/signature"

data/app/views/tomify/mailers/user_mailer/welcome.haml

@@ -6,4 +6,4 @@
     Click #{link_to "here", root_url(token: @user.token(:email), from: :email)}
     to come back home!
   = image_tag "gifs/wind.gif"
-  = render "mailers/partials/signature"
+  = render "partials/signature"

data/db/seeds.rb

@@ -2,17 +2,6 @@ def debug(record)
   puts record.errors.full_messages unless record.valid?
 end
 
-if Tomify.models.user.count.zero?
-  puts "Creating Default Users"
-  debug Tomify.models.user.create(
-    admin: true,
-    email: "tom@tomify.me",
-    first_name: "Tom",
-    last_name: "Prats",
-    password: "password"
-  )
-end
-
 if Tomify.models.setting.count.zero?
   puts "Creating Default Settings"
   debug Tomify::Setting::Text.create(name: "name", value: "Tomify", public: true)
@@ -30,6 +19,17 @@ if Tomify.models.setting.count.zero?
   })
 end
 
+if Tomify.models.user.count.zero?
+  puts "Creating Default Users"
+  debug Tomify.models.user.create(
+    admin: true,
+    email: "tom@tomify.me",
+    first_name: "Tom",
+    last_name: "Prats",
+    password: "password"
+  )
+end
+
 if Tomify.models.page.count.zero?
   puts "Creating Default Pages"
   debug Tomify.models.page.create(

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tom Prats
@@ -16,224 +16,224 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: jquery-turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sprockets-cjsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: Provides support for paradigms commonly used in Tomify Applications
 email:
 - tom@tomify.me