active_leonardo 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fe1db72e27ba0a666f6a5fd477f78e47abfe19
-  data.tar.gz: 3a260b54254f4187ade5c37fae23e18e62d1b261
+  metadata.gz: f29db1342215bb12f27b052c47454c7832ef8862
+  data.tar.gz: b58bdb47a2214885c12216a0bf081c5a19164922
 SHA512:
-  metadata.gz: d9450300646654cf2a2afcd8705857d12630dd9d1ab140d6a07f307367bfc991779c784305c63d55cc4121a95b2636ce01d4ad7e5bf063be46d2b1d362e0416e
-  data.tar.gz: 7c4db87e476226e9926e6c39d90567aef13ff8fcbe4623c368a73c414d18d2b3f44b401aecc6798215232f6aaa684766acd4781c9df0b59eb59cdd105f83610f
+  metadata.gz: 82bdb0622ac22733d68291049d57c840a1bc656f12707be801dda9a7bc4b6322c68dfaf5cf389a7356bdbf494b272235d98e20d06895a2eb88ac725fb1450a5d
+  data.tar.gz: 8f979f182d69f0dc0f6639e83a34b2e71d4242b8de21d75cb1541fe929c6d7e9da6f7ed7ffb03217715ba93814270b99a9b9916871272c50a150953f030167ef

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.5.0 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.4.1...v0.5.0) Jennuary 7th, 2015
+------------------------------
+* Removed custom cancan integration, now activeadmin includes it
+* Improved the template for rails 4.2
+* removed the dependency with active admin which version 1 remains in beta
+* Improved Readme and test.rake
+
 0.4.1 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.4.0...v0.4.1) July 22th, 2014
 ------------------------------
 * Added formtastic github url

data/README.md

@@ -1,6 +1,6 @@
 # Leolay Generators
 
-[![Version     ](http://img.shields.io/gem/v/active_leonardo.svg)                     ](https://rubygems.org/gems/active_leonardo)
+[![Version     ](https://badge.fury.io/rb/active_leonardo.svg)                        ](https://rubygems.org/gems/active_leonardo)
 [![Travis CI   ](http://img.shields.io/travis/marcomd/Active_Leonardo/master.svg)     ](https://travis-ci.org/marcomd/Active_Leonardo)
 [![Quality     ](http://img.shields.io/codeclimate/github/marcomd/Active_Leonardo.svg)](https://codeclimate.com/github/marcomd/Active_Leonardo)
 
@@ -11,18 +11,10 @@ It generates the layout, the style, the internationalization and it helps you to
 
 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
+* Rails `3.2` `4.0` `4.1` `4.2` and Ruby `1.9.3` `2.0.0` `2.1.5` on Windows OS
+* Rails `3.2` `4.0` `4.1` `4.1` and Ruby `1.9.3` `2.0.0` `2.1.5` on Linux OS
 
-We are pleased to have achieved this result :smile:
+Click on Travis badge for more details.
 
 
 ## Install
@@ -163,49 +155,65 @@ Currently the only one available is provided by ActiveAdmin
 * active [default]
 
 
-## How to perform tests
+## How to test this project locally
+
+Download this project and go inside the folder
+
+Install the bundle wherever you want:
+
+```ruby
+bundle install --path=mybundle
+```
 
 Check current tasks typing:
 
 ```ruby
-bundle exec rake -T
+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...
+    rake active:tests:all[inspection,rails_versions]  # Tests all rails versions
+    rake active:tests:newapp[inspection,rails]        # Creates a test rails ap...
+    rake active:tests:prepare[rails,path]             # Prepare the environment...
+
+If you want to test everything we planned
 
-if you want to test all, you can entrust to our package:
 ```ruby
-bundle exec rake active:tests:all[inspection]
+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
+    test/TestApp_xxx_41
+    test/TestApp_xxx_42
 
 where xxx is the current ruby version and the last number the rails version.
+Remember everytime you run a test that folders will be deleted and recreated.
 
-Every rails version has its own bundle under mybundle_xx folder.
+Every rails version has its own bundle under ActiveLeonardo\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:
+If you want to specify the rails version type:
 
 ```ruby
-bundle exec active:tests:prepare['3.2','mybundle_path']
+rake active:tests:all[inspection,4.2]
 ```
 
-_It sets the variable ENV[RAILS_CI] and prepares the package in the specified path_
+or multiple versions
 
 ```ruby
-bundle exec rake active:tests:newapp[inspection]
+rake active:tests:all[inspection,4.1-4.2]
 ```
 
-the rails version has already been set by "active:tests:prepare" task.
+you may also specify your rails as ENV variables, for example on windows:
 
+```ruby
+set CI_RAILS=4.2
+bundle install --path=mybundle_42
+rake active:tests:newapp[inspection,4.2]
+```
 
-If you execute tests with the inspection parameter remember to delete app folder under test/ before perform a new execution.
+Do **NOT** exec rake tests from bundle to avoid its bubble.
 
 
 ## Tutorial
@@ -219,9 +227,16 @@ If you are having a problem please submit an issue at
 * m.mastrodonato@gmail.com
 * marcovlonghitano@gmail.com
 
+
 ## Rails 3.2.x
 
-Use previous 0.1.0 version (tested with activeadmin 0.5.x)
+It works on my system but if you have any troubles you may try 0.1.0 version (tested with activeadmin 0.5.x)
+
+
+## Rails 3.1.x
+
+Why you should do that?
+
 
 ## Rails 2 and Rails 3.0.x
 

data/active_template.rb

@@ -50,7 +50,7 @@ if use_git
 end
 
 
-gem "activeadmin",          git: 'http://github.com/gregbell/active_admin.git'
+gem "activeadmin",          git: 'https://github.com/gregbell/active_admin.git'
 if test_mode
   gem "active_leonardo",    path: "../../."
 else
@@ -109,11 +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'
+# Updates for latest Rails versions
+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'
+elsif /4.2/ === rails_version
+  gem 'inherited_resources', git: 'https://github.com/josevalim/inherited_resources.git', branch: 'rails-4-2'
 end
 
 dashboard_root = test_mode || yes?("Would you use dashboard as root ? (recommended)")

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

@@ -11,65 +11,6 @@ module ActiveAdmin
             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

metadata

@@ -1,54 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: active_leonardo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
-- Marco Mastrodonato, Marco Longhitano
+- Marco Mastrodonato
+- Marco Longhitano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: activeadmin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '3.2'
 description: This generator help you to create new Rails applications to combine with
   active admin gem. It generates application structure to easily get the internationalization
   and authorization.
 email:
-- m.mastrodonato@gmail.com, marcovlonghitano@gmail.com
+- m.mastrodonato@gmail.com
+- marcovlonghitano@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- active_template.rb
 - lib/generators/active_leonardo.rb
 - lib/generators/erb/leosca/leosca_generator.rb
+- lib/generators/leolay/USAGE
 - lib/generators/leolay/install_generator.rb
 - lib/generators/leolay/leolay_generator.rb
 - lib/generators/leolay/templates/app/admin/users.rb
@@ -69,21 +62,20 @@ 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.css.scss
 - lib/generators/leolay/templates/styles/active/stylesheets/app/custom_active_admin.css.scss
 - lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.css.scss
-- lib/generators/leolay/templates/styles/active/stylesheets/app/_enviroment.css.scss
-- lib/generators/leolay/templates/styles/active/views/layout/application.html.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/USAGE
-- lib/generators/leosca/install_generator.rb
+- lib/generators/leolay/templates/styles/active/views/layout/application.html.erb
 - lib/generators/leosca/USAGE
+- lib/generators/leosca/install_generator.rb
+- lib/generators/rails/leosca/USAGE
 - lib/generators/rails/leosca/leosca_generator.rb
 - lib/generators/rails/leosca/templates/leosca.css
-- lib/generators/rails/leosca/USAGE
+- lib/generators/rails/leosca_controller/USAGE
 - lib/generators/rails/leosca_controller/leosca_controller_generator.rb
 - lib/generators/rails/leosca_controller/templates/controller.rb
-- lib/generators/rails/leosca_controller/USAGE
 - lib/generators/rspec/leointegration/leointegration_generator.rb
 - lib/generators/rspec/leointegration/templates/admin/feature.rb
 - lib/generators/rspec/leointegration/templates/feature.rb
@@ -100,12 +92,9 @@ files:
 - lib/generators/rspec/leosca/templates/new_spec.rb
 - lib/generators/rspec/leosca/templates/routing_spec.rb
 - lib/generators/rspec/leosca/templates/show_spec.rb
-- LICENSE
-- README.md
-- CHANGELOG.md
-- active_template.rb
 homepage: https://github.com/marcomd/Active_Leonardo
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -113,18 +102,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Start a new app with the active_template.rb inside root folder
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: This gem provides a new customized scaffold generator to combine with active