adminpanel 1.2.5 → 1.2.6

data/spec/support/test_database.rb

@@ -14,8 +14,7 @@ ActiveRecord::Migration.create_table :adminpanel_galleries do |t|
 end
 ActiveRecord::Migration.create_table :adminpanel_images do |t|
     t.string   :file
-    t.string   :foreign_key
-    t.string   :model
+    t.string   :section_id
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
@@ -26,6 +25,12 @@ ActiveRecord::Migration.create_table :adminpanel_products do |t|
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
+ActiveRecord::Migration.create_table :adminpanel_photos do |t|
+    t.string   :file
+    t.text     :product_id
+    t.datetime :created_at,      :null => false
+    t.datetime :updated_at,      :null => false
+end
 ActiveRecord::Migration.create_table :adminpanel_categories do |t|
     t.string   :name
     t.datetime :created_at,      :null => false
@@ -61,4 +66,4 @@ RSpec.configure do |config|
       raise ActiveRecord::Rollback
     end
   end
-end
+end

data/spec/tasks/adminpanel_rake_spec.rb

@@ -7,16 +7,16 @@ describe "adminpanel rake task" do
     Rake::Task.define_task(:environment)
   end
 
-  describe "adminpanel:populate[20, product, name:name description:lorem price:number]" do
+  describe "adminpanel:populate[10, product, name:name description:lorem price:number]" do
 
     let(:has_nil_attribute) { false }
     before do
-      Rake.application.invoke_task "adminpanel:populate[20, product, name:name description:lorem price:number]"
+      Rake.application.invoke_task "adminpanel:populate[10, product, name:name description:lorem price:number]"
     end
 
 
-    it "should generate 20 product records" do
-      Adminpanel::Product.all.count.should eq 20
+    it "should generate 10 product records" do
+      Adminpanel::Product.all.count.should eq 10
     end
 
     it "attributes shouldn't be nil" do
@@ -40,7 +40,7 @@ describe "adminpanel rake task" do
         (Adminpanel::Section.last.name.should eq("Mission")) &&
         (Adminpanel::Section.last.page.should eq("about")) &&
         (Adminpanel::Section.last.key.should eq("mission")) &&
-        (Adminpanel::Section.last.has_description.should be_true) &&
+        (Adminpanel::Section.last.has_description.should be_false) &&
         (Adminpanel::Section.last.has_image.should be_false)
       )
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-19 00:00:00 -06:00
+date: 2014-03-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -420,7 +420,6 @@ files:
 - app/controllers/adminpanel/users_controller.rb
 - app/helpers/adminpanel/application_helper.rb
 - app/helpers/adminpanel/breadcrumbs_helper.rb
-- app/helpers/adminpanel/class_definitions_helper.rb
 - app/helpers/adminpanel/custom_form_builder.rb
 - app/helpers/adminpanel/pluralizations_helper.rb
 - app/helpers/adminpanel/rest_actions_helper.rb
@@ -450,7 +449,6 @@ files:
 - app/views/adminpanel/galleries/show.html.erb
 - app/views/adminpanel/galleries/update.html.erb
 - app/views/adminpanel/pages/index.html.erb
-- app/views/adminpanel/sections/_image_fields.html.erb
 - app/views/adminpanel/sections/_sections_table.html.erb
 - app/views/adminpanel/sections/edit.html.erb
 - app/views/adminpanel/sections/index.html.erb
@@ -473,14 +471,19 @@ files:
 - config/locales/es.yml
 - config/routes.rb
 - lib/adminpanel.rb
-- lib/adminpanel/active_record_extension.rb
+- lib/adminpanel/active_record/adminpanel_extension.rb
 - lib/adminpanel/engine.rb
 - lib/adminpanel/version.rb
+- lib/generators/adminpanel/gallery/gallery_generator.rb
+- lib/generators/adminpanel/gallery/templates/gallery_migration.rb
+- lib/generators/adminpanel/gallery/templates/gallery_template.rb
+- lib/generators/adminpanel/gallery/templates/uploader.rb
 - lib/generators/adminpanel/initialize/initialize_generator.rb
 - lib/generators/adminpanel/initialize/templates/adminpanel_setup.rb
 - lib/generators/adminpanel/initialize/templates/category_template.rb
 - lib/generators/adminpanel/initialize/templates/create_adminpanel_categories_table.rb
 - lib/generators/adminpanel/initialize/templates/create_adminpanel_tables.rb
+- lib/generators/adminpanel/initialize/templates/section_uploader.rb
 - lib/generators/adminpanel/resource/resource_generator.rb
 - lib/generators/adminpanel/resource/templates/controller.rb
 - lib/generators/adminpanel/resource/templates/migration.rb
@@ -502,7 +505,10 @@ files:
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/adminpanel/categorization.rb
 - spec/dummy/app/models/adminpanel/category.rb
+- spec/dummy/app/models/adminpanel/photo.rb
 - spec/dummy/app/models/adminpanel/product.rb
+- spec/dummy/app/uploader/adminpanel/photo_uploader.rb
+- spec/dummy/app/uploader/adminpanel/section_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -535,6 +541,7 @@ files:
 - spec/features/galleries_pages_spec.rb
 - spec/features/section_pages_spec.rb
 - spec/features/shared_pages_spec.rb
+- spec/generators/gallery_generator_spec.rb
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
 - spec/models/gallery_spec.rb
@@ -601,7 +608,10 @@ test_files:
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/adminpanel/categorization.rb
 - spec/dummy/app/models/adminpanel/category.rb
+- spec/dummy/app/models/adminpanel/photo.rb
 - spec/dummy/app/models/adminpanel/product.rb
+- spec/dummy/app/uploader/adminpanel/photo_uploader.rb
+- spec/dummy/app/uploader/adminpanel/section_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -634,6 +644,7 @@ test_files:
 - spec/features/galleries_pages_spec.rb
 - spec/features/section_pages_spec.rb
 - spec/features/shared_pages_spec.rb
+- spec/generators/gallery_generator_spec.rb
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
 - spec/models/gallery_spec.rb

data/app/helpers/adminpanel/class_definitions_helper.rb

@@ -1,10 +0,0 @@
-module Adminpanel
-	module ClassDefinitionsHelper
-
-		def is_class?(name)
-			Module.const_get(name).is_a?(Class)
-			rescue NameError
-				return false
-		end
-	end
-end

data/app/views/adminpanel/sections/_image_fields.html.erb

@@ -1,24 +0,0 @@
-<div class="product-image">
-	<% unless f.object.new_record? %>
-		<div class="control-group">
-			<div class="controls">
-				<%= image_tag f.object.file_url(:thumb) %>
-			</div>
-		</div>
-	<% end %>
-	<div class="control-group">
-			<%= f.label t("model.Adminpanel::Image"), :class => "control-label"  %>
-		<div class="controls">
-			<%= f.file_field :file %>
-			<%= f.hidden_field :model, :value => model_name %>
-			<%= f.hidden_field :_destroy %>
-			<%= 
-			content_tag(
-				:button, 
-				t("action.delete"), 
-				:class => "btn btn-danger remove_fields"
-			) 
-			%>
-		</div>
-	</div>
-</div>

data/lib/adminpanel/active_record_extension.rb

@@ -1,123 +0,0 @@
-module ActiveRecordExtension
-  extend ActiveSupport::Concern
-  #instance methods
-  # def foo
-
-  # end
-
-  # static(class) methods
-  module ClassMethods
-    def form_attributes
-      [{
-        "name" => {
-          "type" => "text_field",
-          "name" => "name"
-        }
-      }]
-    end
-
-    def display_name
-      "display_name"
-    end
-
-    def get_attribute_name(field)
-      form_attributes.each do |attribute|
-        attribute.each do |name, properties|
-          if name == field
-            return properties["name"]
-          end
-        end
-      end
-      return ":("
-    end
-
-
-    def get_attribute_name(field)
-      form_attributes.each do |attribute|
-        attribute.each do |name, properties|
-          if name == field
-            return properties["name"]
-          end
-        end
-      end
-      return ":("
-    end
-
-    def get_attribute_label(field)
-      form_attributes.each do |attribute|
-        attribute.each do |name, properties|
-          if name == field
-            return properties["label"]
-          end
-        end
-      end
-      return ":("
-    end
-
-    def get_attribute_placeholder(field)
-      form_attributes.each do |attribute|
-        attribute.each do |name, properties|
-          if name == field
-            return properties["placeholder"]
-          end
-        end
-      end
-      return ":("
-    end
-
-    def display_attributes
-      display_attributes = []
-      form_attributes.each do |attribute|
-        attribute.each do |name, properties|
-          if properties["show"].nil? || properties["show"] == "true"
-            display_attributes << attribute
-          end
-        end
-      end
-
-      return display_attributes
-    end
-
-    def has_images?
-      form_attributes.each do |fields|
-      fields.each do |attribute, properties|
-        if properties["type"] == "adminpanel_file_field"
-          return true
-        end
-      end
-      end
-      return false
-    end
-
-    def belongs_to_relationships
-      belongs_to_classes = []
-      form_attributes.each do |fields|
-      fields.each do |attribute, properties|
-        if properties["type"] == "belongs_to"
-          belongs_to_classes << properties["model"].classify.constantize
-        end
-      end
-      end
-      return belongs_to_classes
-    end
-
-    def has_many_relationships
-      has_many_classes = []
-      form_attributes.each do |fields|
-      fields.each do |attribute, properties|
-        if properties["type"] == "has_many"
-          has_many_classes << properties["model"].classify.constantize
-        end
-      end
-      end
-      return has_many_classes
-    end
-
-    def icon
-      "icon-truck"
-    end
-  end
-end
-
-# include the extension
-ActiveRecord::Base.send(:include, ActiveRecordExtension)