active_leonardo 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98288c6c808eb562a554c00073aeb8aede9f0427
-  data.tar.gz: 686b0fa1d863a8f53ab72f041899cead31ae1e6f
+  metadata.gz: 0a95d6f8f285ff673d7210ece18e806a08e93dce
+  data.tar.gz: be62c05e2d2222fd63c695fa89b188530a9225b7
 SHA512:
-  metadata.gz: 1f3e59d5d42eb1ebad1eae04837940bd63a47d51107052653962dea613c0d19550c38c554cc6754651aa9ed1e08fe4ff40acb06d53e11b2fcb6e95c03f14245b
-  data.tar.gz: 8b5c79a497b344cd9da8c2fc230e6e740370bdc63f025addc45f513a8ec22adb76eae91736a4598b7518adc9b7506798a95572db6b794ff5517cfde32f744a40
+  metadata.gz: abf9576b59b62be6af00766ed82358f5bd235962f42b2fb5fd8617fd4ffa9bc692b56c8bb815709765ab2bde85d9c4f4cf2a745a84e05ceab9688e8a42b6d9eb
+  data.tar.gz: 1307a773a364a0d9878c148ce76a1dcfed8fa41b08e2fb0207db35c71c3242a1358a35f34ebf7f4cdd97a09684d1186158d370dc0a8ce8d5c60b6a34d7597c9d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.9.0 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.8.1...v0.9.0) March 1th, 2016
+------------------------------
+* Different style for production env
+* Improved email to name in the user model
+* User.with_role(:role) now works on rails 4+
+
 0.8.1 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.8.0...v0.8.1) February 18th, 2016
 ------------------------------
 * Improved the documentation

data/lib/generators/leolay/leolay_generator.rb

@@ -18,9 +18,9 @@ class LeolayGenerator < Rails::Generators::Base
   class_option :verbose,        :type => :boolean,  :default => true,   :desc => "Run interactive mode"
 
   def generate_layout
-    template "styles/#{style_name}/stylesheets/app/stylesheet.scss",          "app/assets/stylesheets/#{style_name}.scss"
-    template "styles/#{style_name}/stylesheets/app/custom_active_admin.scss", "app/assets/stylesheets/custom_active_admin.scss"
-    template "styles/#{style_name}/stylesheets/app/_enviroment.scss",         "app/assets/stylesheets/_enviroment.scss"
+    template "styles/#{style_name}/stylesheets/app/stylesheet.scss.erb",          "app/assets/stylesheets/#{style_name}.scss.erb"
+    template "styles/#{style_name}/stylesheets/app/custom_active_admin.scss.erb", "app/assets/stylesheets/custom_active_admin.scss.erb"
+    template "styles/#{style_name}/stylesheets/app/_production.scss",             "app/assets/stylesheets/_production.scss"
 
     copy_file "app/helpers/layout_helper.rb",     "app/helpers/layout_helper.rb",           :force => !options.verbose?
     directory "styles/#{style_name}/images",      "app/assets/images/styles/#{style_name}", :force => !options.verbose?
@@ -101,7 +101,7 @@ class LeolayGenerator < Rails::Generators::Base
     inject_into_class file, auth_class do
       <<-FILE.gsub(/^    /, '')
       ROLES = %w[admin manager user guest]
-      scope :with_role, lambda { |role| {:conditions => "roles_mask & \#{2**ROLES.index(role.to_s)} > 0 "} }
+      scope :with_role, ->(role) { where("roles_mask & \#{2**ROLES.index(role.to_s)} > 0 ") }
 
       def roles=(roles)
         self.roles_mask = (roles & ROLES).map { |r| 2**ROLES.index(r) }.sum
@@ -124,12 +124,19 @@ class LeolayGenerator < Rails::Generators::Base
       def admin?
         self.role? 'admin'
       end
-      def name
+      def name option=:fullname
         return unless self.email
         # Get left email text
         match_data = self.email.match(/^([a-z]+)(\.|\-|\_|)([a-z]+|)/i)
-        name = "\#{match_data[1].capitalize}"
-        name << " \#{match_data[3].capitalize}" unless match_data[3].blank?
+        case option
+          when :full, :fullname
+            name = match_data[1].capitalize
+            name << " \#{match_data[3].capitalize}" unless match_data[3].blank?
+          when :first, :firstname
+            name = match_data[1].capitalize
+          when :last, :lastname, :surname
+            name = match_data[3].capitalize
+        end
         name
       end
       FILE

data/lib/generators/leolay/templates/styles/active/stylesheets/app/_production.scss

@@ -0,0 +1,26 @@
+@import "active_admin/mixins";
+@import "active_admin/base";
+$env-color: rgb(220,60,60);
+
+@mixin primary-gradient {
+  @include gradient(darken($env-color, 20%), darken($env-color, 33%));
+  border-bottom: 1px solid darken($env-color, 38%);
+}
+
+#header {
+  @include primary-gradient;
+  ul#tabs > li.current > a {
+    background-color: darken($env-color, 15%);
+  }
+  ul#tabs > li:hover > a {
+    background-color: darken($env-color, 10%);
+  }
+}
+.table_tools_segmented_control li.selected {
+  a {
+    color: $env-color;
+  }
+  a:hover {
+    color: darken($env-color, 20%);
+  }
+}

data/lib/generators/leolay/templates/styles/active/stylesheets/app/{custom_active_admin.scss → custom_active_admin.scss.erb}

@@ -1,10 +1,11 @@
 $style_path: styles/<%= style_name %>;
 @import "active_admin/mixins";
 @import "active_admin/base";
+<% if Rails.env == 'production' %>
+@import "production";
+<% end %>
 
 body.active_admin {
-  @import "enviroment";
-
   #active_admin_content {
     padding: 10px 10px;
   }

data/lib/generators/leolay/templates/styles/active/stylesheets/app/{stylesheet.scss → stylesheet.scss.erb}

@@ -1,8 +1,10 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
+<% if Rails.env == 'production' %>
+@import "production";
+<% end %>
 
 body.active_admin {
-  @import "enviroment";
   @import "active_admin/pages/logged_out";
   #header {
     #session {
@@ -26,28 +28,12 @@ body.active_admin {
   #login {
     form {
       input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
-        //width: 76%;
-        //border: 1px solid #c9d0d6;
-        //@include rounded;
-        //font-size: 0.95em;
-        //@include sans-family;
-        //outline: none;
         padding: 8px 7px;
-
-        //&:focus {
-        //  border: 1px solid #99a2aa;
-        //  @include shadow(0,0,4px,#99a2aa);
-        //}
       }
       input[type=submit] {
         @include dark-button;
         margin-left: 20px;
-        //padding: 4px 8px;
       }
-      //.buttons {
-      //  margin-top: 15px;
-      //  //input[type=submit] { margin-right: 10px; }
-      //}
     }
   }
 }

data/lib/test_assets/scaffold.txt

@@ -1,15 +1,15 @@
-# This is the main resource... i think
-activity user:references name:string{100} body:text completed:boolean percentage_progression:integer{1}
-#completed: when all tasks are completed
-# Any other comments about fields
-
-# This table acts as...
-task user:references activity:references name:string{100} body:text completed:boolean percentage_progression:integer{1} deadline_date:date
-
-hint user:belongs_to activity:references message:string
-
-# I decided to add this because...
-rails g migration AddFooToActivity foo:boolean
-
-# I need this because...
+# This is the main resource... i think
+activity user:references name:string{100} body:text completed:boolean percentage_progression:integer{1}
+#completed: when all tasks are completed
+# Any other comments about fields
+
+# This table acts as...
+task user:references activity:references name:string{100} body:text completed:boolean percentage_progression:integer{1} deadline_date:date
+
+hint user:belongs_to activity:references message:string
+
+# I decided to add this because...
+rails g migration AddFooToActivity foo:boolean
+
+# I need this because...
 rails g migration AddBarToTask bar:boolean

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_leonardo
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Marco Mastrodonato
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,9 +63,9 @@ files:
 - lib/generators/leolay/templates/styles/active/images/ico_v.png
 - lib/generators/leolay/templates/styles/active/images/ico_x.png
 - lib/generators/leolay/templates/styles/active/images/logo.png
-- lib/generators/leolay/templates/styles/active/stylesheets/app/_enviroment.scss
-- lib/generators/leolay/templates/styles/active/stylesheets/app/custom_active_admin.scss
-- lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.scss
+- lib/generators/leolay/templates/styles/active/stylesheets/app/_production.scss
+- lib/generators/leolay/templates/styles/active/stylesheets/app/custom_active_admin.scss.erb
+- lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.scss.erb
 - lib/generators/leolay/templates/styles/active/views/layout/_message.html.erb
 - lib/generators/leolay/templates/styles/active/views/layout/_session.html.erb
 - lib/generators/leolay/templates/styles/active/views/layout/application.html.erb

data/lib/generators/leolay/templates/styles/active/stylesheets/app/_enviroment.scss

@@ -1,25 +0,0 @@
-//Uncomment these lines in production to have a different color
-//$env-color: rgb(250,50,50);
-//
-//@mixin primary-gradient {
-//  @include gradient(darken($env-color, 20%), darken($env-color, 33%));
-//  border-bottom: 1px solid darken($env-color, 38%);
-//}
-//
-//#header {
-//  @include primary-gradient;
-//  ul#tabs > li.current > a {
-//      background-color: darken($env-color, 15%);
-//  }
-//  ul#tabs > li:hover > a {
-//      background-color: darken($env-color, 10%);
-//  }
-//}
-//.table_tools_segmented_control li.selected {
-//  a {
-//    color: $env-color;
-//  }
-//  a:hover {
-//    color: darken($env-color, 20%);
-//  }
-//}