polygon 0.9.1 → 0.10.0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 0.0.1 / FIX ME
+# 0.10.0 / 2013-07-25
+
+* Alf dependency bumped to 0.16(.3)
+* Renamed Launch script as Open.
+
+# 0.9.1 / 2012-01-15
 
 * Enhancements
 

data/Gemfile

@@ -2,15 +2,17 @@ source 'http://rubygems.org'
 
 group :runtime do
   gem "json", ">= 0"
-  gem "sinatra", "~> 1.3"
-  gem "wlang", "~> 2.1.1"
-  gem "alf", "~> 0.12.2"
+  gem "sinatra", "~> 1.4"
+  gem "wlang", "~> 2.1"
+  gem "alf-core", "~> 0.16"
   gem "quickl", "~> 0.4.2"
-  gem "path", "~> 1.3.1"
+  gem "path", "~> 1.3"
+  gem "http", "~> 0.0.1"
+  gem "launchy", "~> 2.0"
 end
 
 group :development do
-  gem "rake", "~> 0.9.2"
+  gem "rake", "~> 10.0"
   gem "bundler", "~> 1.0"
   gem "rspec", "~> 2.10"
   gem "yard", "~> 0.7.2"

data/Gemfile.lock

@@ -1,36 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    alf (0.12.2)
-      backports (~> 2.6)
-      myrrha (~> 1.2.1)
-      quickl (~> 0.4.2)
-    backports (2.6.1)
+    addressable (2.3.2)
+    alf-core (0.16.3)
+      domain (~> 1.0)
+      myrrha (~> 3.0)
+      path (~> 1.3)
+      sexpr (~> 0.6.0)
+    backports (2.6.7)
     bluecloth (2.2.0)
     citrus (2.4.1)
     diff-lcs (1.1.3)
-    json (1.7.3)
-    myrrha (1.2.2)
-    path (1.3.1)
+    domain (1.0.0)
+    http (0.0.2)
+    json (1.7.6)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    myrrha (3.0.0)
+      domain (~> 1.0)
+    path (1.3.3)
     quickl (0.4.3)
-    rack (1.4.4)
-    rack-protection (1.3.2)
+    rack (1.5.2)
+    rack-protection (1.5.3)
       rack
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
+    rspec-mocks (2.12.1)
+    sexpr (0.6.0)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     temple (0.4.1)
-    tilt (1.3.3)
+    tilt (1.4.1)
     wlang (2.1.1)
       backports (~> 2.6)
       citrus (~> 2.4.1)
@@ -43,14 +51,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  alf (~> 0.12.2)
+  alf-core (~> 0.16)
   bluecloth (~> 2.2)
   bundler (~> 1.0)
+  http (~> 0.0.1)
   json
-  path (~> 1.3.1)
+  launchy (~> 2.0)
+  path (~> 1.3)
   quickl (~> 0.4.2)
-  rake (~> 0.9.2)
+  rake (~> 10.0)
   rspec (~> 2.10)
-  sinatra (~> 1.3)
-  wlang (~> 2.1.1)
+  sinatra (~> 1.4)
+  wlang (~> 2.1)
   yard (~> 0.7.2)

data/lib/polygon.rb

@@ -1,14 +1,30 @@
 require "polygon/version"
 require "polygon/loader"
 require "polygon/core_ext"
-#
-# A web framework powered by sinatra for mostly static websites
-#
-module Polygon
 
-end # module Polygon
 require 'polygon/entry'
 require 'polygon/database'
 require 'polygon/helpers'
 require 'polygon/base'
 require 'polygon/dialect'
+#
+# A web framework powered by sinatra for mostly static websites
+#
+module Polygon
+
+  DEFAULT_OPTIONS = { viewpoint: Database }
+
+  def self.database(path, options = {})
+    options = DEFAULT_OPTIONS.merge(options)
+    Alf.database(Database::Adapter.polygon(path), options)
+  end
+
+  def self.connection(path, options = {})
+    database(path, options).connection
+  end
+
+  def self.connect(path, options = {}, &bl)
+    database(path, options).connect(&bl)
+  end
+
+end # module Polygon

data/lib/polygon/base.rb

@@ -2,9 +2,9 @@ module Polygon
   class Base < Sinatra::Base
 
     configure do
-      set :public_folder, Proc.new { 'content/static'                }
-      set :views,         Proc.new { 'design/views'                  }
-      set :database,      Proc.new { Database.new('content/dynamic') }
+      set :public_folder, Proc.new { 'content/static'  }
+      set :views,         Proc.new { 'design/views'    }
+      set :doc_folder,    Proc.new { 'content/dynamic' }
       set :wlang,         :layout => :"layouts/html5"
       enable  :logging
       enable  :raise_errors

data/lib/polygon/database.rb

@@ -1,41 +1,50 @@
 module Polygon
-  class Database < Alf::Environment
+  module Database
+    include Alf::Viewpoint
 
-    attr_reader :root, :options
+    class Adapter < Alf::Adapter
 
-    def initialize(root, options = {})
-      @root    = Path(root)
-      @options = default_options.merge(options)
-    end
+      def self.recognizes?(conn_spec)
+        Path.like?(conn_spec) && Path(conn_spec).directory?
+      end
 
-    def default_options
-      { :extensions => ["yml", "md"] }
-    end
+      def connection
+        Connection.new(Path(conn_spec))
+      end
+
+      Adapter.register(:polygon, self)
+    end # class Adapter
 
-    def dataset(name)
-      if self.respond_to?(name)
-        send(name)
-      else
-        raise Alf::NoSuchDatasetError, "No such dataset `#{name}`"
+    class Connection < Alf::Adapter::Connection
+
+      alias :folder :conn_spec
+
+      def default_options
+        { :extensions => ["yml", "md"] }
       end
-    end
 
-    def entries
-      @entries ||= Entries.new(root, options)
-    end
+      def knows?(name)
+        name == :entries
+      end
 
-    def sitemap
-      @sitemap ||= begin
-        Alf.lispy(self).compile do
-          (extend :entries,
-                  :path    => lambda{ entry.relative_path.to_url            },
-                  :lastmod => lambda{ entry.path.mtime.strftime("%Y-%m-%d") })
-        end
+      # Returns a cog for `name`
+      def cog(plan, expr)
+        name = expr.name
+        raise Alf::NoSuchRelvarError, "Unable to find a file for #{name}" unless knows?(name)
+        Entries.new(folder, default_options)
       end
+
+    end # class Connection
+
+    native :entries
+
+    def sitemap
+      extend(entries,
+             path:    ->{ entry.relative_path.to_url            },
+             lastmod: ->{ entry.path.mtime.strftime("%Y-%m-%d") })
     end
 
     class Entries
-      include Alf::Iterator
 
       def initialize(root, options)
         @root    = root
@@ -43,6 +52,7 @@ module Polygon
       end
 
       def each
+        return to_enum unless block_given?
         extensions = @options[:extensions]
         @root.glob("**/*").each do |file|
           next unless file.file? and extensions.include?(file.ext)
@@ -51,7 +61,15 @@ module Polygon
         end
       end
 
+      def compiler
+        nil
+      end
+
+      def to_relation
+        Relation(each.to_a)
+      end
+
     end # class Entries
 
-  end # class Database
+  end # module Database
 end # class Polygon

data/lib/polygon/helpers.rb

@@ -14,12 +14,7 @@ module Polygon
     end
 
     def database
-      settings.database
-    end
-
-    def lispy(&bl)
-      @lispy ||= Alf.lispy(database)
-      bl ? @lispy.evaluate(&bl) : @lispy
+      Polygon.connection(settings.doc_folder)
     end
 
     def in_production
@@ -35,16 +30,24 @@ module Polygon
     end
 
     def sitemap_locals
-      { :urls => database.sitemap }
+      index_locals.merge(:urls => database.query{ sitemap })
+    end
+
+    def normalize_path(path)
+      path = path[1..-1] if path =~ /^\//
+      path = path[0...-1] if path =~ /\/$/
+      path
     end
 
     def page_locals(path = "")
-      rel = lispy do
-        (unwrap \
-          (extend (restrict :sitemap, :path => path),
-                  :data => lambda{ entry.to_hash }),
-          :data)
-      end
+      path = normalize_path(path)
+      rel = database.relvar{
+        unwrap(
+          extend(
+            restrict(sitemap, path: path),
+          data: ->{ entry }),
+        :data)
+      }
       rel && rel.to_a.first
     end
     alias :index_locals :page_locals

data/lib/polygon/loader.rb

@@ -1,6 +1,8 @@
 require "json"
 require "sinatra"
 require "wlang"
-require "alf"
+require "alf-core"
 require "quickl"
 require "path"
+require "http"
+require "launchy"

data/lib/polygon/script.rb

@@ -10,13 +10,14 @@ module Polygon
       Path($0).backfind('.[config.ru]') || Path.pwd.backfind('.[config.ru]')
     end
 
-    def logger
-      @logger ||= Logger.new(root/:logs/"#{Quickl.command_name(self)}.log") if enable_logging
+    def log_io
+      @log_io ||= File.open(root/:logs/"#{Quickl.command_name(self)}.log".to_s, "w")
     end
 
     def log(message, severity)
       puts message
-      logger.send(severity, message) if enable_logging
+      log_io.puts("#{severity}: #{message}") if enable_logging
+      log_io.flush
       yield if block_given?
     end
     def debug(message, &block); log(message, :debug, &block); end
@@ -25,6 +26,18 @@ module Polygon
     def error(message, &block); log(message, :error, &block); end
     def fatal(message, &block); log(message, :fatal, &block); end
 
+    def flush_logs
+      @log_io.close if @log_io
+    end
+
+    def spawn(command)
+      if enable_logging
+        Kernel.spawn(command, [:out, :err] => log_io)
+      else
+        Kernel.spawn(command)
+      end
+    end
+
   end
 
   def self.Script(*args)
@@ -34,5 +47,5 @@ module Polygon
   end
 
 end
-require 'polygon/script/launch'
+require 'polygon/script/open'
 require 'polygon/script/gsub'

data/lib/polygon/script/{launch.rb → open.rb}

@@ -1,8 +1,8 @@
 module Polygon
   module Script
-    class Launch < Polygon::Script(__FILE__, __LINE__)
+    class Open < Polygon::Script(__FILE__, __LINE__)
 
-      attr_accessor :mode, :refresh_repo, :open_browser, :try, :max
+      attr_accessor :mode, :refresh_repo, :sync_repo, :bundle, :open_browser, :try, :max
 
       def config_ru
         root/:config/"#{mode}.ru"
@@ -18,6 +18,14 @@ module Polygon
         opt.on('--[no-]refresh', "Issues a 'git remote update' first?") do |value|
           self.refresh_repo = value
         end
+        self.sync_repo = true
+        opt.on('--[no-]sync', "Issues a 'git rebase origin/master' first?") do |value|
+          self.refresh_repo = value
+        end
+        self.bundle = true
+        opt.on('--[no-]bundle', "Issues a 'bundle' first?") do |value|
+          self.bundle = value
+        end
         self.open_browser = true
         opt.on('--[no-]browser', "Open the browser automatically?") do |value|
           self.open_browser = value
@@ -49,8 +57,17 @@ module Polygon
 
         info "Refreshing repository info..." do
           Process.wait spawn("git remote update")
+          Process.wait spawn("git fetch origin")
         end if refresh_repo
 
+        info "Syncing repository..." do
+          Process.wait spawn("git pull origin master")
+        end if sync_repo
+
+        info "Bundling..." do
+          Process.wait spawn("bundle")
+        end if bundle
+
         thinpid = nil
         info "Starting the web server..." do
           thinpid = spawn("thin -R #{config_ru} start")
@@ -68,8 +85,10 @@ module Polygon
         Process.kill("SIGHUP", thinpid) if thinpid
       ensure
         Process.wait(thinpid) if thinpid
+        flush_logs
       end
 
-    end # class Launch
+    end # class Open
+    Launch = Open
   end # module Script
-end # module Polygon
+end # module Polygon

data/lib/polygon/version.rb

@@ -2,8 +2,8 @@ module Polygon
   module Version
 
     MAJOR = 0
-    MINOR = 9
-    TINY  = 1
+    MINOR = 10
+    TINY  = 0
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/polygon.gemspec

@@ -123,17 +123,19 @@ Gem::Specification.new do |s|
   # One call to add_development_dependency('gem_name', 'gem version requirement')
   # for each development dependency. These gems are required for developers
   #
-  s.add_development_dependency("rake", "~> 0.9.2")
+  s.add_development_dependency("rake", "~> 10.0")
   s.add_development_dependency("bundler", "~> 1.0")
   s.add_development_dependency("rspec", "~> 2.10")
   s.add_development_dependency("yard", "~> 0.7.2")
   s.add_development_dependency("bluecloth", "~> 2.2")
   s.add_dependency("json", ">= 0")
-  s.add_dependency("sinatra", "~> 1.3")
-  s.add_dependency("wlang", "~> 2.1.1")
-  s.add_dependency("alf", "~> 0.12.2")
+  s.add_dependency("sinatra", "~> 1.4")
+  s.add_dependency("wlang", "~> 2.1")
+  s.add_dependency("alf-core", "~> 0.16")
   s.add_dependency("quickl", "~> 0.4.2")
-  s.add_dependency("path", "~> 1.3.1")
+  s.add_dependency("path", "~> 1.3")
+  s.add_dependency("http", "~> 0.0.1")
+  s.add_dependency("launchy", "~> 2.0")
 
   # The version of ruby required by this gem
   #

data/polygon.noespec

@@ -7,7 +7,7 @@ variables:
   upper:
     Polygon
   version:
-    0.9.1
+    0.10.0
   summary: |-
     A web framework powered by sinatra for mostly static websites
   description: |-
@@ -19,12 +19,14 @@ variables:
     - http://github.com/blambeau/polygon
   dependencies:
     - {name: json,      version: ">= 0",      groups: [runtime]}
-    - {name: sinatra,   version: "~> 1.3",    groups: [runtime]}
-    - {name: wlang,     version: "~> 2.1.1",  groups: [runtime]}
-    - {name: alf,       version: "~> 0.12.2", groups: [runtime]}
+    - {name: sinatra,   version: "~> 1.4",    groups: [runtime]}
+    - {name: wlang,     version: "~> 2.1",    groups: [runtime]}
+    - {name: alf-core,  version: "~> 0.16",   groups: [runtime]}
     - {name: quickl,    version: "~> 0.4.2",  groups: [runtime]}
-    - {name: path,      version: "~> 1.3.1",  groups: [runtime]}
-    - {name: rake,      version: "~> 0.9.2",  groups: [development]}
+    - {name: path,      version: "~> 1.3",    groups: [runtime]}
+    - {name: http,      version: "~> 0.0.1",  groups: [runtime]}
+    - {name: launchy,   version: "~> 2.0",    groups: [runtime]}
+    - {name: rake,      version: "~> 10.0",   groups: [development]}
     - {name: bundler,   version: "~> 1.0",    groups: [development]}
     - {name: rspec,     version: "~> 2.10",   groups: [development]}
     - {name: yard,      version: "~> 0.7.2",  groups: [development]}

data/spec/database/test_entries.rb

@@ -2,16 +2,12 @@ require 'spec_helper'
 module Polygon
   describe Database, "entries" do
 
-    let(:database){ Database.new fixtures_path }
+    let(:connection){ Polygon.connection(fixtures_path) }
 
-    subject{ database.entries }
+    subject{ connection.query{ entries } }
 
-    it 'is returned by dataset' do
-      subject.should eq(database.dataset(:entries))
-    end
-
-    it 'returns a Alf::Iterator' do
-      subject.should be_a(Alf::Iterator)
+    it 'should be a Relation' do
+      subject.should be_a(Relation)
     end
 
     it 'iterates tuples with entries' do

data/spec/database/test_sitemap.rb

@@ -2,16 +2,12 @@ require 'spec_helper'
 module Polygon
   describe Database, "entries" do
 
-    let(:database){ Database.new fixtures_path }
+    let(:connection){ Polygon.connection(fixtures_path) }
 
-    subject{ database.sitemap }
+    subject{ connection.query{ sitemap } }
 
-    it 'is returned by dataset' do
-      subject.should eq(database.dataset(:sitemap))
-    end
-
-    it 'returns a Alf::Iterator' do
-      subject.should be_a(Alf::Iterator)
+    it 'returns a Relation' do
+      subject.should be_a(Relation)
     end
 
     it 'iterates tuples with entries, path and lastmod' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polygon
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: wlang
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,15 +138,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: alf
+  name: alf-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: quickl
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.0'
 description: ! "Polygon provides a framework with strong separation of concerns between
   \nclients, developers and web designers"
 email:
@@ -213,7 +245,7 @@ files:
 - lib/polygon/helpers.rb
 - lib/polygon/loader.rb
 - lib/polygon/script/gsub.rb
-- lib/polygon/script/launch.rb
+- lib/polygon/script/open.rb
 - lib/polygon/script.rb
 - lib/polygon/version.rb
 - lib/polygon.rb
@@ -270,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -65657202996910521
+      hash: -758849009139759142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -279,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A web framework powered by sinatra for mostly static websites