adva-static 0.0.9 → 0.0.11

data/lib/adva/static/import/source/section.rb

@@ -0,0 +1,39 @@
+module Adva
+  class Static
+    class Import
+      module Source
+        class Section < Base
+          TYPES = [Blog, Page]
+
+          class << self
+            def recognize(paths)
+              TYPES.map { |type| type.recognize(paths) }.flatten.compact.sort
+            end
+          end
+
+          def root?
+            path.root?
+          end
+
+          def name
+            @name ||= read.name || (root? ? 'Home' : path.filename.to_s.titleize)
+          end
+
+          def slug
+            @slug ||= read.slug || SimpleSlugs::Slug.new(name).to_s
+          end
+
+          def data
+            super.merge(:name => name, :slug => slug)
+          end
+
+          protected
+
+            def loadable
+              path.find('index') || path.parent.find(path.filename) || path
+            end
+        end
+      end
+    end
+  end
+end

data/lib/adva/static/import/source/site.rb

@@ -0,0 +1,44 @@
+require 'hashr'
+
+module Adva
+  class Static
+    class Import
+      module Source
+        class Site < Base
+          class << self
+            def recognize(paths)
+              paths.map { |path| new(path.delete(path).root) if path.filename == 'site' }.compact.sort # TODO ???
+            end
+          end
+
+          def sections
+            @sections ||= Section.recognize(path.glob.delete_if { |path| path.filename == 'site' })
+          end
+
+          def host
+            @host ||= read.host || File.basename(path.root)
+          end
+
+          def name
+            @name ||= read.name || host.titleize
+          end
+
+          def title
+            @title ||= read.title || name
+          end
+
+          def data
+            super.merge(:sections => sections, :host => host, :name => name, :title => title)
+          end
+
+          protected
+
+            def loadable
+              @loadable ||= path.join('site.yml')
+            end
+        end
+      end
+    end
+  end
+end
+

data/lib/adva/static/server.rb

@@ -0,0 +1,38 @@
+require 'adva'
+require 'rack/server'
+
+module Adva
+  class Static
+    module Server
+      PURGE_HEADER = 'rack-cache.purge'
+      STORE_HEADER = 'rack-static.store'
+
+      autoload :Request, 'adva/static/server/request'
+      autoload :Export,  'adva/static/server/export'
+      autoload :Static,  'adva/static/server/static'
+      autoload :Watch,   'adva/static/server/watch'
+
+      class << self
+        def start(options = {})
+          require 'config/environment.rb'
+
+          Rails::Application.configure do
+            ActionController::Base.allow_forgery_protection = false
+          end
+
+          app = ::Rack::Builder.new {
+            use Adva::Static::Server::Watch
+            use Adva::Static::Server::Export
+            use Adva::Static::Server::Static, File.expand_path(options[:root])
+            run Rails.application
+          }.to_app
+
+          server = ::Rack::Server.new(:environment => options[:environment], :Port => options[:port])
+          server.instance_variable_set(:@app, app) # TODO remove this once we can use rack-1.3.0
+          server.start
+        end
+      end
+    end
+  end
+end
+

data/lib/adva/static/{rack → server}/export.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 module Adva
   class Static
-    module Rack
+    module Server
       class Export
         include Request
 

data/lib/adva/static/{rack → server}/request.rb

@@ -2,7 +2,7 @@ require 'rack/utils'
 
 module Adva
   class Static
-    module Rack
+    module Server
       module Request
         protected
           def request(method, path, params = {})

data/lib/adva/static/{rack → server}/static.rb

@@ -2,7 +2,7 @@ require 'rack/utils'
 
 module Adva
   class Static
-    module Rack
+    module Server
       class Static < ::Rack::File
         attr_reader :app, :root
 
@@ -37,4 +37,4 @@ module Adva
       end
     end
   end
-end
+end

data/lib/adva/static/{rack → server}/watch.rb

@@ -2,9 +2,9 @@ require 'watchr'
 
 module Adva
   class Static
-    module Rack
+    module Server
       class Watch
-        autoload :Handler, 'adva/static/watch/handler'
+        autoload :Handler, 'adva/static/server/watch/handler'
 
         include Request
 
@@ -21,7 +21,7 @@ module Adva
 
         def update(path, event_type = nil)
           Adva.out.puts "\n#{event_type}: #{path}"
-          import  = Adva::Static::Import.new(:source => dir)
+          import  = Import.new(:source => dir)
           request = import.request_for(path)
           status, headers, response = self.request('POST', request.path, request.params)
           response = get(path) if !request.destroy? && status == 302
@@ -70,7 +70,7 @@ module Adva
           end
 
           def handler
-            @handler ||= Adva::Static::Watch::Handler.new(self, dir.join("**/*.{#{Import::Source::TYPES.join(',')}}"))
+            @handler ||= Handler.new(self, dir.join("**/*.{#{Import::Source::Path::TYPES.join(',')}}"))
           end
 
           def kill_watch

data/lib/adva/static/server/watch/handler.rb

@@ -0,0 +1,57 @@
+require 'observer'
+
+module Adva
+  class Static
+    module Server
+      class Watch
+        class Handler
+          include Observable
+
+          def initialize(observable, pattern)
+            add_observer(observable)
+            @pattern = pattern
+            @current = Dir[pattern]
+            @mtime   = Time.now
+          end
+
+          def listen
+            loop { trigger; sleep(0.5) }
+          end
+
+          def trigger
+            events.each do |path, event|
+              changed(true)
+              notify_observers(path.dup, event)
+            end
+          end
+
+          protected
+
+            def events
+              @last    = @current.dup
+              @current = Dir[@pattern]
+              deleted + created + modified
+            end
+
+            def modified
+              (@current & @last).each do |path|
+                mtime = File.mtime(path)
+                if mtime > @mtime
+                  @mtime = mtime
+                  return [[path, :modified]]
+                end
+              end && []
+            end
+
+            def created
+              (@current - @last).map { |path| [path, :created] }
+            end
+
+            def deleted
+              (@last - @current).map { |path| [path, :deleted] }
+            end
+        end
+      end
+    end
+  end
+end

data/lib/adva/tasks/static.rb

@@ -62,12 +62,11 @@ module Adva
         namespace 'adva:static:server'
         desc 'Start the adva:static server and watcher'
         class_option :root, :required => false, :default => 'export'
+        class_option :env,  :required => false, :default => 'development'
+        class_option :port, :required => false, :default => '9292'
 
         def server
-          ARGV.shift
-          Dir.chdir(symbolized_options[:root])
-          require "rack"
-          ::Rack::Server.start
+          Adva::Static::Server.start(symbolized_options)
         end
       end
     end

data/lib/adva_static/version.rb

@@ -1,3 +1,3 @@
 module AdvaStatic
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

data/lib/testing/step_definitions.rb

@@ -1,10 +1,12 @@
 Given /^an empty import directory "([^"]+)"$/ do |name|
   @import_dir = Pathname.new("/tmp/adva-static-test/import/#{name}")
+  import_dir.rmtree if import_dir.exist?
   import_dir.mkpath
 end
 
 Given /^an empty export directory$/ do
   @export_dir = Pathname.new("/tmp/adva-static-test/export")
+  export_dir.rmtree if export_dir.exist?
   export_dir.mkpath
 end
 
@@ -18,6 +20,7 @@ end
 
 Given /^the following source files:$/ do |table|
   table.hashes.each do |hash|
+    hash = Hash[*hash.map { |key, value| [key, value] unless value.blank? }.compact.flatten]
     setup_files([hash.delete('file'), YAML.dump(hash)])
   end
 end

data/lib/testing/test_helper.rb

@@ -1,7 +1,7 @@
 module TestHelper
   module Static
     def setup
-      setup_import_directory
+      import_dir.mkpath
       super
     end
 
@@ -14,11 +14,11 @@ module TestHelper
     end
 
     def import_dir
-      @import_dir ||= Pathname.new('/tmp/adva-static-test/import/ruby-i18n.org')
+      Adva::Static::Import::Source::Path.new('/tmp/adva-static-test/import')
     end
 
     def export_dir
-      @export_dir ||= Pathname.new('/tmp/adva-static-test/export')
+      Pathname.new('/tmp/adva-static-test/export')
     end
 
     def teardown
@@ -26,24 +26,26 @@ module TestHelper
       super
     end
 
-    def request(path)
-      Adva::Static::Import.new(:source => import_dir).request_for(path)
-    end
-
-    def source(path)
-      Adva::Static::Import::Source.new(path, import_dir)
-    end
-
     def setup_site_record
-      Factory(:site, :host => 'ruby-i18n.org')
+      Factory(:site, :host => 'ruby-i18n.org').tap do |site|
+        # FIXME this stinks. make static export authentication possible without saving the password anywhere.
+        #
+        # because the password for the admin is hardcoded in adva-static//request
+        # and the admin is created automatically with a different password we
+        # have to override this here
+        admin = User.find_by_email( 'admin@admin.org' )
+        admin.password = 'admin!'
+        admin.password_confirmation = 'admin!'
+        admin.save!
+      end
     end
 
     def setup_root_page_record
-      setup_site_record
+      Site.first || setup_site_record
     end
 
     def setup_non_root_page_record
-      site = setup_site_record
+      site = Site.first || setup_site_record
       site.pages.create!(:name => 'Contact')
     end
 
@@ -51,16 +53,12 @@ module TestHelper
       site = setup_site_record
       site.pages.first.destroy
 
-      site.blogs.create!(:name => 'Home', :posts_attributes => [
-        { :title => 'Welcome to the future of I18n in Ruby on Rails', :body => 'Welcome to the future!', :published_at => '2008-07-31' }
-      ])
+      site.blogs.create!(:name => 'Home', :posts_attributes => [{ :title => 'Post', :body => 'body', :published_at => '2010-10-10' }])
     end
 
     def setup_non_root_blog_record
       site = setup_site_record
-      site.blogs.create!(:name => 'Blog', :posts_attributes => [
-        { :title => 'Welcome to the future of I18n in Ruby on Rails', :body => 'Welcome to the future!', :published_at => '2008-07-31' }
-      ])
+      site.blogs.create!(:name => 'Blog', :posts_attributes => [{ :title => 'Post', :body => 'body', :published_at => '2010-10-10' }])
     end
 
     def setup_import_directory
@@ -69,17 +67,24 @@ module TestHelper
       setup_files(['config.ru', 'foo'], ['site.yml', YAML.dump(:host => 'ruby-i18n.org', :name => 'Ruby I18n', :title => 'Ruby I18n')])
     end
 
+    def setup_site
+      import_dir.mkpath
+      setup_files(
+        ['site.yml', YAML.dump(:host => 'ruby-i18n.org', :name => 'name', :title => 'title')]
+      )
+    end
+
     def setup_root_blog
       setup_files(
-        ['2008/07/31/welcome-to-the-future-of-i18n-in-ruby-on-rails.yml', YAML.dump(:body => 'Welcome to the future')],
-        ['2009/07/12/ruby-i18n-gem-hits-0-2-0.yml', YAML.dump(:body => 'Ruby I18n hits 0.2.0')]
+        ['2010/10/10/post.yml', YAML.dump(:filter => 'markdown', :body => 'body', :categories => 'foo, bar')],
+        ['2010/10/09/hello-world.yml', YAML.dump(:filter => 'markdown', :body => 'hello world!')]
       )
     end
 
     def setup_non_root_blog
       setup_files(
-        ['blog/2008/07/31/welcome-to-the-future-of-i18n-in-ruby-on-rails.yml', YAML.dump(:body => 'Welcome to the future')],
-        ['blog/2009/07/12/ruby-i18n-gem-hits-0-2-0.yml', YAML.dump(:body => 'Ruby I18n hits 0.2.0')]
+        ['blog/2010/10/10/post.yml', YAML.dump(:filter => 'markdown', :body => 'body', :categories => 'foo, bar')],
+        ['blog/2010/10/09/hello-world.yml', YAML.dump(:filter => 'markdown', :body => 'hello world!')]
       )
     end
 
@@ -114,16 +119,16 @@ module TestHelper
     end
 
     def setup_dirs(paths)
-      paths.each do |path|
-        FileUtils.mkdir_p(import_dir.join(path))
-      end
+      paths.each { |path| FileUtils.mkdir_p(import_dir.join(path)) }
     end
 
     def setup_files(*files)
-      files.each do |path, content|
-        import_dir.join(File.dirname(path)).mkpath
-        File.open(import_dir.join(path), 'w') { |f| f.write(content) }
-      end
+      files.each { |path, content| setup_file(path, content) }
+    end
+
+    def setup_file(path, content = '')
+      import_dir.join(File.dirname(path)).mkpath
+      File.open(import_dir.join(path), 'w') { |f| f.write(content) }
     end
 
     def future

metadata

@@ -1,152 +1,193 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: adva-static
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.0.11
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-28 00:00:00 +01:00
+date: 2011-07-28 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: adva-core
+  requirement: &2163331280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2163331280
+- !ruby/object:Gem::Dependency
+  name: adva-blog
+  requirement: &2163330860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2163330860
+- !ruby/object:Gem::Dependency
+  name: adva-cache
+  requirement: &2163330440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2163330440
+- !ruby/object:Gem::Dependency
+  name: adva-categories
+  requirement: &2163330020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2163330020
+- !ruby/object:Gem::Dependency
+  name: adva-markup
+  requirement: &2163329600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2163329600
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2163329180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2163329180
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: &2163328760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2163328760
+- !ruby/object:Gem::Dependency
   name: watchr
+  requirement: &2163328340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2163328340
+- !ruby/object:Gem::Dependency
+  name: hashr
+  requirement: &2163327920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: Static engine for adva-cms2
+  prerelease: false
+  version_requirements: *2163327920
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2163327500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2163327500
+description: Static engine for adva-cms2.
 email: nobody@adva-cms.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/adva_static/version.rb
-- lib/adva-static.rb
-- lib/adva/tasks/static.rb
-- lib/adva/static/setup.rb
+files:
+- lib/adva/static/export/page.rb
+- lib/adva/static/export/path.rb
+- lib/adva/static/export/queue.rb
+- lib/adva/static/export/store.rb
+- lib/adva/static/export/templates/config.ru
 - lib/adva/static/export.rb
 - lib/adva/static/import/format.rb
-- lib/adva/static/import/source.rb
-- lib/adva/static/import/model.rb
+- lib/adva/static/import/model/base.rb
+- lib/adva/static/import/model/blog.rb
 - lib/adva/static/import/model/page.rb
-- lib/adva/static/import/model/site.rb
 - lib/adva/static/import/model/post.rb
 - lib/adva/static/import/model/section.rb
-- lib/adva/static/import/model/base.rb
-- lib/adva/static/import/model/blog.rb
+- lib/adva/static/import/model/site.rb
+- lib/adva/static/import/model.rb
 - lib/adva/static/import/request.rb
-- lib/adva/static/watch.rb
-- lib/adva/static/export/page.rb
-- lib/adva/static/export/templates/config.ru
-- lib/adva/static/export/path.rb
-- lib/adva/static/export/store.rb
-- lib/adva/static/export/queue.rb
-- lib/adva/static/rack/export.rb
-- lib/adva/static/rack/watch.rb
-- lib/adva/static/rack/static.rb
-- lib/adva/static/rack/request.rb
-- lib/adva/static/rack.rb
-- lib/adva/static/watch/handler.rb
+- lib/adva/static/import/source/base.rb
+- lib/adva/static/import/source/blog.rb
+- lib/adva/static/import/source/page.rb
+- lib/adva/static/import/source/path.rb
+- lib/adva/static/import/source/post.rb
+- lib/adva/static/import/source/section.rb
+- lib/adva/static/import/source/site.rb
+- lib/adva/static/import/source.rb
 - lib/adva/static/import.rb
+- lib/adva/static/server/export.rb
+- lib/adva/static/server/request.rb
+- lib/adva/static/server/static.rb
+- lib/adva/static/server/watch/handler.rb
+- lib/adva/static/server/watch.rb
+- lib/adva/static/server.rb
+- lib/adva/static/setup.rb
 - lib/adva/static.rb
-- lib/testing/test_helper.rb
+- lib/adva/tasks/static.rb
+- lib/adva-static.rb
+- lib/adva_static/version.rb
 - lib/testing/step_definitions.rb
+- lib/testing/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/svenfuchs/adva-cms2
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.4.2
+rubyforge_project: ! '[none]'
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Static engine for adva-cms2
 test_files: []
-