page_parts 0.0.2 → 0.0.3

data/lib/page_parts/active_record_extension.rb

@@ -28,11 +28,11 @@ module PageParts
             self.page_parts_definitions[:keys] << method_name
                     
             define_method(method_name) do
-              page_part(method_name).try(:content)
+              _page_part(method_name).try(:content)
             end
             
             define_method("#{method_name}=") do |value|
-              record = page_part(method_name)
+              record = _page_part(method_name)
               record.content = value
             end
           end
@@ -40,33 +40,36 @@ module PageParts
       end
     end
     
-    module InstanceMethods
+    # Find page part by key or build new record
+    def find_or_build_page_part(attr_name)
+      key = normalize_page_part_key(attr_name)
+      #self.page_parts.where(:key => key).first || self.page_parts.build(:key => key)
+      self.page_parts.detect { |record| record.key.to_s == key } || self.page_parts.build(:key => key)
+    end
+    
+    def reload(options = nil)
+      @cached_page_parts = nil
+      super
+    end
+    
+    protected
     
-      # Find page part by key or build new record
-      def find_or_build_page_part(attr_name)
-        key = normalize_page_part_key(attr_name)
-        self.page_parts.where(:key => key).first || self.page_parts.build(:key => key)
-      end
-      
       # Save page parts records into one hash
-      def page_part(attr_name)
+      def _page_part(attr_name)
         key = normalize_page_part_key(attr_name)
-        @page_part ||= {}
-        @page_part[key] ||= find_or_build_page_part(key)
+        @cached_page_parts ||= {}
+        @cached_page_parts[key] ||= find_or_build_page_part(key)
       end
-      
-      protected
-      
-        def normalize_page_part_key(value)
-          key = value.to_s.downcase.strip
-          
-          unless self.page_parts_definitions[:keys].include?(key)
-            raise NoMethodError, "Page part #{key} not registered"
-          end
-          
-          key
+    
+      def normalize_page_part_key(value)
+        key = value.to_s.downcase.strip
+        
+        unless self.page_parts_definitions[:keys].include?(key)
+          raise NoMethodError, "Page part #{key} not registered"
         end
+        
+        key
+      end
       
-    end
   end
 end

data/lib/page_parts/version.rb

@@ -1,3 +1,3 @@
 module PageParts
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/log/test.log

@@ -782,3 +782,72 @@ Migrating to CreatePosts (20120124093705)
   SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", nil], ["created_at", Tue, 24 Jan 2012 09:45:43 UTC +00:00], ["key", "content_ru"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Tue, 24 Jan 2012 09:45:43 UTC +00:00]]
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  SELECT COUNT(*) FROM "page_parts" 
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePageParts (20111226144515)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateCategories (20111226131910)
+Migrating to CreatePosts (20120124093705)
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.2ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'sidebar' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+  SQL (1.1ms)  INSERT INTO "categories" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["title", "Test category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Sidebar"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "sidebar"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.1ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Main"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "content"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Category Load (0.1ms)  SELECT "categories".* FROM "categories" WHERE "categories"."id" = ? LIMIT 1  [["id", 1]]
+  PagePart Load (0.1ms)  SELECT "page_parts".* FROM "page_parts" WHERE "page_parts"."partable_id" = 1 AND "page_parts"."partable_type" = 'Category'
+   (0.1ms)  SELECT COUNT(*) FROM "page_parts" 
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'sidebar' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+  SQL (0.2ms)  INSERT INTO "categories" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["title", "Test category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Sidebar content"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "sidebar"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", nil], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "content"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "page_parts" 
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'sidebar' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+  SQL (0.2ms)  INSERT INTO "categories" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["title", "Test category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Sidebar"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "sidebar"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.1ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Main"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "content"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Category Load (0.0ms)  SELECT "categories".* FROM "categories" WHERE "categories"."id" = ? LIMIT 1  [["id", 1]]
+  PagePart Load (0.1ms)  SELECT "page_parts".* FROM "page_parts" WHERE "page_parts"."partable_id" = 1 AND "page_parts"."partable_type" = 'Category'
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'sidebar' AND "page_parts"."id" != 1 AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" = 1) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content' AND "page_parts"."id" != 2 AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" = 1) LIMIT 1
+   (0.2ms)  UPDATE "page_parts" SET "content" = 'Sidebar 2', "updated_at" = '2012-01-26 12:37:57.392267' WHERE "page_parts"."id" = 1
+   (0.1ms)  UPDATE "page_parts" SET "content" = 'Main 2', "updated_at" = '2012-01-26 12:37:57.393314' WHERE "page_parts"."id" = 2
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Category Load (0.0ms)  SELECT "categories".* FROM "categories" WHERE "categories"."id" = ? LIMIT 1  [["id", 1]]
+  PagePart Load (0.1ms)  SELECT "page_parts".* FROM "page_parts" WHERE "page_parts"."partable_id" = 1 AND "page_parts"."partable_type" = 'Category'
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'somekey' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" = 1) LIMIT 1
+  SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", nil], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "somekey"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = '' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" = 1) LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", nil], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "test"], ["partable_id", 1], ["partable_type", "Category"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'test' AND "page_parts"."partable_type" = 'Category' AND "page_parts"."partable_id" = 1) LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'title_ru' AND "page_parts"."partable_type" = 'Post' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content_uk' AND "page_parts"."partable_type" = 'Post' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+  SQL (0.5ms)  INSERT INTO "posts" ("created_at", "is_visible", "updated_at") VALUES (?, ?, ?)  [["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["is_visible", true], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.3ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Sidebar"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "title_ru"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Main"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "content_uk"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 1]]
+  PagePart Load (0.1ms)  SELECT "page_parts".* FROM "page_parts" WHERE "page_parts"."partable_id" = 1 AND "page_parts"."partable_type" = 'Post'
+   (0.1ms)  SELECT COUNT(*) FROM "page_parts" 
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'title_ru' AND "page_parts"."partable_type" = 'Post' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'title_en' AND "page_parts"."partable_type" = 'Post' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT 1 FROM "page_parts" WHERE ("page_parts"."key" = 'content_ru' AND "page_parts"."partable_type" = 'Post' AND "page_parts"."partable_id" IS NULL) LIMIT 1
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "is_visible", "updated_at") VALUES (?, ?, ?)  [["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["is_visible", true], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Title ru"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "title_ru"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.1ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", "Title en"], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "title_en"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "page_parts" ("content", "created_at", "key", "partable_id", "partable_type", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["content", nil], ["created_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00], ["key", "content_ru"], ["partable_id", 1], ["partable_type", "Post"], ["updated_at", Thu, 26 Jan 2012 12:37:57 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "page_parts" 

data/test/models/category_test.rb

@@ -18,8 +18,8 @@ class CategoryTest < ActiveSupport::TestCase
     value = "Sidebar content"
     @category.sidebar = value
     
-    assert_equal @category.page_part(:sidebar).content, value
-    assert_equal @category.page_part(:content).content, nil
+    assert_equal @category.send(:_page_part, :sidebar).content, value
+    assert_equal @category.send(:_page_part, :content).content, nil
     
     assert_difference('PagePart.count', 2) do
       @category.save
@@ -37,6 +37,24 @@ class CategoryTest < ActiveSupport::TestCase
     assert_equal @category.content, "Main"
   end
   
+  test "should update page parts" do
+    @category.sidebar = "Sidebar"
+    @category.content = "Main"
+    @category.save
+    
+    @category.reload
+    
+    assert_equal @category.sidebar, "Sidebar"
+    assert_equal @category.content, "Main"
+    
+    @category.update_attributes(:sidebar => "Sidebar 2", :content => "Main 2")
+    
+    @category.reload
+    
+    assert_equal @category.sidebar, "Sidebar 2"
+    assert_equal @category.content, "Main 2"
+  end
+  
   test "should raise error on not registered page part" do
     assert_raise(NoMethodError) do
       @category.wrong_method

data/test/models/post_test.rb

@@ -17,9 +17,9 @@ class PostTest < ActiveSupport::TestCase
     value_en = "Title en"
     @post.title_en = value_en
     
-    assert_equal @post.page_part(:title_ru).content, value_ru
-    assert_equal @post.page_part(:title_en).content, value_en
-    assert_equal @post.page_part(:content_ru).content, nil
+    assert_equal @post.send(:_page_part, :title_ru).content, value_ru
+    assert_equal @post.send(:_page_part, :title_en).content, value_en
+    assert_equal @post.send(:_page_part, :content_ru).content, nil
     
     assert_difference('PagePart.count', 3) do
       @post.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_parts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &80855800 !ruby/object:Gem::Requirement
+  requirement: &74313950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *80855800
+  version_requirements: *74313950
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &80854830 !ruby/object:Gem::Requirement
+  requirement: &74313740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80854830
+  version_requirements: *74313740
 description: Aimbulance CMS
 email:
 - galeta.igor@gmail.com