inline_forms 3.0.3 → 3.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzYyMzA0NWNkNmJhZWQyODgwNDYxZGEwMDhkOWIwN2E2YTdhMmUyZg==
+    Y2MzNGJhOGUyNzAzZTc2OGMzZDk1YWIyNmJlMDFkNzAxYmY3MjRmMw==
   data.tar.gz: !binary |-
-    Njc5ODMyZTk2ZWFiNjZkM2MxNDMwZGM0MTRlMGNkZjVhZGM0ZWM1YQ==
+    NjY3Nzk2NjE0ZDdmYWE5Zjg0NmJmZGE3Njc0YmIxZWMxN2RkOTA2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGU0NDU1MzlhNjdjZThkODRmNmY1MzE5OTc5NDVmNmZjYTVjYzgyYTgyZGZh
-    YmU2MzBkYjhhYmY4NjhjNWM2ZGJhMGRhZTQ3MGZhYzQ3MjM2MWJlMjJhOTYy
-    ODIwODljZWM2MTEwZTI1NTEzNGVmMmVmOTIzYjIyMmZmZjYwOGI=
+    YjYzZjFlN2RmNDRmZWMyNDdlMzQyNDY2MDJlYzlkMTI1MzI0NTNmYzQ2ZjVi
+    OWJkYmVjNTViMzNhODlmYTZiNDBiNWRhMzI2MzVkYWZmNDc2MTM5MDVlZTk5
+    ZmY0YjMwZjRhMzdiOTJmOTUyNWU4NWEyNjg1OGQxM2QzM2RhZTQ=
   data.tar.gz: !binary |-
-    MmVjMmZmZjZkZWQwZTZiM2Q3ZWU1OTkzNzEwNGQ3ODc1YmM4OTU1YmJlYzFk
-    MTA3Nzg2ZjAxNzlhZDkwYTc2NGExNmI2ZGVjYzMyMjIyMGRmNTBkZjg5ODBh
-    ZmY3Mjk2MjVhNTAwYjViOGI0YjE4OGU5NDRjZGIxYzUwMTY0MGM=
+    ZTc1NWVlYzYyYmU0ZmRlMDc3NWUzNjhjZDkyYmRjMTMzMzkzNTM5M2VjYjlm
+    MjM3MDM3ZjY0ZDJlOWFmY2M1M2MwNGIyOGFjYzAyY2VlZTMwOTkxNzU3YjQ0
+    NWIxMTI2MjdhN2Q5NDc5MjkyMTVmOGYxMDYxODU4NzE5NWVhZjY=

data/bin/inline_forms_installer_core.rb

@@ -93,7 +93,7 @@ run "bundle exec rails g devise:install"
 # TODO ROYTJE Devise creates a model. That is a migration, a test, a route and a model. We delete the model, the route, and the test probably too. Is there another way to just create the migration instead of all the stuff that we are going to delete anyway !?
 
 say "- Devise User model install with added name and locale field..."
-run "bundle exec rails g devise User name:string locale:string"
+run "bundle exec rails g devise User name:string locale_id:integer"
 
 say "- Replace Devise route and add path_prefix..."
 gsub_file "config/routes.rb", /devise_for :users/, "devise_for :users, :path_prefix => 'auth'"
@@ -129,12 +129,17 @@ create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
     # devise :omniauthable
 
     # Setup accessible (or protected) attributes for your model
-    attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :locale
     attr_writer :inline_forms_attribute_list
+    attr_accessible :email, :password, :locale, :remember_me
 
+    belongs_to :locale
+    has_and_belongs_to_many :roles
+    
     # validations
     validates :name, :presence => true
 
+    default_scope order :name
+
     # pagination
     attr_reader :per_page
     @per_page = 7
@@ -145,22 +150,31 @@ create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
       "\#{name}"
     end
 
+    def role?(role)
+      return !!self.roles.find_by_name(role)
+    end
+
     def inline_forms_attribute_list
       @inline_forms_attribute_list ||= [
-        [ :name , 'name', :text_field ],
-        [ :email , 'email', :text_field ],
-        [ :password , 'Nieuw wachtwoord', :devise_password_field ],
-        [ :encrypted_password , 'encrypted_password', :info ],
-        [ :reset_password_token , 'reset_password_token', :info ],
-        [ :reset_password_sent_at , 'reset_password_sent_at', :info],
-        [ :remember_created_at , 'remember_created_at', :info ],
-        [ :sign_in_count , 'sign_in_count', :info ],
-        [ :current_sign_in_at , 'current_sign_in_at', :info ],
-        [ :last_sign_in_at , 'last_sign_in_at', :info ],
-        [ :current_sign_in_ip , 'current_sign_in_ip', :info ],
-        [ :last_sign_in_ip , 'last_sign_in_ip', :info ],
-        [ :created_at , 'created_at', :info ],
-        [ :updated_at , 'updated_at', :info ],
+        [ :header_user_login,         '', :header ],
+        [ :name,                      '', :text_field ],
+        [ :email,                     '', :text_field ],
+        [ :locale ,                   '', :dropdown ],
+        [ :password,                  '', :devise_password_field ],
+        [ :header_user_roles,         '', :header ],
+        [ :roles,                     '', :check_list ],
+        [ :header_user_other_stuff,   '', :header ],
+        [ :encrypted_password,        '', :info ],
+        [ :reset_password_token,      '', :info ],
+        [ :reset_password_sent_at,    '', :info],
+        [ :remember_created_at,       '', :info ],
+        [ :sign_in_count,             '', :info ],
+        [ :current_sign_in_at,        '', :info ],
+        [ :last_sign_in_at,           '', :info ],
+        [ :current_sign_in_ip,        '', :info ],
+        [ :last_sign_in_ip,           '', :info ],
+        [ :created_at,                '', :info ],
+        [ :updated_at,                '', :info ],
       ]
     end
 
@@ -169,14 +183,46 @@ create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
     end
 
     def self.order_by_clause
-      'name'
+      nil
     end
 
   end
 USER_MODEL
 
-# TODO ROYTJE This above is all that: Devise creates a model. That is a migration, a test, a route and a model. We delete the model, the route, and the test probably too. Is there another way to just create the migration instead of all the stuff that we are going to delete anyway !?
+say "- Adding admin user with email: #{ENV['email']}, password: #{ENV['password']} to seeds.rb"
+append_to_file "db/seeds.rb", "User.create({ id: 1, email: '#{ENV['email']}', locale_id: 1, name: 'Admin', password: '#{ENV['password']}', password_confirmation: '#{ENV['password']}' }, without_protection: true)\n"
+
+# Create Locales
+say "- Create locales"
+generate "inline_forms", "Locale name:string title:string users:has_many _enabled:yes _presentation:\#{title}"
+append_to_file "db/seeds.rb", "Locale.create({ id: 1, name: 'en', title: 'English' }, without_protection: true)\n"
+
+# Create Roles
+say "- Create roles"
+generate "inline_forms", "Role name:string description:text users:has_and_belongs_to_many _enabled:yes _presentation:\#{name}"
+sleep 1 # to get unique migration number
+create_file "db/migrate/" + 
+  Time.now.utc.strftime("%Y%m%d%H%M%S") +
+  "_" +
+  "inline_forms_create_join_table_user_role.rb", <<-ROLES_MIGRATION.strip_heredoc
+  class InlineFormsCreateJoinTableUserRole < ActiveRecord::Migration
+    def self.up
+      create_table  :roles_users, :id => false, :force => true do |t|
+        t.integer   :role_id
+        t.integer   :user_id
+      end
+      execute 'INSERT INTO roles_users VALUES (1,1);'
+    end
+    
+    def self.down
+      drop_table roles_users
+    end
+  end
+ROLES_MIGRATION
+
+append_to_file "db/seeds.rb", "Role.create({ id: 1, name: 'superadmin', description: 'Super Admin can access all.' }, without_protection: true)\n"
 
+# TODO ROYTJE This above is all that: Devise creates a model. That is a migration, a test, a route and a model. We delete the model, the route, and the test probably too. Is there another way to just create the migration instead of all the stuff that we are going to delete anyway !?
 
 say "- Install ckeditor..."
 generate "ckeditor:install --backend=carrierwave"
@@ -190,8 +236,6 @@ route "mount Ckeditor::Engine => '/ckeditor'"
 say "- Add ckeditor autoload_paths to application.rb..."
 application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)" # TODO ROYTJE is this still needed?
 
-
-
 say "- Add ckeditor/init to application.js..."
 insert_into_file "app/assets/javascripts/application.js",
                  "//= require ckeditor/init\n",
@@ -209,6 +253,7 @@ generate "paper_trail:install" # TODO One day, we need some management tools so
 say "- Installaing ZURB Foundation..."
 generate "foundation:install", "-f"
 
+# Create Translations
 say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps 
 generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"
 generate "inline_forms", "InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\#{name}"
@@ -236,11 +281,11 @@ create_file "db/migrate/" +
   end
 VIEW_MIGRATION
 
+
 say "- Migrating Database (only when using sqlite)"
 run "bundle exec rake db:migrate" if ENV['using_sqlite'] == 'true'
 
-say "- Adding admin user with email: #{ENV['email']}, password: #{ENV['password']} to seeds.rb"
-append_to_file "db/seeds.rb", "User.create({ :email => '#{ENV['email']}', :name => 'Admin', :password => '#{ENV['password']}', :password_confirmation => '#{ENV['password']}'}, :without_protection => true)"
+
 
 say "- Seeding the database (only when using sqlite)"
 run "bundle exec rake db:seed" if ENV['using_sqlite'] == 'true'
@@ -313,7 +358,7 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
   end
 END_APPCONTROLLER
 
-say "- Creating Ability model so that the user with id = 1 can access all..."
+say "- Creating Ability model so that the superadmin can access all..."
 create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
   class Ability
     include CanCan::Ability
@@ -323,7 +368,10 @@ create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
 
       user ||= user.new # guest user
 
-      if user.id == 1 #quick hack
+      # use this if you get stuck:
+      # if user.id == 1 #quick hack
+      #   can :access, :all
+      if user.role? :superadmin
         can :access, :all
       else
         # put restrictions for other users here

data/lib/app/views/layouts/devise.html.erb

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,400italic' rel='stylesheet' type='text/css' />
-    <title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
+    <title><%= application_title + " v" + InlineForms::VERSION -%></title>
 
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
@@ -13,21 +13,29 @@
 
   <body>
 
-    <div id="devise-header"class="row">
-      <div class="small-6 small-centered columns">
-        <%= image_tag 'devise_header.png' %>
-      </div>
-    </div>
+    <div id="devise_outer_container">
 
+      <div class="row contain-to-grid">
+        <nav id='devise_top_bar' class="top-bar" data-topbar>
+          <ul class="title-area">
+            <li class="name">
+              <h1><a href="/"><%= application_name %> v<%= inline_forms_version %></a></h1>
+            </li>
+            <li class="toggle-topbar menu-icon">
+              <a href="#"><span></span></a>
+            </li>
+          </ul>
+          <section class="top-bar-section">
+            <ul class="right">
+            </ul>
+          </section>
+        </nav>
+      </div>
+<% flash.each do |name, msg| %>
+    <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash row" %>
+<% end %>
     <%= yield %>
 
-    <div id="devise-footer" class="row">
-      <div class="small-6 columns">
-        <%= image_tag 'devise_footer_left.png' %>
-      </div>
-      <div class="small-6 columns">
-        <%= image_tag 'devise_footer_right.png' %>
-      </div>
     </div>
 
     <%= javascript_include_tag "application" %>

data/lib/inline_forms/version.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Ace Suares