active_leonardo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed43cceaa12e2fb49d8596d40108d1556237036
-  data.tar.gz: ef2f16bd7946187764a3c7f82bb437cd22ad8841
+  metadata.gz: a51e2a1f9b84ce890c72d1e8d44be29a946648e2
+  data.tar.gz: 4c03750211817703963ac3ce96a1e6f8e55f4abb
 SHA512:
-  metadata.gz: d4135cc1e61eebc8ec5d6fbcf40cf1edee7f862195e82b156356c3b8c68fa63fe39fce4a594fd3625efe1a3a7e6269d69c1603c8978b7af11560ebcd24a83789
-  data.tar.gz: 2d621a882ea57190b99eece3ea93bee59ea45e6e1571fab5685008271091279f545f0967f6242c23df60e3b474ec45a29324a38ec46910091a66c91237edcd43
+  metadata.gz: 9940dc8d3f77a4c7536b7f5f3c110c0cdd379ae296ffa348bca765aa464c25dbade1220ba3aaa886d0a157dca8ce22240cebd5c3c042074924a4217eeb55d356
+  data.tar.gz: 49eccbf92752be422046b168683d5e4098da61853af49ff7aa598505d9e1c744fb34df22ba95ce5fbaf6adedab7c183f6f21d40b506ee1bf70b920d5934b9dac

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-0.2.2.pre [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.2.1...v0.2.2) March 12th, 2014
+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)
+* Code improvements
+
+0.2.2 [☰](https://github.com/marcomd/Active_Leonardo/compare/v0.2.1...v0.2.2) March 12th, 2014
 ------------------------------
 * Added suite test
 * Travis integration

data/active_template.rb

@@ -16,7 +16,8 @@ puts '*' * 40
 
 test_mode = nil
 ARGV.each{|arg| test_mode = true if arg  == "test_mode"}
-puts "**** Starting in test mode! ****" if test_mode
+app_path = ARGV[0]
+puts "**** Starting app into #{app_path} in test mode! ****" if test_mode
 
 use_git = test_mode || yes?("Do you use git ?")
 
@@ -47,7 +48,11 @@ if use_git
 end
 
 gem "activeadmin",              git: 'http://github.com/gregbell/active_admin.git'
-gem "active_leonardo"
+if test_mode
+  gem "active_leonardo", :path => "../../."
+else
+  gem "active_leonardo"
+end
 gem "jquery-turbolinks"
 gem "bourbon"
 

data/lib/generators/active_leonardo.rb

@@ -38,347 +38,149 @@ module ActiveLeonardo
 
   module Leosca
 
-    protected
-
-    def attribute_to_hash(attribute)
-      name = case attribute.type
-        when :references, :belongs_to then ":#{attribute.name}_id"
-        else                               ":#{attribute.name}"
+    module Seed
+      protected
+      def attribute_to_hash(attribute)
+        name = case attribute.type
+                 when :references, :belongs_to then ":#{attribute.name}_id"
+                 else                               ":#{attribute.name}"
+               end
+        value = case attribute.type
+                  when :boolean                 then "true"
+                  when :integer                 then "#"
+                  when :float, :decimal         then "#.46"
+                  when :references, :belongs_to then "rand(#{attribute.name}_from..#{attribute.name}_to)"
+                  when :date                    then "#{Time.now.strftime("%Y-%m-%d 00:00:00.000")}".inspect
+                  when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
+                  when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
+                  else                               "#{attribute.name.titleize}\#".inspect
+                end
+        " #{name} => #{value}"
       end
-      value = case attribute.type
-        when :boolean                 then "true"
-        when :integer                 then "#"
-        when :float, :decimal         then "#.46"
-        when :references, :belongs_to then "rand(#{attribute.name}_from..#{attribute.name}_to)"
-        when :date                    then "#{Time.now.strftime("%Y-%m-%d 00:00:00.000")}".inspect
-        when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
-        when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
-        else                               "#{attribute.name.titleize}\#".inspect
+      def attribute_to_range(attribute)
+        case attribute.type
+          when :references, :belongs_to then  "#{attribute.name}_from = #{attribute.name.classify}.first.id; #{attribute.name}_to = #{attribute.name.classify}.last.id#{CRLF}"
+          else                                ""
+        end
       end
-      " #{name} => #{value}"
-    end
-    def attribute_to_range(attribute)
-      case attribute.type
-        when :references, :belongs_to then  "#{attribute.name}_from = #{attribute.name.classify}.first.id; #{attribute.name}_to = #{attribute.name.classify}.last.id#{CRLF}"
-        else                                ""
+      def attributes_accessible(attributes, class_name)
+        selected = attributes.select {|attribute| [:references, :belongs_to].include?(attribute.type) ? true : false }
+        if selected.empty?
+          ""
+        else
+          "#{class_name}.attr_accessible " <<
+              selected.map{|attribute| ":#{attribute.name}_id"}.join(', ') <<
+              CRLF
+        end
       end
     end
-    def attribute_to_factories(attribute)
-      spaces = 34
-      space_association = " " * (spaces-11).abs
-      space_sequence = " " * (spaces-attribute.name.size-11).abs
-      space_other = " " * (spaces-attribute.name.size).abs
-      name = case attribute.type
-      when :references, :belongs_to   then "#{singular_table_name[0..0]}.association#{space_association}"
-      when :boolean, :datetime, :time, :timestamp
-                                      then "#{singular_table_name[0..0]}.#{attribute.name}#{space_other}"
-      else                                 "#{singular_table_name[0..0]}.sequence(:#{attribute.name})#{space_sequence}"
-      end
-      value = case attribute.type
-        when :boolean                 then "true"
-        when :integer                 then "{|n| n }"
-        when :float, :decimal         then "{|n| n }"
-        when :references, :belongs_to then ":#{attribute.name}"
-        when :date                    then "{|n| n.month.ago }"
-        when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
-        when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
-        else                               "{|n| \"#{attribute.name.titleize}\#{n}\" }"
+
+    module Rspec
+      protected
+      def attribute_to_factories(attribute)
+        spaces = 34
+        space_association = " " * (spaces-11).abs
+        space_sequence = " " * (spaces-attribute.name.size-11).abs
+        space_other = " " * (spaces-attribute.name.size).abs
+        name = case attribute.type
+                 when :references, :belongs_to   then "#{singular_table_name[0..0]}.association#{space_association}"
+                 when :boolean, :datetime, :time, :timestamp
+                 then "#{singular_table_name[0..0]}.#{attribute.name}#{space_other}"
+                 else                                 "#{singular_table_name[0..0]}.sequence(:#{attribute.name})#{space_sequence}"
+               end
+        value = case attribute.type
+                  when :boolean                 then "true"
+                  when :integer                 then "{|n| n }"
+                  when :float, :decimal         then "{|n| n }"
+                  when :references, :belongs_to then ":#{attribute.name}"
+                  when :date                    then "{|n| n.month.ago }"
+                  when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
+                  when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
+                  else                               "{|n| \"#{attribute.name.titleize}\#{n}\" }"
+                end
+        "    #{name}#{value}"
       end
-      "    #{name}#{value}"
-    end
-    def attribute_to_requests(attribute, object_id=nil)
-      object_id ||= "#{singular_table_name}_#{attribute.name}"
-      object_id = object_id.gsub('#', "\#{#{singular_table_name}.id}").gsub('name', attribute.name)
-      case attribute.type
-        when :boolean                 then "check \"#{object_id}\" if #{singular_table_name}.#{attribute.name}"
-        when :references, :belongs_to then "select #{singular_table_name}.#{attribute.name}.name, :from => \"#{object_id}_id\""
-        when :datetime, :time, :timestamp
-                                      then ""
-        when :date                    then "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
-        else                               "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}"
+      def attribute_to_requests(attribute, object_id=nil)
+        object_id ||= "#{singular_table_name}_#{attribute.name}"
+        object_id = object_id.gsub('#', "\#{#{singular_table_name}.id}").gsub('name', attribute.name)
+        case attribute.type
+          when :boolean                 then "check \"#{object_id}\" if #{singular_table_name}.#{attribute.name}"
+          when :references, :belongs_to then "select #{singular_table_name}.#{attribute.name}.name, :from => \"#{object_id}_id\""
+          when :datetime, :time, :timestamp
+          then ""
+          when :date                    then "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
+          else                               "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}"
+        end
       end
-    end
-    #def attribute_to_erb(attribute, object)
-    #  case attribute.name
-    #  when "state"                      then "<span class=\"state generic <%= #{object}.state_name.to_s %>\"><%= t(\"states.generic.\#{#{object}.state_name.to_s}\") %></span><span style=\"display:block;\"></span>"
-    #  else
-    #    case attribute.type
-    #    when :boolean                   then "<%= #{object}.#{attribute.name} ? style_image_tag(\"ico_v.png\", :class => \"ico_true\") : style_image_tag(\"ico_x.png\", :class => \"ico_false\") %>"
-    #    when :references, :belongs_to   then "<%= link_to(#{object}.#{attribute.name}.try(:name) || \"#\#{#{object}.#{attribute.name}.try(:id)}\", #{object}.#{attribute.name}, :remote => @remote) %>"
-    #    when :integer                   then "<%= number_with_delimiter #{object}.#{attribute.name} %>"
-    #    when :decimal                   then "<%= number_to_currency #{object}.#{attribute.name} %>"
-    #    when :float                     then "<%= number_with_precision #{object}.#{attribute.name} %>"
-    #    when :date                      then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y') if #{object}.#{attribute.name} %>"
-    #    when :datetime                  then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y %H:%M:%S') if #{object}.#{attribute.name} %>"
-    #    when :time, :timestamp          then "<%= #{object}.#{attribute.name}.strftime('%H:%M:%S') if #{object}.#{attribute.name} %>"
-    #    else                                 "<%= #{object}.#{attribute.name} %>"
-    #    end
-    #  end
-    #end
-    def get_attr_to_match(view=:list)
-      #attributes.each do |attribute|
-      #  case attribute.type
-      #  when :string, :text then
-      #    return  "have_content(#{singular_table_name}.#{attribute.name})",
-      #            "have_no_content(#{singular_table_name}.#{attribute.name})"
-      #  end
-      #end
-      attr = get_attr_to_check(view)
-      return  "have_content(#{singular_table_name}.#{attr})",
-              "have_no_content(#{singular_table_name}.#{attr})" if attr
 
-      #If there are not string or text attributes
-      case view
-      when :list
-        return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
-      when :show
-        return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
+      def get_attr_to_match(view=:list)
+        #attributes.each do |attribute|
+        #  case attribute.type
+        #  when :string, :text then
+        #    return  "have_content(#{singular_table_name}.#{attribute.name})",
+        #            "have_no_content(#{singular_table_name}.#{attribute.name})"
+        #  end
+        #end
+        attr = get_attr_to_check(view)
+        return  "have_content(#{singular_table_name}.#{attr})",
+            "have_no_content(#{singular_table_name}.#{attr})" if attr
+
+        #If there are not string or text attributes
+        case view
+          when :list
+            return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
+          when :show
+            return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
+        end
       end
-    end
-    def get_attr_to_check(view=:list)
-      case view
-      when :something
-      else
-        attributes.each{|a| case a.type when :string, :text then return a.name end}
-        attributes.each{|a| case a.type when :references, :belongs_to, :datetime then nil else return a.name end}
+      def get_attr_to_check(view=:list)
+        case view
+          when :something
+          else
+            attributes.each{|a| case a.type when :string, :text then return a.name end}
+            attributes.each{|a| case a.type when :references, :belongs_to, :datetime then nil else return a.name end}
+        end
+      end
+      def fill_form_with_values(object_id=nil)
+        items = []
+        attributes.each{|a|items << "        #{attribute_to_requests(a, object_id)}"}
+        items
       end
-    end
-    def fill_form_with_values(object_id=nil)
-      items = []
-      attributes.each{|a|items << "        #{attribute_to_requests(a, object_id)}"}
-      items
-    end
-  end
 
-  #module Nested
-  #  protected
-  #
-  #  #Add leonardo namespace to class_path
-  #  #def class_path
-  #  #  super + base_namespaces
-  #  #end
-  #
-  #  #product => products_path
-  #  #product under category => category_products_path(@category)
-  #  #product under brand/category => brand_category_products_path(@brand, @category)
-  #  def list_resources_path
-  #    "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@")})"
-  #  end
-  #
-  #  #product under category => category_products_path(category)
-  #  #product under brand/category => brand_category_products_path(@brand, category)
-  #  #TODO: figure out how to build links for a particular resource in the path
-  #  def list_resources_path_back
-  #    return unless nested?
-  #    "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@").reverse.sub(/@/, "").reverse})"
-  #  end
-  #
-  #  #product => "product"
-  #  #product under category => "[@category, product]"
-  #  #product under brand/category => "[@brand, @category, product]"
-  #  def destroy_resource_path(prefix_resource="")
-  #    formatted_resource_path("@", prefix_resource, "[]")
-  #  end
-  #
-  #  #product => "product"
-  #  #product under category => "[@category, product]"
-  #  #product under brand/category => "[@brand, @category, product]"
-  #  def show_resource_path(prefix_resource="")
-  #    formatted_resource_path("@", prefix_resource, "[]")
-  #  end
-  #
-  #  #product => "@product"
-  #  #product under category => "[@category, @product]"
-  #  #product under brand/category => "[@brand, @category, @product]"
-  #  def form_resource_path
-  #    formatted_resource_path("@", "@", "[]")
-  #  end
-  #
-  #  #product => new_product_path
-  #  #product under category => new_category_product_path(@category)
-  #  #product under brand/category => new_brand_category_product_path(@brand, @category)
-  #  def new_resource_path
-  #    "new_#{underscore_resource_path}_path(#{formatted_parent_resources("@")})"
-  #  end
-  #
-  #  #product => edit_product_path(@product)
-  #  #product under category => edit_category_product_path(@category, @product)
-  #  #product under brand/category => edit_brand_category_product_path(@brand, @category, @product)
-  #  def edit_resource_path(prefix_resource="")
-  #    "edit_#{underscore_resource_path}_path(#{formatted_resource_path("@", prefix_resource)})"
-  #  end
-  #
-  #  #product under brand/category => "[brand, category, product]" or "[@brand, @category, @product]" or "@brand, @category, @product" or [product.brand, product.category, product]
-  #  def formatted_resource_path(prefix_parent="", prefix_resource="", delimiter="", resource=nil)
-  #    formatted_resource_base resource_path(prefix_parent, prefix_resource, resource), delimiter
-  #  end
-  #
-  #  #product under brand/category => "[brand, category]" or "[@brand, @category]" or "@brand, @category" or product.brand, product.category
-  #  def formatted_parent_resources(prefix_parent="", delimiter="", resource=nil)
-  #    prefix_parent = "#{resource}." if resource
-  #    formatted_resource_base parent_resources(prefix_parent), delimiter
-  #  end
-  #
-  #  def formatted_resource_base(resources, delimiter="")
-  #    str_resources = resources.join(', ')
-  #    resources.size > 1 ? "#{delimiter[0..0]}#{str_resources}#{delimiter[1..1]}" : str_resources
-  #  end
-  #
-  #  #product under brand/category => "brand_category_product"
-  #  def underscore_resource_path(names=:all_singular)
-  #    case names
-  #    when :all_singular
-  #      resource_path.join('_')
-  #    #when :all_plural
-  #      #who needs?
-  #    when :parent_singular_resource_plural
-  #      resource_path.join('_').pluralize
-  #    else
-  #      "#{names.to_s}_not_supported"
-  #    end
-  #  end
-  #
-  #  #product under brand/category => ["brand", "category", "product"] or ["@brand", "@category", "@product"]
-  #  def resource_path(prefix_parent="", prefix_resource="", resource=nil, prefix_namespace="")
-  #    if resource
-  #      prefix_parent = "#{resource}."
-  #    else
-  #      resource = singular_table_name
-  #    end
-  #
-  #    prefix_namespace = ":" if prefix_namespace.empty? && prefix_parent.size>0
-  #
-  #    if nested?
-  #      (base_namespaces(prefix_namespace) + parent_resources(prefix_parent)) << "#{prefix_resource}#{resource}"
-  #    else
-  #      base_namespaces(prefix_namespace) << "#{prefix_resource}#{resource}"
-  #    end
-  #  end
-  #
-  #  #product under brand/category => "categories"
-  #  def plural_last_parent
-  #    plural_parent_resources.last
-  #  end
-  #
-  #  #product under brand/category => ["brands", "categories"] or ["@brands", "@categories"]
-  #  def plural_parent_resources(prefix_parent="")
-  #    base_parent_resources.map{|m| "#{prefix_parent}#{m.pluralize}"}
-  #  end
-  #
-  #  #product under brand/category => ["brand", "category"] or ["@brand", "@category"]
-  #  def parent_resources(prefix_parent="")
-  #    base_parent_resources.map{|m| "#{prefix_parent}#{m}"}
-  #  end
-  #
-  #  #product under brand/category => "category"
-  #  def last_parent
-  #    base_parent_resources.last
-  #  end
-  #
-  #  #product under brand/category => ["brand", "category"]
-  #  def base_parent_resources
-  #    return [] unless options[:under].present?
-  #    options[:under].split('/').map{|m| m.underscore}
-  #  end
-  #
-  #  def nested?
-  #    options[:under].present?
-  #  end
-  #
-  #  ### NAMESPACE ###
-  #  def leospaced?
-  #    options[:leospace].present?
-  #  end
-  #
-  #  def base_namespaces(prefix="")
-  #    return [] unless options[:leospace].present?
-  #    options[:leospace].split('/').map{|m| "#{prefix}#{m.underscore}"}
-  #  end
-  #
-  #  def last_namespace(prefix="")
-  #    base_namespaces(prefix).last
-  #  end
-  #
-  #  def formatted_namespace_path(separator='/')
-  #    return "" unless leospaced?
-  #    "#{base_namespaces.join(separator)}#{separator}"
-  #  end
-  #
-  #  module Test
-  #    protected
-  #    #Add parent(s) param(s) to request
-  #    #get :index for a product under category => get :index, :category_id => product.category_id.to_s
-  #    def nested_params_http_request(value=nil)
-  #      return unless nested?
-  #      ", " << base_parent_resources.map{|m| ":#{m}_id => #{value ? value.to_s.inspect : "#{file_name}.#{m}_id.to_s"}"}.join(', ')
-  #    end
-  #
-  #    #Create new parent(s) and add it to request
-  #    #get :index for a product under category => get :index, :category_id => Factory(:category).id.to_s
-  #    def nested_params_http_request_new_parent
-  #      return unless nested?
-  #      ", " << base_parent_resources.map{|m| ":#{m}_id => Factory(:#{m}).id.to_s"}.join(', ')
-  #    end
-  #
-  #    #product => products_path
-  #    #product under category => category_products_path(product.category)
-  #    #product under brand/category => brand_category_products_path(product.brand, product.category)
-  #    def list_resources_path_test(resource=nil, prefix_parent=nil)
-  #      unless prefix_parent
-  #        resource ||= singular_table_name
-  #        prefix_parent = "#{resource}."
-  #      end
-  #      "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources(prefix_parent, "", resource)})"
-  #    end
-  #
-  #    #product => "product"
-  #    #product under category => "[category, product]" or "[product.category, product]"
-  #    #product under brand/category => "[brand, category, product]" or "[product.brand, product.category, product]"
-  #    def show_resource_path_test(resource=nil, prefix_parent=nil, prefix_resource="")
-  #      resource ||= singular_table_name
-  #      prefix_parent = prefix_parent || "#{resource}."
-  #      formatted_resource_path(prefix_parent, prefix_resource, "[]", resource)
-  #    end
-  #
-  #    #product => new_product_path
-  #    #product under category => new_category_product_path(product.category)
-  #    #product under brand/category => new_brand_category_product_path(product.brand, product.category)
-  #    def new_resource_path_test(resource=nil, prefix_parent=nil)
-  #      resource ||= singular_table_name
-  #      prefix_parent = prefix_parent || "#{resource}."
-  #      "new_#{underscore_resource_path}_path(#{formatted_parent_resources(prefix_parent, "",resource)})"
-  #    end
-  #  end
-  #end
-  module Test
-    protected
-    def get_activespace
-      activespace ||= options[:activespace]
-      "#{activespace}_" if activespace
     end
 
-    #product => activespace_products_path
-    def list_resources_path_test(resource=nil)
-      resource ||= plural_table_name
-      "#{get_activespace}#{resource}_path"
-    end
+    module Locale
+      protected
+      def attributes_to_list(attributes, file_name)
+        content = "#{CRLF}      #{file_name}:#{CRLF}"
+        attributes.each do |attribute|
+          content << "        #{attribute.name}: \"#{attribute.name.humanize}\"#{CRLF}"
+        end
+        content
+      end
 
-    #product => "[:activespace, product]"
-    def show_resource_path_test(resource=nil)
-      resource ||= singular_table_name
-      "[:#{options[:activespace]}, #{resource}]"
-    end
+      def attributes_to_hints(attributes, file_name)
+        content = "#{CRLF}      #{file_name}:#{CRLF}"
+        attributes.each do |attribute|
+          attr_name = attribute.name.humanize
+          case attribute.type
+            when :integer, :decimal, :float
+              content << "        #{attribute.name}: \"Fill the #{attr_name} with a#{"n" if attribute.type == :integer} #{attribute.type.to_s} number\"#{CRLF}"
+            when :boolean
+              content << "        #{attribute.name}: \"Select if this #{file_name} should be #{attr_name} or not\"#{CRLF}"
+            when :string, :text
+              content << "        #{attribute.name}: \"Choose a good #{attr_name} for this #{file_name}\"#{CRLF}"
+            when :date, :datetime, :time, :timestamp
+              content << "        #{attribute.name}: \"Choose a #{attribute.type.to_s} for #{attr_name}\"#{CRLF}"
+            else
+              content << "        #{attribute.name}: \"Choose a #{attr_name}\"#{CRLF}"
+          end
+        end
+        content
+      end
 
-    #product => new_activespace_product_path
-    def new_resource_path_test(resource=nil)
-      resource ||= singular_table_name
-      "new_#{get_activespace}#{resource}_path"
     end
 
-    #product => edit_activespace_product_path
-    def edit_resource_path_test(resource=nil)
-      resource ||= singular_table_name
-      "edit_#{get_activespace}#{resource}_path(#{resource})"
-    end
   end
+
 end

data/lib/generators/rails/leosca_controller/leosca_controller_generator.rb

@@ -9,6 +9,9 @@ module Rails
     class LeoscaControllerGenerator < ::Rails::Generators::ScaffoldControllerGenerator
       include ::ActiveLeonardo::Base
       include ::ActiveLeonardo::Leosca
+      include ::ActiveLeonardo::Leosca::Locale
+      include ::ActiveLeonardo::Leosca::Rspec
+      include ::ActiveLeonardo::Leosca::Seed
 
       source_root File.expand_path('../templates', __FILE__)
       argument :attributes,         :type => :array,    :default => [],     :banner => "field:type field:type"
@@ -38,16 +41,7 @@ module Rails
 
           #Fields name
           inject_into_file file, :after => "#Attributes zone - do not remove" do
-            content = "#{CRLF}      #{file_name}:#{CRLF}"
-            attributes.each do |attribute|
-              content << "        #{attribute.name}: \"#{attribute.name.humanize}\"#{CRLF}"
-            end
-            #content << "        op_new: \"New #{singular_table_name}\"#{CRLF}"
-            #content << "        op_edit: \"Editing #{singular_table_name}\"#{CRLF}"
-            #content << "        op_edit_multiple: \"Editing #{plural_table_name}\"#{CRLF}"
-            #content << "        op_copy: \"Creating new #{plural_table_name}\"#{CRLF}"
-            #content << "        op_index: \"Listing #{plural_table_name}\"#{CRLF}"
-            content
+            attributes_to_list(attributes, file_name)
           end
 
           #Model name
@@ -61,23 +55,7 @@ module Rails
 
           #Formtastic
           inject_into_file file, :after => "    hints:" do
-            content = "#{CRLF}      #{file_name}:#{CRLF}"
-            attributes.each do |attribute|
-              attr_name = attribute.name.humanize
-              case attribute.type
-              when :integer, :decimal, :float
-                content << "        #{attribute.name}: \"Fill the #{attr_name} with a#{"n" if attribute.type == :integer} #{attribute.type.to_s} number\"#{CRLF}"
-              when :boolean
-                content << "        #{attribute.name}: \"Select if this #{file_name} should be #{attr_name} or not\"#{CRLF}"
-              when :string, :text
-                content << "        #{attribute.name}: \"Choose a good #{attr_name} for this #{file_name}\"#{CRLF}"
-              when :date, :datetime, :time, :timestamp
-                content << "        #{attribute.name}: \"Choose a #{attribute.type.to_s} for #{attr_name}\"#{CRLF}"
-              else
-                content << "        #{attribute.name}: \"Choose a #{attr_name}\"#{CRLF}"
-              end
-            end
-            content
+            attributes_to_hints(attributes, file_name)
           end
 
         end
@@ -107,15 +85,14 @@ module Rails
         file = "db/seeds.rb"
         append_file file do
           items = []
-          attributes.each do |attribute|
-            items << attribute_to_hash(attribute)
-          end
+          attributes.each{|attribute| items << attribute_to_hash(attribute)}
           row = "{ #{items.join(', ')} }"
 
           #TODO: to have different values for every row
           content = "#{CRLF}### Created by leosca controller generator ### #{CRLF}"
-          attributes.each do |attribute|
-            content << attribute_to_range(attribute)
+          attributes.each{|attribute| content << attribute_to_range(attribute)}
+          if /^3./ === Rails.version
+            content << attributes_accessible(attributes, class_name)
           end
           content << "#{class_name}.create([#{CRLF}"
           options[:seeds_elements].to_i.times do |n|
@@ -132,16 +109,24 @@ module Rails
         invoke "active_admin:resource", [singular_table_name]
         file = "app/admin/#{singular_table_name}.rb"
 
+        if /^4./ === Rails.version
+          inject_into_file file, :after => "ActiveAdmin.register #{class_name} do" do
+            <<-FILE.gsub(/^            /, '')
+
+              permit_params do
+                permitted = [#{attributes.map{|attr| ":#{attr.name}"}.join(', ')}]
+                permitted
+              end
+
+            FILE
+          end
+        end
+
         inject_into_file file, :after => "ActiveAdmin.register #{class_name} do" do
           <<-FILE.gsub(/^          /, '')
 
             menu :if => proc{ can?(:read, #{class_name}) }
 
-            permit_params do
-              permitted = [#{attributes.map{|attr| ":#{attr.name}"}.join(', ')}]
-              permitted
-            end
-
             controller do
               load_resource :except => :index
             end
@@ -149,6 +134,7 @@ module Rails
 
           FILE
         end if authorization? && File.exists?(file)
+
       end
 
       def update_specs

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: active_leonardo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Marco Mastrodonato, Marco Longhitano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
-dependencies: []
+date: 2014-03-21 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
+  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
 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.