adminpanel 1.2.8 → 1.2.9

data/lib/generators/adminpanel/initialize/templates/adminpanel_setup.rb

@@ -10,7 +10,12 @@ Adminpanel.setup do |config|
   # # Path to the key file, defaults to config/analytics
   # config.analytics_key_path = "config/analytics"
 
-  # # Configure the default modules that you don't need
-  # # the supported options are :categories, :gallery, :sections and :categories
-  # config.unincluded_modules = [:categories, :gallery, :sections, :categories]
+  # # This are the modules that are going to be displayed and order that are going to be displayed
+  # config.displayable_resources = [
+  #   :analytics,
+  #   :users,
+  #   :galleries,
+  #   :sections,
+  #   :categories
+  # ]
 end

data/lib/generators/adminpanel/initialize/templates/category_template.rb

@@ -1,30 +1,43 @@
 module Adminpanel
   class Category < ActiveRecord::Base
-    attr_accessible :name, :model
+    attr_accessible :name, :model #, :product_ids
 
     validates_presence_of :model
     validates_presence_of :name
     validates_uniqueness_of :name
 
 
-    has_many :categorizations
-    has_many :products, :through => :categorizations, :dependent => :destroy
+    # has_many :categorizations
+    # has_many :products, :through => :categorizations, :dependent => :destroy
 
 
     def self.form_attributes
       [
-    		{"product_ids" => {"type" => "has_many", "model" => "Adminpanel::Product", "name" => "product_ids"}},
-    		{"name" => {"type" => "text_field", "name" => "name", "label" => "name", "placeholder" => "name"}},
+  		  # {
+        # 'product_ids' => {
+        #   'type' => 'has_many',
+        #   'model' => 'Adminpanel::Product',
+        #   'name' => 'product_ids'
+        #   }
+        # },
+    		{
+          'name' => {
+            'type' => 'text_field',
+            'name' => 'name',
+            'label' => 'name',
+            'placeholder' => 'name'
+          }
+        },
       ]
     end
 
     def self.display_name
-      "Categoría"
+      "Categorías"
     end
 
-    # def self.icon
-    #     "icon-truck"
-    # end
+    def self.icon
+        "icon-bookmark"
+    end
 
     default_scope { order("model ASC")}
     scope :of_model, lambda{|model| where(:model => model)}

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -34,6 +34,10 @@ module Adminpanel
 				false
 			end
 
+			def gallery_name
+				"#{lower_name}file"
+			end
+
 			def lower_name
 				name.singularize.downcase
 			end
@@ -83,7 +87,7 @@ module Adminpanel
 					assign_attributes_variables(attribute)
 
         	if @attr_type == "images"
-            	attr_string = attr_string + ":#{@attr_field.pluralize.downcase}_attributes, "
+            	attr_string = attr_string + ":#{gallery_name.pluralize}_attributes, "
         	elsif @attr_type == "belongs_to"
         		attr_string = "#{attr_string}:#{belongs_to_field(@attr_field)}, "
         	elsif @attr_type == "has_many" || @attr_type == "has_many_through"
@@ -142,7 +146,7 @@ module Adminpanel
 			end
 
 			def file_field_hash
-				"#{starting_hash(@attr_field.downcase.pluralize)} => {#{form_type('adminpanel_file_field')}," +
+				"#{starting_hash(gallery_name.pluralize)} => {#{form_type('adminpanel_file_field')}," +
 				"#{label_type}," +
 				"#{placeholder_type}}\n\t\t\t},"
 			end
@@ -246,11 +250,11 @@ module Adminpanel
 
 			def image_association
 				generate_gallery
-				return "\n\t\tmount_images :#{@attr_field.pluralize.downcase}\n"
+				return "\n\t\tmount_images :#{gallery_name.pluralize}\n"
 			end
 
 			def generate_gallery
-				Rails::Generators.invoke("adminpanel:gallery", lower_name)
+				generate "adminpanel:gallery", lower_name
 			end
 
 		end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -84,7 +84,6 @@ namespace :adminpanel do
   end
 
   task :populate, [:times, :model, :attributes] => :environment do |t, args|
-
     puts "Generating #{args[:times]} records of #{args[:model]}"
 
     @model = "adminpanel/#{args[:model]}".classify.constantize
@@ -107,26 +106,27 @@ namespace :adminpanel do
           when "category" || "category_name" #generate a category name
             value = @things.sample.pluralize
 
-          when "lorem_name" || 'small_lorem' || "sentence"
+          when 'lorem_short'
             value = generate_lorem_name #lorem random short sentence
 
-          when "description" || "lorem" #large paragraph.
+          when "lorem" || "description" #large paragraph.
             value = generate_lorem
 
           when "number" #generate a number
             value = [*1..5000].sample
 
           when "id" #assign field_id it to a random instance of Adminpanel::field
-            value = "adminpanel/#{field}".classify.constantize.order("RAND()").first.id
-            field = "#{field}_id"
+            field = field.downcase.singularize
+            if field != 'category'
+              value = "adminpanel/#{field}".classify.constantize.order("RAND()").first.id
+            else
+              value = "adminpanel/#{field}".classify.constantize.of_model(@model.display_name).order("RAND()").first.id
+            end
+              field = "#{field}_id"
 
           when "email" #generates a random email
             value = generate_email
 
-          when "image" #force an image...
-            has_image = true
-            @file_url = "http://placehold.it/#{field}"
-
           else #no type
             value = "#{time + 1} Lorem ipsum dolor sit amec"
 
@@ -141,10 +141,6 @@ namespace :adminpanel do
 
       change_dates(instance)
 
-      if(has_image) #forcing the image into the db
-        create_image_of(instance.id)
-      end
-
     end
 
   end
@@ -170,16 +166,6 @@ private
     ").save\n"
   end
 
-  def create_image_of(model_id)
-    image_instance = Adminpanel::Image.new(
-      :model => @model.display_name,
-      :foreign_key => model_id
-      )
-    image_instance.save(:validate => false)
-    image_instance.update_column(:file, @file_url)
-    change_dates(image_instance)
-  end
-
   def generate_lorem
     value = "#{@lorem.sample}"
     [*60..80].sample.times do

data/spec/dummy/.gitignore

@@ -2,6 +2,7 @@
 capybara-*.html
 .rspec
 /log
+/tmp
 /tmp/test.log
 /tmp/development.log
 /db/*.sqlite3

data/spec/dummy/app/models/adminpanel/category.rb

@@ -17,8 +17,8 @@ module Adminpanel
             "Category"
         end
 
-        # def self.icon
-        #     "icon-truck"
-        # end
+        def self.icon
+            "icon-truck"
+        end
     end
 end

data/spec/dummy/app/models/adminpanel/product.rb

@@ -49,8 +49,8 @@ module Adminpanel
       "Product"
     end
 
-    # def self.icon
-    #     "icon-truck"
-    # end
+    def self.icon
+        "icon-truck"
+    end
   end
 end

data/spec/dummy/config/initializers/adminpanel_setup.rb

@@ -0,0 +1,22 @@
+Adminpanel.setup do |config|
+  # # You get this from the Google Analytics Dashboard, this configuration is required.
+  # config.analytics_profile_id = '12341234'
+
+  # # The next configuration is the file used to establish server to server authentication/authorization
+  # # you need to download this file from the Google Developers Console
+  # # and place it inside your application, this configuration is required.
+  # config.analytics_key_filename = '12345ABCDE.p12'
+
+  # # Path to the key file, defaults to config/analytics
+  # config.analytics_key_path = "config/analytics"
+
+  # # This are the modules that are going to be displayed and order that are going to be displayed
+  config.displayable_resources = [
+    :analytics,
+    :galleries,
+    :sections,
+    :categories,
+    :products,
+    :users
+  ]
+end

data/spec/features/galleries_pages_spec.rb

@@ -4,12 +4,12 @@ describe "Gallery pages" do
 	subject {page}
 
 	let(:user) { Factory(:user) }
-	before do 
+	before do
 		visit adminpanel.signin_path
 		valid_signin(user)
 		clean_uploads_folder
 	end
-	
+
 	describe "galleries" do
 		let(:gallery) { Factory(:gallery) }
 		before do
@@ -89,31 +89,6 @@ describe "Gallery pages" do
 		end
 	end
 
-	describe "new" do
-		before do 
-			visit adminpanel.new_gallery_path
-		end
-
-		it { should have_title(I18n.t("gallery.new")) }
-
-		describe "with invalid information" do
-			before { find("form#new_gallery").submit_form! }
-
-			it { should have_title(I18n.t("gallery.new")) }
-			it { should have_selector("div#alerts") }
-		end
-
-		describe "with valid information" do
-			before do
-				attach_file('gallery_file', File.join(Rails.root, '/app/assets/images/hipster.jpg'))
-				find("form#new_gallery").submit_form!
-			end
-
-			it { should have_content(I18n.t("gallery.success"))}
-			it { File.exists? File.join(Rails.root, '/public/uploads/gallery/file/1/thumb_hipster.jpg') }
-		end
-	end
-
 	describe "show" do
 		let(:gallery) { Factory(:gallery) }
 		before do
@@ -122,4 +97,4 @@ describe "Gallery pages" do
 
 		it { page.should have_selector("img", :src => gallery.file_url) }
 	end
-end
+end

data/spec/generators/gallery_generator_spec.rb

@@ -1,53 +1,49 @@
 require 'spec_helper'
+require 'generators/adminpanel/gallery/gallery_generator'
 
-describe "adminpanel:gallery" do
+describe Adminpanel::Generators::GalleryGenerator do
+  destination File.expand_path("../../dummy/tmp", __FILE__)
 
-  with_args :Product do
-    it 'should generate the model' do
-      subject.should generate('app/models/adminpanel/productfile.rb'){ |content|
-        content.should =~ /attr_accessible :product_id, :file/ &&
-        content.should =~ /mount_uploader :file, ProductfileUploader/
-      }
+  before do
+    Rails::Generators.options[:rails][:orm] = :active_record
+  end
+
+  # after do
+  #   prepare_destination
+  # end
+
+  describe 'with "product" as argument' do
+    before do
+      prepare_destination
+      run_generator %w(Product)
     end
 
-    it 'should generate the uploader' do
-      subject.should generate('app/uploader/adminpanel/productfile_uploader.rb')
+    it 'should generate the productfile migration' do
+      migration_file('db/migrate/create_adminpanel_productfiles_table.rb').should
+        be_a_migration
     end
 
-    # it 'should generate the migration' do
-    #   subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_productfields_table.rb"){|content|
-    #     content.should =~ /t.integer :product_id/
-    #   }
-    #
-    # end
-  #
-  #   it "should generate the default category model" do
-  #     subject.should generate("app/models/adminpanel/category.rb")
-  #   end
-  #
-  #   it 'should generate the categories migration' do
-  #     subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
-  #   end
-  # end
-  #
-  # with_args :'-c', :false do
-  #   it "shouldn't generate the default category model" do
-  #     subject.should_not generate("app/models/adminpanel/category.rb")
-  #   end
-  #
-  #   it "shouldn't generate the categories migration" do
-  #     subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
-  #   end
-  #
-  #   it "should generate the initialization migration" do
-  #     subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_tables.rb")
-  #   end
-  #
-  # end
-  #
-  # it 'should generate the configuration initializer' do
-  #   subject.should generate('config/initializers/adminpanel_setup.rb'){ |content|
-  #     content.should =~ /Adminpanel.setup do |config|/
-  #   }
+
+    it 'should migrate the correct fields' do
+      migration_file('db/migrate/create_adminpanel_productfiles_table.rb').should(
+        contain(/t.integer :product_id/) &&
+        contain(/create_table :adminpanel_productfiles/)
+      )
+    end
+
+    it 'should generate the productfile model with uploader and attr_accessible' do
+      file('app/models/adminpanel/productfile.rb').should(
+        contain(/attr_accessible :product_id, :file/) &&
+        contain(/mount_uploader :file, ProductfileUploader/)
+      )
+    end
+
+    it 'should generate the productfile model with uploader and attr_accessible' do
+      file('app/models/adminpanel/productfile.rb').should exist
+    end
+
+    it 'should the produfile uploader' do
+      file('app/uploaders/adminpanel/productfile_uploader.rb').should exist
+    end
   end
 end

data/spec/generators/initialize_generator_spec.rb

@@ -1,41 +1,68 @@
 require 'spec_helper'
+require 'generators/adminpanel/initialize/initialize_generator'
 
-describe "adminpanel:initialize" do
+describe Adminpanel::Generators::InitializeGenerator do
+  destination File.expand_path("../../dummy/tmp", __FILE__)
 
-  context "with no arguments or options" do
-    it "should generate the initialization migration" do
-      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i + 1}_create_adminpanel_tables.rb")
+  before do
+    Rails::Generators.options[:rails][:orm] = :active_record
+  end
+
+  after do
+    prepare_destination
+  end
+
+  describe 'with no arguments' do
+    before do
+      prepare_destination
+      run_generator
     end
 
-    it "should generate the default category model" do
-      subject.should generate("app/models/adminpanel/category.rb")
+    it 'should generate the initial migration' do
+      migration_file('db/migrate/create_adminpanel_tables.rb').should be_a_migration
+    end
+
+    it 'should generate the adminpanel_setup file' do
+      file('config/initializers/adminpanel_setup.rb').should exist
     end
 
     it 'should generate the categories migration' do
-      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
+      migration_file('db/migrate/create_adminpanel_categories_table.rb').should be_a_migration
     end
 
-    it 'should generate the configuration initializer' do
-      subject.should generate('config/initializers/adminpanel_setup.rb'){ |content|
-        content.should =~ /Adminpanel.setup do |config|/
-      }
+    it 'should generate the category file' do
+      file('app/models/adminpanel/category.rb').should exist
+    end
+
+    it 'should generate the section uploader' do
+      file('app/uploaders/adminpanel/section_uploader.rb').should exist
     end
   end
 
-  with_args :'-c', :true, :'-u', :true, :'-m', :true do
+  describe 'with arguments -c true -u true -m true -p true' do
+    before do
+      prepare_destination
+      run_generator %w(-c true -u true -m true -p true)
+    end
 
-    it "shouldn't generate the default category model" do
-      subject.should_not generate("app/models/adminpanel/category.rb")
+    it 'should\'t generate the adminpanel_setup' do
+      file('config/initializers/adminpanel_setup.rb').should_not exist
     end
 
-    it "shouldn't generate the categories migration" do
-      subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
+    it 'should\'t generate the initial migration' do
+      migration_file('db/migrate/create_adminpanel_categories_table.rb').should_not exist
     end
 
-    it "shouldn't generate the initialization migration" do
-      subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i + 1}_create_adminpanel_tables.rb")
+    it 'should\'t genearte the section uploader' do
+      file('app/uploaders/adminpanel/section_uploader.rb').should_not exist
     end
 
-  end
+    it 'should\'t generate the categories migration' do
+      migration_file('db/migrate/create_adminpanel_categories_table.rb').should_not exist
+    end
 
+    it 'should\'t generate the category file' do
+      file('app/models/adminpanel/category.rb').should_not exist
+    end
+  end
 end