active_leonardo 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51e2a1f9b84ce890c72d1e8d44be29a946648e2
-  data.tar.gz: 4c03750211817703963ac3ce96a1e6f8e55f4abb
+  metadata.gz: 46fe1db72e27ba0a666f6a5fd477f78e47abfe19
+  data.tar.gz: 3a260b54254f4187ade5c37fae23e18e62d1b261
 SHA512:
-  metadata.gz: 9940dc8d3f77a4c7536b7f5f3c110c0cdd379ae296ffa348bca765aa464c25dbade1220ba3aaa886d0a157dca8ce22240cebd5c3c042074924a4217eeb55d356
-  data.tar.gz: 49eccbf92752be422046b168683d5e4098da61853af49ff7aa598505d9e1c744fb34df22ba95ce5fbaf6adedab7c183f6f21d40b506ee1bf70b920d5934b9dac
+  metadata.gz: d9450300646654cf2a2afcd8705857d12630dd9d1ab140d6a07f307367bfc991779c784305c63d55cc4121a95b2636ce01d4ad7e5bf063be46d2b1d362e0416e
+  data.tar.gz: 7c4db87e476226e9926e6c39d90567aef13ff8fcbe4623c368a73c414d18d2b3f44b401aecc6798215232f6aaa684766acd4781c9df0b59eb59cdd105f83610f

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+0.4.1 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.4.0...v0.4.1) July 22th, 2014
+------------------------------
+* Added formtastic github url
+* Turbolinks now works
+* Several little improvements
+
+0.4.0 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.3.0...v0.4.0) April 11th, 2014
+------------------------------
+* Rails 4.1 passed
+* Improved rake tests, now active:tests:all perform test from rails 3.2 to 4.1
+* Added Rails 4.1 tests to Travis CI
+
+0.3.0 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.2.3...v0.3.0) April 8th, 2014
+------------------------------
+* New, edit and destroy buttons are now shown only if authorized
+* The activeadmin method "default_actions" now show only authorized links
+* Turned on turbolinks by default. You can remove jquery.turbolinks from active_admin.js.coffee
+
 0.2.3 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.2.2...v0.2.3) March 21th, 2014
 ------------------------------
 * Improved rake test to iterate several rails versions (currently 3.2.x and 4.0.x)

data/README.md

@@ -9,7 +9,20 @@ It generates the layout, the style, the internationalization and it helps you to
 
 ## Compatibility
 
-This version has been tested on Rails 4.0.x and Ruby 2.0 on Windows OS
+This version has been tested on:
+
+* Rails `3.2.x` and Ruby `1.9.3` on Windows OS
+* Rails `3.2.x` and Ruby `2.0.x` on Windows OS
+* Rails `4.0.x` and Ruby `1.9.x` on Windows OS
+* Rails `4.0.x` and Ruby `2.0.x` on Windows OS
+* Rails `3.2.x` and Ruby `1.9.3` on Linux
+* Rails `3.2.x` and Ruby `2.0.x` on Linux
+* Rails `3.2.x` and Ruby `2.1.x` on Linux
+* Rails `4.0.x` and Ruby `1.9.3` on Linux
+* Rails `4.0.x` and Ruby `2.0.x` on Linux
+* Rails `4.0.x` and Ruby `2.1.x` on Linux
+
+We are pleased to have achieved this result :smile:
 
 
 ## Install
@@ -150,9 +163,54 @@ Currently the only one available is provided by ActiveAdmin
 * active [default]
 
 
+## How to perform tests
+
+Check current tasks typing:
+
+```ruby
+bundle exec rake -T
+```
+
+    rake active:tests:all[inspection]           # Tests all rails versions
+    rake active:tests:newapp[inspection,rails]  # Creates a test rails app for ...
+    rake active:tests:prepare[rails,path]       # Prepare the environment passi...
+
+if you want to test all, you can entrust to our package:
+```ruby
+bundle exec rake active:tests:all[inspection]
+```
+
+if you pass the argument inspection you can check the application under the test folder:
+
+    test/TestApp_xxx_32
+    test/TestApp_xxx_40
+
+where xxx is the current ruby version and the last number the rails version.
+
+Every rails version has its own bundle under mybundle_xx folder.
+
+If you want to perform a custom test, firstly make sure Gemfile.lock is not present otherwise delete it
+then you can type:
+
+```ruby
+bundle exec active:tests:prepare['3.2','mybundle_path']
+```
+
+_It sets the variable ENV[RAILS_CI] and prepares the package in the specified path_
+
+```ruby
+bundle exec rake active:tests:newapp[inspection]
+```
+
+the rails version has already been set by "active:tests:prepare" task.
+
+
+If you execute tests with the inspection parameter remember to delete app folder under test/ before perform a new execution.
+
+
 ## Tutorial
 
-On my [Blog](http://marcomastrodonato.blogspot.it/) you can find some other info.
+On my [Blog](http://mastrodonato.it/) you can find some other info.
 
 
 ## Found a bug?

data/active_template.rb

@@ -10,13 +10,15 @@
 #
 #########################################################
 
+rails_version = Rails::VERSION::STRING
+
 puts '*' * 40
-puts "* Processing template..."
+puts "* Rails #{rails_version} Processing template..."
 puts '*' * 40
 
 test_mode = nil
 ARGV.each{|arg| test_mode = true if arg  == "test_mode"}
-app_path = ARGV[0]
+app_path = ARGV[1]
 puts "**** Starting app into #{app_path} in test mode! ****" if test_mode
 
 use_git = test_mode || yes?("Do you use git ?")
@@ -47,9 +49,10 @@ if use_git
   EOS
 end
 
-gem "activeadmin",              git: 'http://github.com/gregbell/active_admin.git'
+
+gem "activeadmin",          git: 'http://github.com/gregbell/active_admin.git'
 if test_mode
-  gem "active_leonardo", :path => "../../."
+  gem "active_leonardo",    path: "../../."
 else
   gem "active_leonardo"
 end
@@ -58,9 +61,9 @@ gem "bourbon"
 
 easy_develop = test_mode || yes?("Do you want to make development easier?")
 if easy_develop
-  gem "rack-mini-profiler", :group => :development
-  gem "better_errors",      :group => :development
-  gem "awesome_print",      :group => :development
+  gem "rack-mini-profiler", group: :development
+  gem "better_errors",      group: :development
+  gem "awesome_print",      group: :development
 end
 
 #use_editor = yes?("Do you want a wysihtml editor?")
@@ -71,16 +74,11 @@ end
 
 rspec = test_mode || yes?("Add rspec as testing framework ?")
 if rspec
-  gem 'rspec-rails',                    :group => [:test, :development]
-  gem 'capybara',                       :group => :test
-  gem 'launchy',                        :group => :test
-  gem 'database_cleaner',               :group => :test
-  if /1.8.*/ === RUBY_VERSION
-    gem 'factory_girl', '2.6.4',        :group => :test
-    gem 'factory_girl_rails', '1.7.0',  :group => :test
-  else
-    gem 'factory_girl_rails',           :group => :test
-  end
+  gem 'rspec-rails',                    group: [:test, :development]
+  gem 'capybara',                       group: :test
+  gem 'launchy',                        group: :test
+  gem 'database_cleaner',               group: :test
+  gem 'factory_girl_rails',             group: :test
 end
 
 authentication = test_mode || yes?("Authentication ?")
@@ -101,6 +99,7 @@ if authentication
     REMEM
     p stdout
   end
+  gem "devise"
 
   authorization = test_mode || yes?("Authorization ?")
   if authorization
@@ -110,6 +109,13 @@ end
 
 gem 'state_machine' if test_mode || yes?("Do you have to handle states ?")
 
+# Updates for Rails 4.1
+if /4.1.*/ === rails_version
+  gem 'ransack',            git: 'http://github.com/activerecord-hackery/ransack.git',     branch: 'rails-4.1'
+  gem 'polyamorous',        git: 'http://github.com/activerecord-hackery/polyamorous.git'
+  gem 'formtastic',         git: 'http://github.com/justinfrench/formtastic.git'
+end
+
 dashboard_root = test_mode || yes?("Would you use dashboard as root ? (recommended)")
 home = test_mode || yes?("Ok. Would you create home controller as root ?") unless dashboard_root
 
@@ -130,10 +136,10 @@ end
 generate  "leolay",
           "active", #specify theme
           "--auth_class=#{model_name}",
-          (rspec ? nil : "--skip-rspec"),
-          (authorization ? nil : "--skip-authorization"),
-          (authentication ? nil : "--skip-authentication"),
-          (test_mode ? "--no-verbose" : nil)
+          (rspec ?                  nil : "--skip-rspec"),
+          (authorization ?          nil : "--skip-authorization"),
+          (authentication ?         nil : "--skip-authentication"),
+          (test_mode ?  "--no-verbose"  : nil)
 
 
 if dashboard_root

data/lib/generators/leolay/leolay_generator.rb

@@ -174,16 +174,20 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file, :force => !options.verbose?
 
     file = "#{app_path}/active_admin.js.coffee"
-    #gsub_file file, "#= require active_admin/base" do
-    #  <<-FILE.gsub(/^    /, '')
-    #  #= require jquery.turbolinks
-    #
-    #  #= require active_admin/base
-    #FILE
-    #end
+    gsub_file file, "#= require active_admin/base" do
+      <<-FILE.gsub(/^    /, '')
+      #= require jquery
+      #= require turbolinks
+      #= require jquery.turbolinks
+
+      #= require active_admin/base
+      #= require custom
+    FILE
+    end
     append_file file do
       <<-FILE.gsub(/^      /, '')
       #= require turbolinks
+      #= require jquery.turbolinks
       #= require custom
       FILE
     end

data/lib/generators/leolay/templates/config/initializers/activeadmin_leonardo.rb

@@ -1,31 +1,76 @@
-module ActiveAdmin
-  module Views
-    module Pages
-      #Custom footer
-      #\lib\active_admin\views\pages\base.rb
-      class Base < Arbre::HTML::Document
-        private
-        def build_footer
-          div :id => "footer" do
-            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]}, <%= Time.now.year %>.".html_safe
-            para style_image_tag "logo.png"
-          end
-        end
-
-      end
-    end
-
-    #Avoid xml and json from download
-    #\lib\active_admin\views\components\paginated_collection.rb
-    #class PaginatedCollection
-    #  def build_download_format_links(formats = [:csv])
-    #    links = formats.collect do |format|
-    #      link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
-    #    end
-    #    div :class => "download_links" do
-		 #     text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
-    #    end
-    #  end
-    #end
-  end
-end
+module ActiveAdmin
+  module Views
+    module Pages
+      #Custom footer
+      #\lib\active_admin\views\pages\base.rb
+      class Base < Arbre::HTML::Document
+        private
+        def build_footer
+          div :id => "footer" do
+            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]}, <%= Time.now.year %>.".html_safe
+            para style_image_tag "logo.png"
+          end
+        end
+
+      end
+    end
+
+    #Per integrare default_actions con cancan
+    #\lib\active_admin\views\index_as_table.rb
+    class IndexAsTable
+      class IndexTableFor
+        # Adds links to View, Edit and Delete
+        def default_actions(options = {})
+          options = {
+              :name => "",
+              :auth => true
+          }.merge(options)
+          column options[:name] do |resource|
+            links = ''.html_safe
+            if controller.action_methods.include?('show') && (options[:auth] ? can?(:read, resource) : true)
+              links += link_to I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link"
+            end
+            if controller.action_methods.include?('edit') && (options[:auth] ? can?(:update, resource) : true)
+              links += link_to I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link"
+            end
+            if controller.action_methods.include?('destroy') && (options[:auth] ? can?(:destroy, resource) : true)
+              links += link_to I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'), :class => "member_link delete_link"
+            end
+            links
+          end
+        end
+      end
+    end
+  end
+  class Resource
+    module ActionItems
+      private
+
+      # Adds the default action items to each resource
+      def add_default_action_items
+        # New Link on all actions except :new and :show
+        add_action_item :except => [:new, :show] do
+          if controller.action_methods.include?('new') && can?(:create, active_admin_config.resource_class)
+            link_to(I18n.t('active_admin.new_model', :model => active_admin_config.resource_name), new_resource_path)
+          end
+        end
+
+        # Edit link on show
+        add_action_item :only => :show do
+          if controller.action_methods.include?('edit') && can?(:edit, resource)
+            link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_name), edit_resource_path(resource))
+          end
+        end
+
+        # Destroy link on show
+        add_action_item :only => :show do
+          if controller.action_methods.include?("destroy") && can?(:destroy, resource)
+            link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_name),
+                    resource_path(resource),
+                    :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'))
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_leonardo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Marco Mastrodonato, Marco Longhitano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails