adva-blog 0.0.2 → 0.0.3

data/lib/bundler/repository.rb

@@ -0,0 +1,118 @@
+require 'pathname'
+
+# Bundler gemfile support for local/remote workspaces/repositories for work in
+# development teams.
+#
+# Usage:
+#
+#   # define paths to be searched for repositories:
+#   workspace '~/.projects ~/Development/{projects,work}'
+#
+#   # define developer preferences for using local or remote repositories (uses ENV['user']):
+#   developer :sven, :prefer => :local
+#
+#   # define repositories to be used for particular gems:
+#   adva_cms  = repository('adva-cms2', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de')
+#   adva_shop = repository('adva-shop', :source => :local)
+#
+#   # now use repositories to define gems:
+#   adva_cms.gem  'adva-core'
+#   adva_shop.gem 'adva-catalog'
+#
+#   # The gem definition will now be proxied to Bundler with arguments according
+#   # to the setup defined earlier. E.g. as:
+#
+#   gem 'adva-core', :path => 'Development/projects/adva-cms2/adva-core'                 # for developer 'sven'
+#   gem 'adva-core', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de' # for other developers
+#   gem 'adva-catalog', :path => 'Development/projects/adva-shop/adva-catalog'           # for all developers
+#
+#  One can also set an environment variable FORCE_REMOTE which will force remote
+#  repositories to be used *except* when a repository was defined with :source => :local
+#  which always forces the local repository to be used.
+#
+class Repository
+  class << self
+    def paths
+      @paths ||= []
+    end
+
+    def path(*paths)
+      paths.join(' ').split(' ').each do |path|
+        self.paths.concat(Pathname.glob(File.expand_path(path)))
+      end
+    end
+
+    def developer(name, preferences)
+      developers[name] = preferences
+      workspaces(preferences[:workspace])
+    end
+
+    def current_developer
+      developers[ENV['USER'].to_sym] || {}
+    end
+
+    def developers(developers = nil)
+      @developers ||= {}
+    end
+  end
+
+  class Gem < Array
+    def initialize(name, repository)
+      if repository.local?
+        sub_path = repository.path.join(name)
+        super([name, { :path => sub_path.exist? ? sub_path.to_s : repository.path.to_s }])
+      else
+        super([name, repository.options.dup])
+      end
+    end
+  end
+
+  attr_reader :bundler, :name, :options, :source
+
+  def initialize(bundler, name, options)
+    @bundler = bundler
+    @name    = name
+    @source  = options.delete(:source)
+    @options = options
+  end
+
+  def gem(name)
+    bundler.gem(*Gem.new(name, self))
+  end
+
+  def local?
+    source == :local # && path
+  end
+
+  def source
+    @source ||= forced_source || preferred_source || :remote
+  end
+
+  def forced_source
+    :remote if ENV['FORCE_REMOTE']
+  end
+
+  def preferred_source
+    self.class.current_developer[:prefer] || self.class.current_developer[name.to_sym]
+  end
+
+  def path
+    @path ||= begin
+      path = self.class.paths.detect { |path| path.join(name).exist? }
+      path ? path.join(name) : Pathname.new('.')
+    end
+  end
+end
+
+def workspace(*paths)
+  Repository.path(*paths)
+end
+alias :workspaces :workspace
+
+def developer(name, preferences)
+  Repository.developer(name, preferences)
+end
+
+def repository(*args)
+  Repository.new(self, *args)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-blog
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,35 +56,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/controllers/posts_controller.rb
-- app/controllers/admin/blogs_controller.rb
-- app/controllers/admin/posts_controller.rb
-- app/views/admin/categories/_menu_slice.html.rb
-- app/views/admin/blogs/show.html.rb
-- app/views/admin/blogs/edit.html.rb
-- app/views/admin/blogs/new.html.rb
-- app/views/admin/blogs/_form.html.rb
-- app/views/admin/blogs/_menu.html.rb
-- app/views/admin/posts/index.html.rb
-- app/views/admin/posts/edit.html.rb
-- app/views/admin/posts/new.html.rb
-- app/views/admin/posts/_form.html.rb
-- app/views/admin/posts/_menu.html.rb
-- app/views/posts/index.html.rb
-- app/views/posts/show.html.rb
-- app/views/posts/_meta.html.rb
-- app/models/post.rb
-- app/models/site_slice.rb
-- app/models/blog.rb
-- config/redirects.rb
-- config/routes.rb
-- config/locales/en.yml
-- lib/adva_blog/version.rb
-- lib/adva/blog.rb
-- lib/testing/factories.rb
-- lib/testing/paths.rb
-- lib/adva-blog.rb
-- public/stylesheets/default/blog.css
+- lib/bundler/repository.rb
 has_rdoc: true
 homepage: http://github.com/svenfuchs/adva-cms2
 licenses: []

data/app/controllers/admin/blogs_controller.rb

@@ -1,11 +0,0 @@
-class Admin::BlogsController < Admin::SectionsController
-  purges :create, :update, :destroy
-
-  def show
-    # TODO need to do an internal redirect here because the admin top section drop down menu
-    # links to section#show. Might want to invent a concept of default_action for a section
-    # type. Also might want to invent a :preserve_flash => true concept or something like that
-    # when redirecting through http (which otherwise looses the flash after, e.g. blog#create)
-    internal_redirect_to 'admin/posts#index', params.merge(:blog_id => params.delete(:id))
-  end
-end

data/app/controllers/admin/posts_controller.rb

@@ -1,4 +0,0 @@
-class Admin::PostsController < Admin::BaseController
-  nested_belongs_to :site, :blog
-  purges :create, :update, :destroy
-end

data/app/controllers/posts_controller.rb

@@ -1,20 +0,0 @@
-class PostsController < BaseController
-  nested_belongs_to :blog
-  before_filter :set_id, :only => :show
-
-  filtered_attributes :post if Adva.engine?(:markup) # FIXME move to adva-markup?
-
-  protected
-
-    def collection
-      # FIXME only here for reference tracking. how can we remove this?
-      @_references << [blog, :posts] if @_references
-      super
-    end
-
-    def set_id
-      blog = site.blogs.find(params[:blog_id])
-      permalink = params.values_at(:year, :month, :day, :slug)
-      params[:id] = blog.posts.by_permalink(*permalink).first.try(:id)
-    end
-end

data/app/models/blog.rb

@@ -1,6 +0,0 @@
-class Blog < Section
-  has_many :posts, :foreign_key => 'section_id', :dependent => :destroy, :order => 'created_at DESC'
-  # has_option :posts_per_page, :default => 15
-
-  accepts_nested_attributes_for :posts
-end

data/app/models/post.rb

@@ -1,28 +0,0 @@
-class Post < Content
-  has_slug :scope => :section_id
-
-  validates_presence_of :title
-
-  class << self
-    def by_permalink(year, month, day, slug)
-      by_archive(year, month, day).where(:slug => slug)
-    end
-
-    def by_archive(*args)
-      where("DATE(contents.created_at) = ?", Date.new(*args.map(&:to_i)).to_formatted_s(:db))
-    end
-  end
-
-  # FIXME should be in adva-markup, shouldn't it?
-  def filter
-    read_attribute(:filter) || (section.respond_to?(:default_filter) ? section.default_filter : nil)
-  end
-
-  def permalink
-    "#{created_at.year}/#{created_at.month}/#{created_at.day}/#{slug}"
-  end
-
-  def to_param(name)
-    name == :permalink ? permalink : super()
-  end
-end

data/app/models/site_slice.rb

@@ -1,3 +0,0 @@
-Site.class_eval do
-  has_many :blogs
-end

data/app/views/admin/blogs/_form.html.rb

@@ -1,17 +0,0 @@
-class Admin::Blogs::Form < Adva::View::Form
-  include do
-    def fields
-      form.hidden_field :type
-
-      fieldset do
-        column do
-          form.input :name
-        end
-
-        column do
-          form.input :slug
-        end unless params[:action] == 'new'
-      end
-    end
-  end
-end

data/app/views/admin/blogs/_menu.html.rb

@@ -1,25 +0,0 @@
-require_dependency 'admin/sections/_menu.html'
-
-class Admin::Blogs::Menu < Admin::Sections::Menu
-  include do
-    def main
-      super
-      categories if persisted? && Adva.engine?(:categories)
-    end
-
-    def right
-      new_item if persisted?
-      super
-    end
-
-    protected
-
-      def show
-        item(:'.posts', index_path(:posts))
-      end
-
-      def new_item
-        item(:'.new_post', new_path(:post))
-      end
-  end
-end

data/app/views/admin/blogs/edit.html.rb

@@ -1,8 +0,0 @@
-class Admin::Blogs::Edit < Minimal::Template
-  include do
-    def to_html
-      h2 :'.title'
-      render :partial => 'form'
-    end
-  end
-end

data/app/views/admin/blogs/new.html.rb

@@ -1,9 +0,0 @@
-class Admin::Blogs::New < Minimal::Template
-  include do
-    def to_html
-      h2 :'.title'
-      render 'admin/sections/select_type'
-      render :partial => 'form'
-    end
-  end
-end

data/app/views/admin/blogs/show.html.rb

@@ -1,41 +0,0 @@
-class Admin::Blogs::Show < Minimal::Template
-  include do
-    def to_html
-    	table_for resource.posts do |t|
-    		t.column :post, :comments, :published, :author, :actions
-
-    		t.row do |r, post|
-    			r.cell link_to_post(post)
-      		r.cell ''.html_safe # post.accept_comments? && post.comments.present? ? link_to(post.comments.size, admin_comments_path) : t(:"adva.common.none")
-    			r.cell ''.html_safe # published_at_formatted(post)
-    			r.cell link_to_author(post)
-    			r.cell links_to_actions([:view, :edit, :destroy], post)
-    		end
-
-    		t.foot.row do |r|
-          # r.cell will_paginate(@posts), :class => :pagination, :colspan => :all
-    		end
-
-    		t.empty :p, :class => 'posts list empty' do
-          self.t(:'.empty', :link => capture { link_to(:'.create_item', new_path(:post)) }).html_safe
-    		end
-    	end
-    end
-  
-    def link_to_post(post)
-      status(post) + capture { link_to_edit(post.title, post) } # , :class => post.state
-    end
-  
-    def link_to_author(post)
-      ''.html_safe # link_to(post.author_name, admin_site_user_path(@site, post.author))
-    end
-  
-    def link_to_view(post)
-      capture { link_to(options[:text] || :'.view', public_url_for([post.section, post]), :class => :view) }
-    end
-  
-    def status(post)
-      capture { span(t(:'.published'), :title => t(:'.published'), :class => 'status published') }
-    end
-  end
-end

data/app/views/admin/categories/_menu_slice.html.rb

@@ -1,22 +0,0 @@
-require_dependency 'admin/categories/_menu.html'
-
-Admin::Categories::Menu.class_eval do
-  include do
-    def main
-      super
-      posts if blog?
-    end
-
-    protected
-
-      def posts
-        item(:'.posts', index_parent_path(:posts), :before => :'.categories')
-      end
-
-      def blog?
-        resource.section.is_a?(Blog)
-      end
-  end
-end
-
-

data/app/views/admin/posts/_form.html.rb

@@ -1,25 +0,0 @@
-class Admin::Posts::Form < Adva::View::Form
-  include do
-    def fields
-      fieldset do
-        form.input :title
-        form.input :body
-      end
-    end
-
-    def sidebar
-      if Adva.engine?(:categories) && blog.categories.present?
-        # TODO extract to Adva::View::Form#categorizable_tab or something
-        tab :categories do
-          fieldset do
-            form.has_many_through_collection_check_boxes(:categorizations, blog.categories, :name)
-          end
-        end
-      end
-
-      tab :options do
-        form.input :slug
-      end
-    end
-  end
-end

data/app/views/admin/posts/_menu.html.rb

@@ -1,10 +0,0 @@
-require_dependency 'admin/contents/_menu.html'
-
-class Admin::Posts::Menu < Admin::Contents::Menu
-  include do
-    def main
-      super
-      categories(index_parent_path(:categories), :before => :'.edit_section') if Adva.engine?(:categories)
-    end
-  end
-end

data/app/views/admin/posts/edit.html.rb

@@ -1,8 +0,0 @@
-class Admin::Posts::Edit < Minimal::Template
-  include do
-    def to_html
-      h2 :'.title'
-      render :partial => 'form'
-    end
-  end
-end

data/app/views/admin/posts/index.html.rb

@@ -1,42 +0,0 @@
-class Admin::Posts::Index < Minimal::Template
-  include do
-    def to_html
-    	table_for collection do |t|
-    		t.column :post, :comments, :published, :author, :actions
-
-    		t.row do |r, post|
-    			r.cell link_to_post(post)
-      		r.cell ''.html_safe # post.accept_comments? && post.comments.present? ? link_to(post.comments.size, admin_comments_path) : t(:"adva.common.none")
-    			r.cell ''.html_safe # published_at_formatted(post)
-    			r.cell link_to_author(post)
-    			r.cell links_to_actions([:view, :edit, :destroy], post)
-    		end
-
-    		t.foot.row do |r|
-          # r.cell will_paginate(@posts), :class => :pagination, :colspan => :all
-    		end
-
-    		t.empty :p, :class => 'posts list empty' do
-          self.t(:'.empty', :link => capture { link_to(:'.create_item', new_path) }).html_safe
-    		end
-    	end
-    end
-
-    def link_to_post(post)
-      status(post) + capture { link_to_edit(post.title, post) } # , :class => post.state
-    end
-
-    def link_to_author(post)
-      ''.html_safe # link_to(post.author_name, admin_site_user_path(@site, post.author))
-    end
-
-    def link_to_view(post)
-      capture { link_to(options[:text] || :'.actions.view', public_url_for([blog, post]), :class => :view) }
-    end
-
-    def status(post)
-      capture { span(t(:'.status.published'), :title => t(:'.status.published'), :class => 'status published') }
-    end
-  end
-end
-

data/app/views/admin/posts/new.html.rb

@@ -1,8 +0,0 @@
-class Admin::Posts::New < Minimal::Template
-  include do
-    def to_html
-      h2 :'.title'
-      render :partial => 'form'
-    end
-  end
-end

data/app/views/posts/_meta.html.rb

@@ -1,17 +0,0 @@
-class Posts::Meta < Minimal::Template
-  include do
-    def to_html
-      div :class => :meta do
-        self << t(:'.info', :date => date, :author => nil).html_safe # TODO 
-      end
-    end
-  
-    def date
-      capture do
-        content_tag(:abbr, :title => post.created_at, :class => 'updated') do
-          self << l(post.created_at, :format => :post)
-        end
-      end
-    end
-  end
-end

data/app/views/posts/index.html.rb

@@ -1,22 +0,0 @@
-class Posts::Index < Minimal::Template
-  include do
-    def to_html
-      ul :class => 'blog posts' do
-        collection.each do |post|
-          li :class => 'post hentry' do
-            h2 do
-              link_to(post.title, [post.section, post], :class => 'entry-title', :rel => 'bookmark')
-            end
-            render :partial => 'posts/meta', :locals => { :post => post }
-            div truncate_html(post.body, :length => 500, :omission => ' …'), :class => 'entry-content'
-            p do
-              link_to(:'.continue', [post.section, post], :class => :continue)
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-

data/app/views/posts/show.html.rb

@@ -1,11 +0,0 @@
-class Posts::Show < Minimal::Template
-  include do
-    def to_html
-      div :class => resource.class.name.underscore do
-        h2 { link_to(resource.title, resources, :class => 'entry-title', :rel => 'bookmark') }
-        render :partial => 'posts/meta', :locals => { :post => resource }
-        self << resource.body.html_safe
-      end
-    end
-  end
-end

data/config/locales/en.yml

@@ -1,38 +0,0 @@
-en:
-  time:
-    formats:
-      post: "%a, %d %b %Y"
-
-  section:
-    types:
-      blog: Blog
-
-  menu:
-    posts: Posts
-    new_post: New Post
-
-  columns:
-    post: Post
-    comments: Comments
-
-  posts:
-    index:
-      continue: Read the rest of this post
-    meta:
-      info: "posted on %{date}"
-
-  admin:
-    blogs:
-      new:
-        title: Create a New Section
-      edit:
-        title: Settings
-    posts:
-      index:
-        empty: "There are no posts. %{link}"
-        create_item: "Create one now »"
-      new:
-        title: Write a new blog post
-      edit:
-        title: Edit Post
-        delete: Delete

data/config/redirects.rb

@@ -1,8 +0,0 @@
-Adva::Registry.set :redirect, {
-  # see comment in admin/blog_controller
-  # 'admin/blogs#show'    => lambda { |c| c.index_path(:posts) },
-  'admin/blogs#update'  => lambda { |c| c.edit_url },
-  'admin/posts#create'  => lambda { |c| c.edit_url },
-  'admin/posts#update'  => lambda { |c| c.edit_url },
-  'admin/posts#destroy' => lambda { |c| c.show_parent_url }
-}

data/config/routes.rb

@@ -1,18 +0,0 @@
-Rails.application.routes.draw do
-  namespace :admin do
-    resources :sites do
-      resources :blogs do
-        resources :posts
-      end
-    end
-  end
-
-  constraints :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/ do
-    match 'blogs/:blog_id(/:year(/:month(/:day)))', :to => 'posts#index', :as => :blog
-    match 'blogs/:blog_id/:year/:month/:day/:slug', :to => 'posts#show'
-  end
-
-  # this is just here so we get the named url helper and can use url_for(blog, post)
-  # TODO how can we improve this?
-  match 'blogs/:blog_id/*permalink', :to => "posts#internal", :as => :blog_post
-end

data/lib/adva/blog.rb

@@ -1,23 +0,0 @@
-require 'adva/core'
-require 'adva/engine'
-
-require 'routing_filter'
-require 'adva/routing_filters/section_root'
-
-require 'action_controller' # really should be in truncate_html
-require 'truncate_html'
-
-module Adva
-  class Blog < ::Rails::Engine
-    include Adva::Engine
-
-    initializer 'adva-blog.require_section_types' do
-      config.to_prepare { require_dependency 'blog' }
-    end
-
-    initializer 'adva-blog.configure_routing_filters' do
-      RoutingFilter::SectionRoot.anchors << '\d{4}'
-    end
-  end
-end
-

data/lib/adva-blog.rb

@@ -1 +0,0 @@
-require 'adva/blog'

data/lib/adva_blog/version.rb

@@ -1,3 +0,0 @@
-module AdvaBlog
-  VERSION = "0.0.2"
-end

data/lib/testing/factories.rb

@@ -1,9 +0,0 @@
-Factory.define :blog do |f|
-  f.name 'Blog'
-end
-
-Factory.define :post do |f|
-  f.section Blog.first
-  f.title  'Title'
-  f.body   'Body'
-end

data/lib/testing/paths.rb

@@ -1,19 +0,0 @@
-module Adva::Blog::Paths
-  def path_to(page)
-    case page
-
-    when /^the admin posts list page of the "([^"]*)" blog$/
-      section = Blog.find_by_name($1) || raise("could not find blog #{$1.inspect}")
-      polymorphic_path([:admin, section.site, section])
-
-    when /^the admin edit post page for the post "([^"]*)"$/
-      post = Post.find_by_title($1) || raise("could not find post #{$1.inspect}")
-      polymorphic_path([:edit, :admin, post.section.site, post.section, post])
-
-    else
-      super
-    end
-  end
-end
-
-World(Adva::Blog::Paths)