puffer_pages 0.1.0 → 0.1.1

data/lib/puffer_pages.rb

@@ -15,6 +15,9 @@ module PufferPages
   mattr_accessor :single_section_page_path
   self.single_section_page_path = false
 
+  mattr_accessor :codemirror_buttons
+  self.codemirror_buttons = [:fullscreen]
+
   def self.setup
     yield self
   end
@@ -29,6 +32,8 @@ require 'puffer_pages/engine'
 require 'puffer_pages/extensions/core'
 require 'puffer_pages/extensions/mapper'
 require 'puffer_pages/extensions/controller'
+
 require 'puffer_pages/liquid/tags/yield'
 require 'puffer_pages/liquid/tags/stylesheets'
 require 'puffer_pages/liquid/tags/javascripts'
+require 'puffer_pages/liquid/tags/page_attribute'

data/lib/puffer_pages/extensions/controller.rb

@@ -5,27 +5,23 @@ module PufferPages
         extend ActiveSupport::Concern
 
         included do
-          helper_method :layout_page, :layout_page_drops
+          helper_method :layout_page, :default_drops
         end
 
-        module InstanceMethods
-          def puffer_pages
-            'puffer_pages_layout'
-          end
-
-          def layout_page
-            @layout_page ||= ::Page.find_layout_page(request.path_info)
-          end
-
-          def layout_page_drops
-            {
-              :self => PufferPages::Liquid::PageDrop.new(layout_page, layout_page, self),
-              :root => PufferPages::Liquid::PageDrop.new(layout_page.root, layout_page, self)
-            }.merge(@drops.presence || {}).stringify_keys
-          end
+        def puffer_pages
+          'puffer_pages_layout'
+        end
 
+        def layout_page
+          @layout_page ||= ::Page.find_layout_page(@layout_path.presence || request.path_info)
         end
 
+        def default_drops page
+          {
+            :self => PufferPages::Liquid::PageDrop.new(page, page, self),
+            :root => PufferPages::Liquid::PageDrop.new(page.root, page, self)
+          }.stringify_keys
+        end
       end
     end
   end

data/lib/puffer_pages/extensions/mapper.rb

@@ -7,22 +7,16 @@ module PufferPages
         class_attribute :_puffer_pages
       end
 
-      module InstanceMethods
-
-        def puffer_pages_options
-          self.class._puffer_pages.presence || [{'(*path)' => 'pages#index', :as => 'puffer_page'}]
-        end
-
-        def puffer_pages *args
-          options = args.extract_options!
-          options.merge! :as => 'puffer_page'
-          self.class._puffer_pages = args.push(options)
-        end
-
+      def puffer_pages_options
+        self.class._puffer_pages.presence || [{'(*path)' => 'pages#index', :as => 'puffer_page'}]
       end
 
+      def puffer_pages *args
+        options = args.extract_options!
+        options.merge! :as => 'puffer_page'
+        self.class._puffer_pages = args.push(options)
+      end
     end
-
   end
 end
 

data/lib/puffer_pages/liquid/tags/page_attribute.rb

@@ -0,0 +1,39 @@
+module PufferPages
+  module Liquid
+    module Tags
+
+      class PageAttribute < ::Liquid::Tag
+        Syntax = /^(#{::Liquid::QuotedFragment})/
+
+        def initialize(tag_name, markup, tokens)
+          @tag_name = tag_name
+
+          if markup =~ Syntax
+            @page = $1
+          elsif markup.blank?
+            @page = 'self'
+          else
+            raise SyntaxError.new("Syntax Error in '#{tag_name}' - Valid syntax: #{tag_name} [page]")
+          end
+
+          super
+        end
+
+        def render(context)
+          page = context[@page]
+
+          context.stack do
+            context['self'] = page
+            ::Liquid::Template.parse(page[@tag_name]).render(context)
+          end
+        end
+      end
+
+    end
+  end
+end
+
+Liquid::Template.register_tag('name', PufferPages::Liquid::Tags::PageAttribute)
+Liquid::Template.register_tag('title', PufferPages::Liquid::Tags::PageAttribute)
+Liquid::Template.register_tag('keywords', PufferPages::Liquid::Tags::PageAttribute)
+Liquid::Template.register_tag('description', PufferPages::Liquid::Tags::PageAttribute)

data/lib/puffer_pages/version.rb

@@ -1,3 +1,3 @@
 module PufferPages
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/puffer_pages.gemspec

@@ -19,20 +19,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
+  s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
   s.add_runtime_dependency(%q<puffer>, [">= 0"])
   s.add_runtime_dependency(%q<liquid>, [">= 0"])
   s.add_runtime_dependency(%q<nested_set>, [">= 0"])
 
+  s.add_development_dependency(%q<bcrypt-ruby>, [">= 0"])
   s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
   s.add_development_dependency(%q<pg>, [">= 0"])
   s.add_development_dependency(%q<mysql>, [">= 0"])
   s.add_development_dependency(%q<rspec-rails>, [">= 0"])
   s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
   s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-  s.add_development_dependency(%q<guard>, [">= 0"])
-  s.add_development_dependency(%q<libnotify>, [">= 0"])
-  s.add_development_dependency(%q<guard-rspec>, [">= 0"])
   s.add_development_dependency(%q<forgery>, [">= 0"])
   s.add_development_dependency(%q<fabrication>, [">= 0"])
+
+  s.add_development_dependency(%q<guard>, [">= 0"])
+  s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+  s.add_development_dependency(%q<libnotify>, [">= 0"])
+  s.add_development_dependency(%q<rb-inotify>, [">= 0"])
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,4 +4,8 @@ class ApplicationController < ActionController::Base
   def has_puffer_access? namespace
     true
   end
+
+  def current_puffer_user
+  	nil
+  end
 end

data/spec/lib/tags_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'Tags' do
 
-  def render_page(page)
-    page.render 'self' => PufferPages::Liquid::PageDrop.new(page)
+  def render_page(page, drops = {})
+    page.render({'self' => PufferPages::Liquid::PageDrop.new(page)}.merge(drops))
   end
 
   describe 'include page part' do
@@ -16,7 +16,7 @@ describe 'Tags' do
     end
 
     it 'should include page_part with string param' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include 'body' %}"
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include '#{PufferPages.primary_page_part_name}' %}"
       render_page(@page).should == @main.body
     end
 
@@ -72,5 +72,27 @@ describe 'Tags' do
 
   end
 
+  describe 'attributes: name, title, keywords, description' do
+
+    it 'should render self title without params' do
+      @page = Fabricate :page, :layout_name => 'foo_layout', :name => 'hello', :title => '{{self.name}}',
+        :page_parts => [Fabricate(:page_part, :name => PufferPages.primary_page_part_name, :body => '{% title %}')]
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include '#{PufferPages.primary_page_part_name}' %}"
+
+      render_page(@page).should == "hello"
+    end
+
+    it 'should render page title with param and should get page drop as self internally' do
+      @root = Fabricate :page, :layout_name => 'foo_layout', :name => 'hello', :title => '{{self.name}}',
+        :page_parts => [Fabricate(:page_part, :name => PufferPages.primary_page_part_name, :body => '{% title page %}')]
+      @page = Fabricate :page, :parent => @root, :slug => 'foo', :name => 'world', :title => '{{self.name}}'
+
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include '#{PufferPages.primary_page_part_name}' %}"
+      
+      render_page(@root, 'page' => PufferPages::Liquid::PageDrop.new(@page)).should == "world"
+    end
+
+  end
+
 
 end

data/spec/models/page_spec.rb

@@ -210,7 +210,6 @@ describe Page do
     end
 
     it 'root page' do
-      pending 'maybe'
       Page.find_layout_page('/').should == @root
     end
 
@@ -223,12 +222,12 @@ describe Page do
     end
 
     it 'not existent page' do
-      expect {Page.find_layout_page('/bar') }.to raise_error(PufferPages::LayoutMissed)
+      expect {Page.find_layout_page('/bar')}.to raise_error(PufferPages::LayoutMissed)
     end
 
     it 'draft page' do
       @bar.update_attributes(:status => 'draft')
-      expect {Page.find_layout_page('/foo/bar') }.to raise_error(PufferPages::LayoutMissed)
+      expect {Page.find_layout_page('/foo/bar')}.to raise_error(PufferPages::LayoutMissed)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer_pages
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23455340 !ruby/object:Gem::Requirement
+  requirement: &69827603712780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *23455340
+  version_requirements: *69827603712780
 - !ruby/object:Gem::Dependency
   name: puffer
-  requirement: &23454400 !ruby/object:Gem::Requirement
+  requirement: &69827603709460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23454400
+  version_requirements: *69827603709460
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &23453240 !ruby/object:Gem::Requirement
+  requirement: &69827603707120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23453240
+  version_requirements: *69827603707120
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &23434020 !ruby/object:Gem::Requirement
+  requirement: &69827603704680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23434020
+  version_requirements: *69827603704680
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: &69827603701960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69827603701960
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &23431860 !ruby/object:Gem::Requirement
+  requirement: &69827603697880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23431860
+  version_requirements: *69827603697880
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &23430680 !ruby/object:Gem::Requirement
+  requirement: &69827603696180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23430680
+  version_requirements: *69827603696180
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &23429120 !ruby/object:Gem::Requirement
+  requirement: &69827603693480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23429120
+  version_requirements: *69827603693480
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &23427560 !ruby/object:Gem::Requirement
+  requirement: &69827603685520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23427560
+  version_requirements: *69827603685520
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &23411180 !ruby/object:Gem::Requirement
+  requirement: &69827603680780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *23411180
+  version_requirements: *69827603680780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &23409380 !ruby/object:Gem::Requirement
+  requirement: &69827603672120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23409380
+  version_requirements: *69827603672120
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &23407800 !ruby/object:Gem::Requirement
+  name: forgery
+  requirement: &69827603663820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23407800
+  version_requirements: *69827603663820
 - !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: &23406600 !ruby/object:Gem::Requirement
+  name: fabrication
+  requirement: &69827603658620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23406600
+  version_requirements: *69827603658620
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &69827603656080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69827603656080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &23405560 !ruby/object:Gem::Requirement
+  requirement: &69827603653780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23405560
+  version_requirements: *69827603653780
 - !ruby/object:Gem::Dependency
-  name: forgery
-  requirement: &23403900 !ruby/object:Gem::Requirement
+  name: libnotify
+  requirement: &69827603652080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23403900
+  version_requirements: *69827603652080
 - !ruby/object:Gem::Dependency
-  name: fabrication
-  requirement: &23387460 !ruby/object:Gem::Requirement
+  name: rb-inotify
+  requirement: &69827603649100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23387460
+  version_requirements: *69827603649100
 description: Puffer pages is integratable rails CMS with puffer admin interface
 email:
 - kinwizard@gmail.com
@@ -185,6 +207,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -196,19 +221,21 @@ files:
 - app/assets/javascripts/puffer/codemirror/htmlmixed.js
 - app/assets/javascripts/puffer/codemirror/javascript.js
 - app/assets/javascripts/puffer/codemirror/xml.js
+- app/assets/javascripts/puffer/liquid.js
 - app/assets/javascripts/puffer/overlay.js
 - app/assets/javascripts/puffer/puffer_pages.js
 - app/assets/javascripts/puffer/right-tabs-src.js
 - app/assets/stylesheets/puffer/codemirror.css
 - app/assets/stylesheets/puffer/codemirror/cobalt.css
-- app/assets/stylesheets/puffer/codemirror/default.css
 - app/assets/stylesheets/puffer/codemirror/eclipse.css
 - app/assets/stylesheets/puffer/codemirror/elegant.css
+- app/assets/stylesheets/puffer/codemirror/monokai.css
 - app/assets/stylesheets/puffer/codemirror/neat.css
 - app/assets/stylesheets/puffer/codemirror/night.css
+- app/assets/stylesheets/puffer/codemirror/rubyblue.css
 - app/assets/stylesheets/puffer/puffer_pages.css
-- app/components/page_part_body/form.html.erb
-- app/components/page_part_body_component.rb
+- app/components/codemirror/form.html.erb
+- app/components/codemirror_component.rb
 - app/components/page_parts/form.html.erb
 - app/components/page_parts_component.rb
 - app/components/render/_tree_page.html.erb
@@ -235,6 +262,10 @@ files:
 - db/migrate/20090504132337_create_page_parts.rb
 - db/migrate/20090506102004_create_layouts.rb
 - db/migrate/20090510121824_create_snippets.rb
+- gemfiles/Gemfile-rails-3.1
+- gemfiles/Gemfile-rails-3.1.lock
+- gemfiles/Gemfile-rails-3.2
+- gemfiles/Gemfile-rails-3.2.lock
 - lib/puffer_pages.rb
 - lib/puffer_pages/engine.rb
 - lib/puffer_pages/extensions/controller.rb
@@ -243,6 +274,7 @@ files:
 - lib/puffer_pages/liquid/file_system.rb
 - lib/puffer_pages/liquid/page_drop.rb
 - lib/puffer_pages/liquid/tags/javascripts.rb
+- lib/puffer_pages/liquid/tags/page_attribute.rb
 - lib/puffer_pages/liquid/tags/stylesheets.rb
 - lib/puffer_pages/liquid/tags/yield.rb
 - lib/puffer_pages/liquid/tracker.rb
@@ -318,7 +350,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4249628507511059598
+      hash: 799277004253962049
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,10 +359,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4249628507511059598
+      hash: 799277004253962049
 requirements: []
 rubyforge_project: puffer_pages
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Content Management System