constructor-pages 0.3.0 → 0.3.1

data/app/assets/javascripts/constructor_pages/ajax_pages.js

@@ -52,6 +52,10 @@ function update_page(href) {
 
         update_pages();
 
+        if (typeof Retina != 'undefined') {
+            Retina.update();
+        }
+
         eval(page.js);
     });
 }

data/app/models/constructor_pages/field.rb

@@ -9,8 +9,8 @@ module ConstructorPages
 
     validates_uniqueness_of :code_name, :scope => :template_id
 
-    after_create :create_page_field
-    after_destroy :destroy_page_field
+    after_create :create_page_fields
+    after_destroy :destroy_page_fields
 
     belongs_to :template
 
@@ -29,17 +29,18 @@ module ConstructorPages
     private
 
     def method_uniqueness
-      if Page.first.respond_to?(code_name.pluralize) \
+      if Page.first.respond_to?(code_name) \
+      or Page.first.respond_to?(code_name.pluralize) \
       or Page.first.respond_to?(code_name.singularize) \
-      or template.self_and_ancestors.map{|t| t.code_name}.include?(code_name.pluralize) \
-      or template.self_and_ancestors.map{|t| t.code_name}.include?(code_name.singularize) \
-      or template.descendants.map{|t| t.code_name}.include?(code_name.pluralize) \
-      or template.descendants.map{|t| t.code_name}.include?(code_name.singularize)
+      or template.self_and_ancestors.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.pluralize) \
+      or template.self_and_ancestors.map{|t| t.code_name t.code_name == code_name}.include?(code_name.singularize) \
+      or template.descendants.map{|t| t.code_name t.code_name == code_name}.include?(code_name.pluralize) \
+      or template.descendants.map{|t| t.code_name t.code_name == code_name}.include?(code_name.singularize)
         errors.add(:base, "Такой метод уже используется")
       end
     end
 
-    def create_page_field
+    def create_page_fields
       self.template.pages.each do |page|
         "constructor_pages/types/#{type_value}_type".classify.constantize.create(
           :page_id => page.id,
@@ -48,7 +49,7 @@ module ConstructorPages
       end
     end
 
-    def destroy_page_field
+    def destroy_page_fields
       self.template.pages.each do |page|
         "constructor_pages/types/#{type_value}_type".classify.constantize.destroy_all(
             :page_id => page.id,

data/app/models/constructor_pages/template.rb

@@ -18,10 +18,11 @@ module ConstructorPages
     private
 
     def method_uniqueness
-      if Page.first.respond_to?(code_name.pluralize) \
+      if Page.first.respond_to?(code_name) \
+      or Page.first.respond_to?(code_name.pluralize) \
       or Page.first.respond_to?(code_name.singularize) \
-      or root.descendants.map{|t| t.code_name}.include?(code_name.pluralize) \
-      or root.descendants.map{|t| t.code_name}.include?(code_name.singularize) \
+      or root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.pluralize) \
+      or root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.singularize) \
 
         errors.add(:base, "Такой метод уже используется")
       end

data/constructor-pages.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{constructor-pages}
-  s.version           = '0.3.0'
+  s.version           = '0.3.1'
   s.summary           = %q{Pages for ConstructorCms}
   s.authors           = ['Ivan Zotov']
   s.require_paths     = %w(lib)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly